fix

- Add set PIN / change PIN multi-step flow (4-digit card PIN + 6-digit SCA PIN) with Treezor PCI DSS SCA proof generation
  - Add unblock PIN for blocked cards after failed attempts
  - Add renew card with SCA proof (same as wallet creation)
  - Show menu options conditionally based on hasCardPin and isPinBlocked flags
  - Make ScaPinView configurable with pinLength parameter (default 6)
  - Add hasCardPin to ChildProfileEntity and isPinBlocked to WalletCardEntity
  - Add EN/ES localizations for all new screens and messages

.dart_tool/package_config.json

@@ -3,349 +3,349 @@
   "packages": [
     {
       "name": "ansi_styles",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/ansi_styles-0.3.2+1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/ansi_styles-0.3.2+1",
       "packageUri": "lib/",
       "languageVersion": "2.12"
     },
     {
       "name": "args",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/args-2.7.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/args-2.7.0",
       "packageUri": "lib/",
       "languageVersion": "3.3"
     },
     {
       "name": "async",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.13.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/async-2.13.0",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "characters",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.4.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/characters-1.4.0",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "charcode",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/charcode-1.4.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/charcode-1.4.0",
       "packageUri": "lib/",
       "languageVersion": "3.0"
     },
     {
       "name": "checked_yaml",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/checked_yaml-2.0.4",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/checked_yaml-2.0.4",
       "packageUri": "lib/",
       "languageVersion": "3.8"
     },
     {
       "name": "cli_launcher",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/cli_launcher-0.3.2+1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/cli_launcher-0.3.2+1",
       "packageUri": "lib/",
       "languageVersion": "3.8"
     },
     {
       "name": "cli_util",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/cli_util-0.4.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/cli_util-0.4.2",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "collection",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.19.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/collection-1.19.1",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "conventional_commit",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/conventional_commit-0.6.1+1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/conventional_commit-0.6.1+1",
       "packageUri": "lib/",
       "languageVersion": "3.8"
     },
     {
       "name": "ffi",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/ffi-2.1.4",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/ffi-2.1.4",
       "packageUri": "lib/",
       "languageVersion": "3.7"
     },
     {
       "name": "file",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/file-7.0.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/file-7.0.1",
       "packageUri": "lib/",
       "languageVersion": "3.0"
     },
     {
       "name": "flutter",
-      "rootUri": "file:///C:/Program%20Files/Flutter/packages/flutter",
+      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/packages/flutter",
       "packageUri": "lib/",
       "languageVersion": "3.8"
     },
     {
       "name": "flutter_secure_storage",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_secure_storage-9.2.4",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/flutter_secure_storage-9.2.4",
       "packageUri": "lib/",
       "languageVersion": "2.12"
     },
     {
       "name": "flutter_secure_storage_linux",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_secure_storage_linux-1.2.3",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/flutter_secure_storage_linux-1.2.3",
       "packageUri": "lib/",
       "languageVersion": "2.12"
     },
     {
       "name": "flutter_secure_storage_macos",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_secure_storage_macos-3.1.3",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/flutter_secure_storage_macos-3.1.3",
       "packageUri": "lib/",
       "languageVersion": "2.12"
     },
     {
       "name": "flutter_secure_storage_platform_interface",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_secure_storage_platform_interface-1.1.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/flutter_secure_storage_platform_interface-1.1.2",
       "packageUri": "lib/",
       "languageVersion": "2.12"
     },
     {
       "name": "flutter_secure_storage_web",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_secure_storage_web-1.2.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/flutter_secure_storage_web-1.2.1",
       "packageUri": "lib/",
       "languageVersion": "2.12"
     },
     {
       "name": "flutter_secure_storage_windows",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_secure_storage_windows-3.1.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/flutter_secure_storage_windows-3.1.2",
       "packageUri": "lib/",
       "languageVersion": "2.12"
     },
     {
       "name": "flutter_web_plugins",
-      "rootUri": "file:///C:/Program%20Files/Flutter/packages/flutter_web_plugins",
+      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/packages/flutter_web_plugins",
       "packageUri": "lib/",
       "languageVersion": "3.8"
     },
     {
       "name": "glob",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/glob-2.1.3",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/glob-2.1.3",
       "packageUri": "lib/",
       "languageVersion": "3.3"
     },
     {
       "name": "graphs",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/graphs-2.3.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/graphs-2.3.2",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "http",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/http-1.5.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/http-1.5.0",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "http_parser",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/http_parser-4.1.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/http_parser-4.1.2",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "io",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/io-1.0.5",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/io-1.0.5",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "js",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/js-0.6.7",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/js-0.6.7",
       "packageUri": "lib/",
       "languageVersion": "2.19"
     },
     {
       "name": "json_annotation",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/json_annotation-4.9.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/json_annotation-4.9.0",
       "packageUri": "lib/",
       "languageVersion": "3.0"
     },
     {
       "name": "material_color_utilities",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.11.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/material_color_utilities-0.11.1",
       "packageUri": "lib/",
       "languageVersion": "2.17"
     },
     {
       "name": "melos",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/melos-6.3.3",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/melos-6.3.3",
       "packageUri": "lib/",
       "languageVersion": "3.8"
     },
     {
       "name": "meta",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.16.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/meta-1.16.0",
       "packageUri": "lib/",
       "languageVersion": "2.12"
     },
     {
       "name": "mustache_template",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/mustache_template-2.0.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/mustache_template-2.0.2",
       "packageUri": "lib/",
       "languageVersion": "3.7"
     },
     {
       "name": "path",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.9.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path-1.9.1",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "path_provider",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider-2.1.5",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider-2.1.5",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "path_provider_android",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_android-2.2.20",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_android-2.2.20",
       "packageUri": "lib/",
       "languageVersion": "3.9"
     },
     {
       "name": "path_provider_foundation",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_foundation-2.4.3",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_foundation-2.4.3",
       "packageUri": "lib/",
       "languageVersion": "3.9"
     },
     {
       "name": "path_provider_linux",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_linux-2.2.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1",
       "packageUri": "lib/",
       "languageVersion": "2.19"
     },
     {
       "name": "path_provider_platform_interface",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_platform_interface-2.1.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_platform_interface-2.1.2",
       "packageUri": "lib/",
       "languageVersion": "3.0"
     },
     {
       "name": "path_provider_windows",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_windows-2.3.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0",
       "packageUri": "lib/",
       "languageVersion": "3.2"
     },
     {
       "name": "platform",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/platform-3.1.6",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/platform-3.1.6",
       "packageUri": "lib/",
       "languageVersion": "3.2"
     },
     {
       "name": "plugin_platform_interface",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/plugin_platform_interface-2.1.8",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/plugin_platform_interface-2.1.8",
       "packageUri": "lib/",
       "languageVersion": "3.0"
     },
     {
       "name": "pool",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/pool-1.5.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/pool-1.5.2",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "process",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/process-5.0.5",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/process-5.0.5",
       "packageUri": "lib/",
       "languageVersion": "3.5"
     },
     {
       "name": "prompts",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/prompts-2.0.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/prompts-2.0.0",
       "packageUri": "lib/",
       "languageVersion": "2.12"
     },
     {
       "name": "pub_semver",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/pub_semver-2.2.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/pub_semver-2.2.0",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "pub_updater",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/pub_updater-0.5.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/pub_updater-0.5.0",
       "packageUri": "lib/",
       "languageVersion": "3.5"
     },
     {
       "name": "pubspec_parse",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/pubspec_parse-1.5.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/pubspec_parse-1.5.0",
       "packageUri": "lib/",
       "languageVersion": "3.6"
     },
     {
       "name": "sky_engine",
-      "rootUri": "file:///C:/Program%20Files/Flutter/bin/cache/pkg/sky_engine",
+      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/bin/cache/pkg/sky_engine",
       "packageUri": "lib/",
       "languageVersion": "3.8"
     },
     {
       "name": "source_span",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/source_span-1.10.1",
       "packageUri": "lib/",
       "languageVersion": "3.1"
     },
     {
       "name": "stack_trace",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.12.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/stack_trace-1.12.1",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "string_scanner",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.4.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/string_scanner-1.4.1",
       "packageUri": "lib/",
       "languageVersion": "3.1"
     },
     {
       "name": "term_glyph",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/term_glyph-1.2.2",
       "packageUri": "lib/",
       "languageVersion": "3.1"
     },
     {
       "name": "typed_data",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/typed_data-1.4.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/typed_data-1.4.0",
       "packageUri": "lib/",
       "languageVersion": "3.5"
     },
     {
       "name": "vector_math",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.2.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/vector_math-2.2.0",
       "packageUri": "lib/",
       "languageVersion": "3.1"
     },
     {
       "name": "web",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/web-1.1.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/web-1.1.1",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "win32",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/win32-5.15.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/win32-5.15.0",
       "packageUri": "lib/",
       "languageVersion": "3.8"
     },
     {
       "name": "xdg_directories",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/xdg_directories-1.1.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/xdg_directories-1.1.0",
       "packageUri": "lib/",
       "languageVersion": "3.3"
     },
     {
       "name": "yaml",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/yaml-3.1.3",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/yaml-3.1.3",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "yaml_edit",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/yaml_edit-2.2.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/yaml_edit-2.2.2",
       "packageUri": "lib/",
       "languageVersion": "3.1"
     },
@@ -358,7 +358,7 @@
   ],
   "generator": "pub",
   "generatorVersion": "3.9.2",
-  "flutterRoot": "file:///C:/Program%20Files/Flutter",
-  "flutterVersion": "3.35.6",
-  "pubCache": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache"
+  "flutterRoot": "file:///Users/juliandalcalaf/Development/flutter",
+  "flutterVersion": "3.35.7",
+  "pubCache": "file:///Users/juliandalcalaf/.pub-cache"
 }

.idea/modules.xml

@@ -17,7 +17,6 @@
       <module fileurl="file://$PROJECT_DIR$/modules/legacy/melos_legacy.iml" filepath="$PROJECT_DIR$/modules/legacy/melos_legacy.iml" />
       <module fileurl="file://$PROJECT_DIR$/modules/legacy/modules/legacy_auth/melos_legacy_auth.iml" filepath="$PROJECT_DIR$/modules/legacy/modules/legacy_auth/melos_legacy_auth.iml" />
       <module fileurl="file://$PROJECT_DIR$/modules/legacy/modules/legacy_dashboard_shell/melos_legacy_dashboard_shell.iml" filepath="$PROJECT_DIR$/modules/legacy/modules/legacy_dashboard_shell/melos_legacy_dashboard_shell.iml" />
-      <module fileurl="file://$PROJECT_DIR$/modules/legacy/packages/legacy_design_system/melos_legacy_design_system.iml" filepath="$PROJECT_DIR$/modules/legacy/packages/legacy_design_system/melos_legacy_design_system.iml" />
       <module fileurl="file://$PROJECT_DIR$/modules/legacy/packages/legacy_shared/melos_legacy_shared.iml" filepath="$PROJECT_DIR$/modules/legacy/packages/legacy_shared/melos_legacy_shared.iml" />
       <module fileurl="file://$PROJECT_DIR$/modules/legacy/modules/location/melos_location.iml" filepath="$PROJECT_DIR$/modules/legacy/modules/location/melos_location.iml" />
       <module fileurl="file://$PROJECT_DIR$/packages/navigation/melos_navigation.iml" filepath="$PROJECT_DIR$/packages/navigation/melos_navigation.iml" />

.idea/runConfigurations/melos_flutter_run_flutter_treezor_entrust_sdk_bridge_example.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Flutter Run -&gt; 'flutter_treezor_entrust_sdk_bridge_example'" type="FlutterRunConfigurationType" factoryName="Flutter">
-    <option name="filePath" value="$PROJECT_DIR$/packages//flutter_treezor_entrust_sdk_bridge//example/lib/main.dart" />
+    <option name="filePath" value="$PROJECT_DIR$/packages/flutter_treezor_entrust_sdk_bridge/example/lib/main.dart" />
     <method v="2" />
   </configuration>
 </component>

.idea/runConfigurations/melos_flutter_run_sf_app_platform.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Flutter Run -&gt; 'sf_app_platform'" type="FlutterRunConfigurationType" factoryName="Flutter">
-    <option name="filePath" value="$PROJECT_DIR$/apps//mobile_app/lib/main.dart" />
+    <option name="filePath" value="$PROJECT_DIR$/apps/mobile_app/lib/main.dart" />
     <method v="2" />
   </configuration>
 </component>

.idea/runConfigurations/melos_flutter_test_design_system.xml

@@ -1,7 +1,7 @@
 <!-- Generated by Melos -->
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Flutter Test -&gt; 'design_system'" type="FlutterTestConfigType" factoryName="Flutter Test">
-    <option name="testDir" value="$PROJECT_DIR$/packages\\design_system\test" />
+    <option name="testDir" value="$PROJECT_DIR$/packages/design_system/test" />
     <method v="2" />
   </configuration>
 </component>

.idea/runConfigurations/melos_flutter_test_flutter_treezor_entrust_sdk_bridge.xml

@@ -1,7 +1,7 @@
 <!-- Generated by Melos -->
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Flutter Test -&gt; 'flutter_treezor_entrust_sdk_bridge'" type="FlutterTestConfigType" factoryName="Flutter Test">
-    <option name="testDir" value="$PROJECT_DIR$/packages\\flutter_treezor_entrust_sdk_bridge\test" />
+    <option name="testDir" value="$PROJECT_DIR$/packages/flutter_treezor_entrust_sdk_bridge/test" />
     <method v="2" />
   </configuration>
 </component>

apps/mobile_app/config/development.json

@@ -1,5 +1,5 @@
 {
   "env": "development",
   "apiBaseUrl": "https://api-neki-b2b.neki.es/gateway/api/",
-  "apiOrigin": "bde6ea73-d09c-475f-aabf-1d11137e4d0d"
-}
+  "apiOrigin": "https://neki-b2b.neki.es"
+}

apps/mobile_app/ios/Runner.xcodeproj/project.pbxproj

@@ -543,7 +543,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon-development;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "Runner/Runner-development.entitlements";
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -727,7 +727,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon-development;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "Runner/Runner-development.entitlements";
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -751,7 +751,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon-development;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "Runner/Runner-development.entitlements";
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -1100,7 +1100,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon-staging;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "Runner/Runner-staging.entitlements";
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -1124,7 +1124,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon-production;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -1148,7 +1148,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon-staging;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "Runner/Runner-staging.entitlements";
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -1171,7 +1171,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon-production;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -1194,7 +1194,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon-staging;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "Runner/Runner-staging.entitlements";
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -1217,7 +1217,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon-production;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";

apps/mobile_app/lib/navigation/app_router.dart

@@ -21,6 +21,25 @@ import 'package:splash/splash.dart';
 
 final GlobalKey<NavigatorState> rootNavigatorKey = GlobalKey<NavigatorState>();
 
+final _legacyControlPanelNavKey =
+    GlobalKey<NavigatorState>(debugLabel: 'legacyControlPanel');
+final _legacyDeviceMgmtNavKey =
+    GlobalKey<NavigatorState>(debugLabel: 'legacyDeviceMgmt');
+final _legacyLocationNavKey =
+    GlobalKey<NavigatorState>(debugLabel: 'legacyLocation');
+final _legacyChatNavKey = GlobalKey<NavigatorState>(debugLabel: 'legacyChat');
+final _legacySettingsNavKey =
+    GlobalKey<NavigatorState>(debugLabel: 'legacySettings');
+
+final _dashboardHomeNavKey =
+    GlobalKey<NavigatorState>(debugLabel: 'dashboardHome');
+final _dashboardActivityNavKey =
+    GlobalKey<NavigatorState>(debugLabel: 'dashboardActivity');
+final _dashboardNotificationsNavKey =
+    GlobalKey<NavigatorState>(debugLabel: 'dashboardNotifications');
+final _dashboardProfileNavKey =
+    GlobalKey<NavigatorState>(debugLabel: 'dashboardProfile');
+
 late final GoRouter appRouter;
 
 void configureAppRouter() {
@@ -40,6 +59,7 @@ void configureAppRouter() {
         },
         branches: [
           StatefulShellBranch(
+            navigatorKey: _legacyControlPanelNavKey,
             routes: [
               GoRoute(
                 path: AppRoutes.controlPanel,
@@ -88,6 +108,7 @@ void configureAppRouter() {
             ],
           ),
           StatefulShellBranch(
+            navigatorKey: _legacyDeviceMgmtNavKey,
             routes: [
               GoRoute(
                 path: AppRoutes.deviceManagement,
@@ -141,11 +162,22 @@ void configureAppRouter() {
                     name: 'apps_use',
                     pageBuilder: const AppsUseBuilder().buildPage,
                   ),
+                  GoRoute(
+                    path: 'volume_control',
+                    name: 'volume_control',
+                    pageBuilder: const VolumeControlBuilder().buildPage,
+                  ),
+                  GoRoute(
+                    path: 'call_history',
+                    name: 'call_history',
+                    pageBuilder: const CallHistoryBuilder().buildPage,
+                  ),
                 ],
               ),
             ],
           ),
           StatefulShellBranch(
+            navigatorKey: _legacyLocationNavKey,
             routes: [
               GoRoute(
                 path: AppRoutes.legacyLocation,
@@ -156,6 +188,7 @@ void configureAppRouter() {
           ),
           // TODO: Añadir branch para Chat (tab 4)
           StatefulShellBranch(
+            navigatorKey: _legacyChatNavKey,
             routes: [
               GoRoute(
                 path: '${AppRoutes.legacyDashboard}/chat',
@@ -170,6 +203,7 @@ void configureAppRouter() {
             ],
           ),
           StatefulShellBranch(
+            navigatorKey: _legacySettingsNavKey,
             routes: [
               GoRoute(
                 path: AppRoutes.settings,
@@ -345,6 +379,7 @@ void configureAppRouter() {
         },
         branches: [
           StatefulShellBranch(
+            navigatorKey: _dashboardHomeNavKey,
             routes: [
               GoRoute(
                 path: AppRoutes.dashboardHome,
@@ -392,6 +427,24 @@ void configureAppRouter() {
                         pageBuilder:
                             const EditChildProfileBuilder().buildPage,
                       ),
+                      GoRoute(
+                        path: 'set-pin',
+                        name: 'home_set_card_pin',
+                        pageBuilder:
+                            const SetCardPinBuilder().buildPage,
+                      ),
+                      GoRoute(
+                        path: 'change-pin',
+                        name: 'home_change_card_pin',
+                        pageBuilder:
+                            const ChangeCardPinBuilder().buildPage,
+                      ),
+                      GoRoute(
+                        path: 'renew-card',
+                        name: 'home_renew_card',
+                        pageBuilder:
+                            const RenewCardBuilder().buildPage,
+                      ),
                     ],
                   ),
                 ],
@@ -399,6 +452,7 @@ void configureAppRouter() {
             ],
           ),
           StatefulShellBranch(
+            navigatorKey: _dashboardActivityNavKey,
             routes: [
               GoRoute(
                 path: AppRoutes.dashboardActivity,
@@ -408,6 +462,7 @@ void configureAppRouter() {
             ],
           ),
           StatefulShellBranch(
+            navigatorKey: _dashboardNotificationsNavKey,
             routes: [
               GoRoute(
                 path: AppRoutes.dashboardNotifications,
@@ -417,6 +472,7 @@ void configureAppRouter() {
             ],
           ),
           StatefulShellBranch(
+            navigatorKey: _dashboardProfileNavKey,
             routes: [
               GoRoute(
                 path: AppRoutes.dashboardProfile,

apps/mobile_app/lib/providers/legacy_heartbeat_service.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:dio/dio.dart';
 import 'package:flutter/foundation.dart';
 import 'package:sf_infrastructure/sf_infrastructure.dart';
 
@@ -35,8 +36,10 @@ class LegacyHeartbeatService {
       debugPrint('[LegacyHeartbeat] /auth/me => OK');
     } catch (e) {
       debugPrint('[LegacyHeartbeat] error: $e');
-      stop();
-      _onUnauthorized();
+      if (e is DioException && e.response?.statusCode == 401) {
+        stop();
+        _onUnauthorized();
+      }
     }
   }
 }

apps/mobile_app/lib/save_family_app.dart

@@ -40,7 +40,7 @@ class SaveFamilyAppState extends ConsumerState<SaveFamilyApp>
       repository: GetIt.I<QuestiaRepository>(),
       onUnauthorized: () {
         clearSessionData();
-        appRouter.go(AppRoutes.legacyLogin);
+        appRouter.go(AppRoutes.login);
       },
     );
     onBeforeSessionCleared = () {

apps/mobile_app/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux

@@ -1 +1 @@
-C:/Users/Aitor Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_linux-2.2.1/
+/Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/

apps/mobile_app/linux/flutter/ephemeral/.plugin_symlinks/share_plus

@@ -0,0 +1 @@
+/Users/juliandalcalaf/.pub-cache/hosted/pub.dev/share_plus-10.1.4/

apps/mobile_app/linux/flutter/ephemeral/.plugin_symlinks/shared_preferences_linux

@@ -1 +1 @@
-C:/Users/Aitor Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shared_preferences_linux-2.4.1/
+/Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.4.1/

apps/mobile_app/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux

@@ -1 +1 @@
-C:/Users/Aitor Arana/AppData/Local/Pub/Cache/hosted/pub.dev/url_launcher_linux-3.2.2/
+/Users/juliandalcalaf/.pub-cache/hosted/pub.dev/url_launcher_linux-3.2.2/

apps/mobile_app/pubspec.lock

@@ -245,6 +245,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.15.0"
+  cross_file:
+    dependency: transitive
+    description:
+      name: cross_file
+      sha256: "28bb3ae56f117b5aec029d702a90f57d285cd975c3c5c281eaca38dbc47c5937"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.5+2"
   crypto:
     dependency: transitive
     description:
@@ -1117,6 +1125,22 @@ packages:
       relative: true
     source: path
     version: "0.0.1"
+  share_plus:
+    dependency: transitive
+    description:
+      name: share_plus
+      sha256: fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.1.4"
+  share_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: share_plus_platform_interface
+      sha256: cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.0.2"
   shared_preferences:
     dependency: transitive
     description:
@@ -1560,6 +1584,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.23.8"
+  win32:
+    dependency: transitive
+    description:
+      name: win32
+      sha256: d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.15.0"
   wkt_parser:
     dependency: transitive
     description:

apps/mobile_app/pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.0+4
+version: 1.0.0+5
 
 environment:
   sdk: ^3.9.2

modules/activity/.dart_tool/package_config.json

@@ -3,163 +3,163 @@
   "packages": [
     {
       "name": "_fe_analyzer_shared",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/_fe_analyzer_shared-85.0.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/_fe_analyzer_shared-85.0.0",
       "packageUri": "lib/",
       "languageVersion": "3.5"
     },
     {
       "name": "analyzer",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/analyzer-7.7.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/analyzer-7.7.1",
       "packageUri": "lib/",
       "languageVersion": "3.5"
     },
     {
       "name": "archive",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/archive-4.0.9",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/archive-4.0.9",
       "packageUri": "lib/",
       "languageVersion": "3.0"
     },
     {
       "name": "args",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/args-2.7.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/args-2.7.0",
       "packageUri": "lib/",
       "languageVersion": "3.3"
     },
     {
       "name": "async",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.13.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/async-2.13.0",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "boolean_selector",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/boolean_selector-2.1.2",
       "packageUri": "lib/",
       "languageVersion": "3.1"
     },
     {
       "name": "build",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/build-3.1.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/build-3.1.0",
       "packageUri": "lib/",
       "languageVersion": "3.7"
     },
     {
       "name": "build_config",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/build_config-1.2.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/build_config-1.2.0",
       "packageUri": "lib/",
       "languageVersion": "3.7"
     },
     {
       "name": "build_daemon",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/build_daemon-4.1.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/build_daemon-4.1.1",
       "packageUri": "lib/",
       "languageVersion": "3.7"
     },
     {
       "name": "build_resolvers",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/build_resolvers-3.0.3",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/build_resolvers-3.0.3",
       "packageUri": "lib/",
       "languageVersion": "3.7"
     },
     {
       "name": "build_runner",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/build_runner-2.7.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/build_runner-2.7.1",
       "packageUri": "lib/",
       "languageVersion": "3.7"
     },
     {
       "name": "build_runner_core",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/build_runner_core-9.3.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/build_runner_core-9.3.1",
       "packageUri": "lib/",
       "languageVersion": "3.7"
     },
     {
       "name": "built_collection",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/built_collection-5.1.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/built_collection-5.1.1",
       "packageUri": "lib/",
       "languageVersion": "2.12"
     },
     {
       "name": "built_value",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/built_value-8.12.3",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/built_value-8.12.3",
       "packageUri": "lib/",
       "languageVersion": "3.0"
     },
     {
       "name": "characters",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.4.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/characters-1.4.0",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "checked_yaml",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/checked_yaml-2.0.4",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/checked_yaml-2.0.4",
       "packageUri": "lib/",
       "languageVersion": "3.8"
     },
     {
       "name": "cli_config",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/cli_config-0.2.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/cli_config-0.2.0",
       "packageUri": "lib/",
       "languageVersion": "3.0"
     },
     {
       "name": "clock",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/clock-1.1.2",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "code_builder",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/code_builder-4.11.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/code_builder-4.11.1",
       "packageUri": "lib/",
       "languageVersion": "3.7"
     },
     {
       "name": "collection",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.19.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/collection-1.19.1",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "confetti",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/confetti-0.7.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/confetti-0.7.0",
       "packageUri": "lib/",
       "languageVersion": "2.17"
     },
     {
       "name": "convert",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/convert-3.1.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/convert-3.1.2",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "cookie_jar",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/cookie_jar-4.0.8",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/cookie_jar-4.0.8",
       "packageUri": "lib/",
       "languageVersion": "2.15"
     },
     {
       "name": "country_code_picker",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/country_code_picker-3.4.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/country_code_picker-3.4.1",
       "packageUri": "lib/",
       "languageVersion": "2.17"
     },
     {
       "name": "coverage",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/coverage-1.15.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/coverage-1.15.0",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "crypto",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/crypto-3.0.7",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/crypto-3.0.7",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "dart_style",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/dart_style-3.1.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/dart_style-3.1.1",
       "packageUri": "lib/",
       "languageVersion": "3.7"
     },
@@ -171,91 +171,91 @@
     },
     {
       "name": "diacritic",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/diacritic-0.1.6",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/diacritic-0.1.6",
       "packageUri": "lib/",
       "languageVersion": "3.0"
     },
     {
       "name": "dio",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/dio-5.9.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/dio-5.9.1",
       "packageUri": "lib/",
       "languageVersion": "2.18"
     },
     {
       "name": "dio_cookie_manager",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/dio_cookie_manager-3.3.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/dio_cookie_manager-3.3.0",
       "packageUri": "lib/",
       "languageVersion": "2.18"
     },
     {
       "name": "dio_web_adapter",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/dio_web_adapter-2.1.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/dio_web_adapter-2.1.1",
       "packageUri": "lib/",
       "languageVersion": "3.3"
     },
     {
       "name": "equatable",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/equatable-2.0.8",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/equatable-2.0.8",
       "packageUri": "lib/",
       "languageVersion": "2.12"
     },
     {
       "name": "fake_async",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.3",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/fake_async-1.3.3",
       "packageUri": "lib/",
       "languageVersion": "3.3"
     },
     {
       "name": "ffi",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/ffi-2.2.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/ffi-2.2.0",
       "packageUri": "lib/",
       "languageVersion": "3.7"
     },
     {
       "name": "file",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/file-7.0.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/file-7.0.1",
       "packageUri": "lib/",
       "languageVersion": "3.0"
     },
     {
       "name": "fixnum",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/fixnum-1.1.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/fixnum-1.1.1",
       "packageUri": "lib/",
       "languageVersion": "3.1"
     },
     {
       "name": "fl_chart",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/fl_chart-1.1.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/fl_chart-1.1.1",
       "packageUri": "lib/",
       "languageVersion": "3.6"
     },
     {
       "name": "flutter",
-      "rootUri": "file:///C:/Program%20Files/Flutter/packages/flutter",
+      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/packages/flutter",
       "packageUri": "lib/",
       "languageVersion": "3.8"
     },
     {
       "name": "flutter_lints",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_lints-5.0.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/flutter_lints-5.0.0",
       "packageUri": "lib/",
       "languageVersion": "3.5"
     },
     {
       "name": "flutter_riverpod",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_riverpod-3.2.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/flutter_riverpod-3.2.1",
       "packageUri": "lib/",
       "languageVersion": "3.7"
     },
     {
       "name": "flutter_svg",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_svg-2.2.3",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/flutter_svg-2.2.3",
       "packageUri": "lib/",
       "languageVersion": "3.8"
     },
     {
       "name": "flutter_test",
-      "rootUri": "file:///C:/Program%20Files/Flutter/packages/flutter_test",
+      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/packages/flutter_test",
       "packageUri": "lib/",
       "languageVersion": "3.8"
     },
@@ -267,7 +267,7 @@
     },
     {
       "name": "flutter_web_plugins",
-      "rootUri": "file:///C:/Program%20Files/Flutter/packages/flutter_web_plugins",
+      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/packages/flutter_web_plugins",
       "packageUri": "lib/",
       "languageVersion": "3.8"
     },
@@ -279,259 +279,259 @@
     },
     {
       "name": "freezed",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/freezed-3.2.3",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/freezed-3.2.3",
       "packageUri": "lib/",
       "languageVersion": "3.8"
     },
     {
       "name": "freezed_annotation",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/freezed_annotation-3.1.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/freezed_annotation-3.1.0",
       "packageUri": "lib/",
       "languageVersion": "3.0"
     },
     {
       "name": "frontend_server_client",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/frontend_server_client-4.0.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/frontend_server_client-4.0.0",
       "packageUri": "lib/",
       "languageVersion": "3.0"
     },
     {
       "name": "get_it",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/get_it-9.2.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/get_it-9.2.0",
       "packageUri": "lib/",
       "languageVersion": "3.0"
     },
     {
       "name": "glob",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/glob-2.1.3",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/glob-2.1.3",
       "packageUri": "lib/",
       "languageVersion": "3.3"
     },
     {
       "name": "go_router",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/go_router-17.1.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/go_router-17.1.0",
       "packageUri": "lib/",
       "languageVersion": "3.9"
     },
     {
       "name": "graphs",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/graphs-2.3.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/graphs-2.3.2",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "http",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/http-1.6.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/http-1.6.0",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "http_multi_server",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/http_multi_server-3.2.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/http_multi_server-3.2.2",
       "packageUri": "lib/",
       "languageVersion": "3.2"
     },
     {
       "name": "http_parser",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/http_parser-4.1.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/http_parser-4.1.2",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "intl",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/intl-0.20.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/intl-0.20.2",
       "packageUri": "lib/",
       "languageVersion": "3.3"
     },
     {
       "name": "io",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/io-1.0.5",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/io-1.0.5",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "js",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/js-0.7.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/js-0.7.2",
       "packageUri": "lib/",
       "languageVersion": "3.7"
     },
     {
       "name": "json_annotation",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/json_annotation-4.9.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/json_annotation-4.9.0",
       "packageUri": "lib/",
       "languageVersion": "3.0"
     },
     {
       "name": "json_serializable",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/json_serializable-6.11.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/json_serializable-6.11.2",
       "packageUri": "lib/",
       "languageVersion": "3.8"
     },
     {
       "name": "leak_tracker",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/leak_tracker-11.0.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/leak_tracker-11.0.2",
       "packageUri": "lib/",
       "languageVersion": "3.2"
     },
     {
       "name": "leak_tracker_flutter_testing",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.10",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.10",
       "packageUri": "lib/",
       "languageVersion": "3.2"
     },
     {
       "name": "leak_tracker_testing",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/leak_tracker_testing-3.0.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/leak_tracker_testing-3.0.2",
       "packageUri": "lib/",
       "languageVersion": "3.2"
     },
     {
       "name": "lints",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/lints-5.1.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/lints-5.1.1",
       "packageUri": "lib/",
       "languageVersion": "3.6"
     },
     {
       "name": "logging",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/logging-1.3.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/logging-1.3.0",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "lottie",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/lottie-3.3.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/lottie-3.3.2",
       "packageUri": "lib/",
       "languageVersion": "3.9"
     },
     {
       "name": "matcher",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.17",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/matcher-0.12.17",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "material_color_utilities",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.11.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/material_color_utilities-0.11.1",
       "packageUri": "lib/",
       "languageVersion": "2.17"
     },
     {
       "name": "meta",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.16.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/meta-1.16.0",
       "packageUri": "lib/",
       "languageVersion": "2.12"
     },
     {
       "name": "mime",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/mime-2.0.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/mime-2.0.0",
       "packageUri": "lib/",
       "languageVersion": "3.2"
     },
     {
       "name": "node_preamble",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/node_preamble-2.0.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/node_preamble-2.0.2",
       "packageUri": "lib/",
       "languageVersion": "2.12"
     },
     {
       "name": "package_config",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/package_config-2.2.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/package_config-2.2.0",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "path",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.9.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path-1.9.1",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "path_parsing",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_parsing-1.1.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_parsing-1.1.0",
       "packageUri": "lib/",
       "languageVersion": "3.3"
     },
     {
       "name": "path_provider",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider-2.1.5",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider-2.1.5",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "path_provider_android",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_android-2.2.22",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_android-2.2.22",
       "packageUri": "lib/",
       "languageVersion": "3.9"
     },
     {
       "name": "path_provider_foundation",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_foundation-2.5.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_foundation-2.5.1",
       "packageUri": "lib/",
       "languageVersion": "3.9"
     },
     {
       "name": "path_provider_linux",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_linux-2.2.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1",
       "packageUri": "lib/",
       "languageVersion": "2.19"
     },
     {
       "name": "path_provider_platform_interface",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_platform_interface-2.1.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_platform_interface-2.1.2",
       "packageUri": "lib/",
       "languageVersion": "3.0"
     },
     {
       "name": "path_provider_windows",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_windows-2.3.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0",
       "packageUri": "lib/",
       "languageVersion": "3.2"
     },
     {
       "name": "petitparser",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/petitparser-7.0.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/petitparser-7.0.2",
       "packageUri": "lib/",
       "languageVersion": "3.8"
     },
     {
       "name": "platform",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/platform-3.1.6",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/platform-3.1.6",
       "packageUri": "lib/",
       "languageVersion": "3.2"
     },
     {
       "name": "plugin_platform_interface",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/plugin_platform_interface-2.1.8",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/plugin_platform_interface-2.1.8",
       "packageUri": "lib/",
       "languageVersion": "3.0"
     },
     {
       "name": "pool",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/pool-1.5.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/pool-1.5.2",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "posix",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/posix-6.5.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/posix-6.5.0",
       "packageUri": "lib/",
       "languageVersion": "3.0"
     },
     {
       "name": "pub_semver",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/pub_semver-2.2.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/pub_semver-2.2.0",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "pubspec_parse",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/pubspec_parse-1.5.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/pubspec_parse-1.5.0",
       "packageUri": "lib/",
       "languageVersion": "3.6"
     },
     {
       "name": "riverpod",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/riverpod-3.2.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/riverpod-3.2.1",
       "packageUri": "lib/",
       "languageVersion": "3.7"
     },
@@ -561,181 +561,181 @@
     },
     {
       "name": "shared_preferences",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shared_preferences-2.5.4",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences-2.5.4",
       "packageUri": "lib/",
       "languageVersion": "3.9"
     },
     {
       "name": "shared_preferences_android",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shared_preferences_android-2.4.20",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences_android-2.4.20",
       "packageUri": "lib/",
       "languageVersion": "3.9"
     },
     {
       "name": "shared_preferences_foundation",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shared_preferences_foundation-2.5.6",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.6",
       "packageUri": "lib/",
       "languageVersion": "3.9"
     },
     {
       "name": "shared_preferences_linux",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shared_preferences_linux-2.4.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.4.1",
       "packageUri": "lib/",
       "languageVersion": "3.3"
     },
     {
       "name": "shared_preferences_platform_interface",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shared_preferences_platform_interface-2.4.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences_platform_interface-2.4.1",
       "packageUri": "lib/",
       "languageVersion": "3.2"
     },
     {
       "name": "shared_preferences_web",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shared_preferences_web-2.4.3",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences_web-2.4.3",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "shared_preferences_windows",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shared_preferences_windows-2.4.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.4.1",
       "packageUri": "lib/",
       "languageVersion": "3.3"
     },
     {
       "name": "shelf",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shelf-1.4.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shelf-1.4.2",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "shelf_packages_handler",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shelf_packages_handler-3.0.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shelf_packages_handler-3.0.2",
       "packageUri": "lib/",
       "languageVersion": "2.17"
     },
     {
       "name": "shelf_static",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shelf_static-1.1.3",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shelf_static-1.1.3",
       "packageUri": "lib/",
       "languageVersion": "3.3"
     },
     {
       "name": "shelf_web_socket",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shelf_web_socket-3.0.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shelf_web_socket-3.0.0",
       "packageUri": "lib/",
       "languageVersion": "3.5"
     },
     {
       "name": "sky_engine",
-      "rootUri": "file:///C:/Program%20Files/Flutter/bin/cache/pkg/sky_engine",
+      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/bin/cache/pkg/sky_engine",
       "packageUri": "lib/",
       "languageVersion": "3.8"
     },
     {
       "name": "source_gen",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/source_gen-4.0.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/source_gen-4.0.0",
       "packageUri": "lib/",
       "languageVersion": "3.7"
     },
     {
       "name": "source_helper",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/source_helper-1.3.8",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/source_helper-1.3.8",
       "packageUri": "lib/",
       "languageVersion": "3.7"
     },
     {
       "name": "source_map_stack_trace",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/source_map_stack_trace-2.1.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/source_map_stack_trace-2.1.2",
       "packageUri": "lib/",
       "languageVersion": "3.3"
     },
     {
       "name": "source_maps",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/source_maps-0.10.13",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/source_maps-0.10.13",
       "packageUri": "lib/",
       "languageVersion": "3.3"
     },
     {
       "name": "source_span",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/source_span-1.10.2",
       "packageUri": "lib/",
       "languageVersion": "3.1"
     },
     {
       "name": "stack_trace",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.12.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/stack_trace-1.12.1",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "state_notifier",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/state_notifier-1.0.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/state_notifier-1.0.0",
       "packageUri": "lib/",
       "languageVersion": "2.12"
     },
     {
       "name": "stream_channel",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.4",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/stream_channel-2.1.4",
       "packageUri": "lib/",
       "languageVersion": "3.3"
     },
     {
       "name": "stream_transform",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/stream_transform-2.1.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/stream_transform-2.1.1",
       "packageUri": "lib/",
       "languageVersion": "3.1"
     },
     {
       "name": "string_scanner",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.4.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/string_scanner-1.4.1",
       "packageUri": "lib/",
       "languageVersion": "3.1"
     },
     {
       "name": "term_glyph",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/term_glyph-1.2.2",
       "packageUri": "lib/",
       "languageVersion": "3.1"
     },
     {
       "name": "test",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/test-1.26.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/test-1.26.2",
       "packageUri": "lib/",
       "languageVersion": "3.5"
     },
     {
       "name": "test_api",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.7.6",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/test_api-0.7.6",
       "packageUri": "lib/",
       "languageVersion": "3.5"
     },
     {
       "name": "test_core",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/test_core-0.6.11",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/test_core-0.6.11",
       "packageUri": "lib/",
       "languageVersion": "3.5"
     },
     {
       "name": "timing",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/timing-1.0.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/timing-1.0.2",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "top_snackbar_flutter",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/top_snackbar_flutter-3.3.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/top_snackbar_flutter-3.3.0",
       "packageUri": "lib/",
       "languageVersion": "2.15"
     },
     {
       "name": "typed_data",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/typed_data-1.4.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/typed_data-1.4.0",
       "packageUri": "lib/",
       "languageVersion": "3.5"
     },
     {
       "name": "universal_io",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/universal_io-2.3.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/universal_io-2.3.1",
       "packageUri": "lib/",
       "languageVersion": "3.6"
     },
@@ -747,79 +747,79 @@
     },
     {
       "name": "vector_graphics",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/vector_graphics-1.1.19",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/vector_graphics-1.1.19",
       "packageUri": "lib/",
       "languageVersion": "3.6"
     },
     {
       "name": "vector_graphics_codec",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/vector_graphics_codec-1.1.13",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/vector_graphics_codec-1.1.13",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "vector_graphics_compiler",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/vector_graphics_compiler-1.1.20",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/vector_graphics_compiler-1.1.20",
       "packageUri": "lib/",
       "languageVersion": "3.9"
     },
     {
       "name": "vector_math",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.2.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/vector_math-2.2.0",
       "packageUri": "lib/",
       "languageVersion": "3.1"
     },
     {
       "name": "vm_service",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/vm_service-15.0.2",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/vm_service-15.0.2",
       "packageUri": "lib/",
       "languageVersion": "3.5"
     },
     {
       "name": "watcher",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/watcher-1.2.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/watcher-1.2.1",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "web",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/web-1.1.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/web-1.1.1",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "web_socket",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/web_socket-1.0.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/web_socket-1.0.1",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
     {
       "name": "web_socket_channel",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/web_socket_channel-3.0.3",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/web_socket_channel-3.0.3",
       "packageUri": "lib/",
       "languageVersion": "3.3"
     },
     {
       "name": "webkit_inspection_protocol",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/webkit_inspection_protocol-1.2.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/webkit_inspection_protocol-1.2.1",
       "packageUri": "lib/",
       "languageVersion": "3.0"
     },
     {
       "name": "xdg_directories",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/xdg_directories-1.1.0",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/xdg_directories-1.1.0",
       "packageUri": "lib/",
       "languageVersion": "3.3"
     },
     {
       "name": "xml",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/xml-6.6.1",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/xml-6.6.1",
       "packageUri": "lib/",
       "languageVersion": "3.8"
     },
     {
       "name": "yaml",
-      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/yaml-3.1.3",
+      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/yaml-3.1.3",
       "packageUri": "lib/",
       "languageVersion": "3.4"
     },
@@ -832,7 +832,7 @@
   ],
   "generator": "pub",
   "generatorVersion": "3.9.2",
-  "flutterRoot": "file:///C:/Program%20Files/Flutter",
-  "flutterVersion": "3.35.6",
-  "pubCache": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache"
+  "flutterRoot": "file:///Users/juliandalcalaf/Development/flutter",
+  "flutterVersion": "3.35.7",
+  "pubCache": "file:///Users/juliandalcalaf/.pub-cache"
 }

modules/activity/.dart_tool/version

@@ -1 +1 @@
-3.35.6
+3.35.7

modules/activity/.flutter-plugins-dependencies

@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_treezor_entrust_sdk_bridge","path":"C:\\\\dev\\\\sf-app-platform\\\\packages\\\\flutter_treezor_entrust_sdk_bridge\\\\","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Aitor Arana\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\path_provider_foundation-2.5.1\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_foundation","path":"C:\\\\Users\\\\Aitor Arana\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\shared_preferences_foundation-2.5.6\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false}],"android":[{"name":"flutter_treezor_entrust_sdk_bridge","path":"C:\\\\dev\\\\sf-app-platform\\\\packages\\\\flutter_treezor_entrust_sdk_bridge\\\\","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_android","path":"C:\\\\Users\\\\Aitor Arana\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\path_provider_android-2.2.22\\\\","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_android","path":"C:\\\\Users\\\\Aitor Arana\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\shared_preferences_android-2.4.20\\\\","native_build":true,"dependencies":[],"dev_dependency":false}],"macos":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Aitor Arana\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\path_provider_foundation-2.5.1\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_foundation","path":"C:\\\\Users\\\\Aitor Arana\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\shared_preferences_foundation-2.5.6\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\Aitor Arana\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\path_provider_linux-2.2.1\\\\","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_linux","path":"C:\\\\Users\\\\Aitor Arana\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\shared_preferences_linux-2.4.1\\\\","native_build":false,"dependencies":["path_provider_linux"],"dev_dependency":false}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\Aitor Arana\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\path_provider_windows-2.3.0\\\\","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_windows","path":"C:\\\\Users\\\\Aitor Arana\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\shared_preferences_windows-2.4.1\\\\","native_build":false,"dependencies":["path_provider_windows"],"dev_dependency":false}],"web":[{"name":"shared_preferences_web","path":"C:\\\\Users\\\\Aitor Arana\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\shared_preferences_web-2.4.3\\\\","dependencies":[],"dev_dependency":false}]},"dependencyGraph":[{"name":"flutter_treezor_entrust_sdk_bridge","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_android","shared_preferences_foundation","shared_preferences_linux","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_android","dependencies":[]},{"name":"shared_preferences_foundation","dependencies":[]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]}],"date_created":"2026-03-16 09:33:25.098373","version":"3.35.6","swift_package_manager_enabled":{"ios":false,"macos":false}}
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_treezor_entrust_sdk_bridge","path":"/Users/juliandalcalaf/Desktop/save-family-app/sf-app-platform/packages/flutter_treezor_entrust_sdk_bridge/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_foundation","path":"/Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_foundation-2.5.1/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_foundation","path":"/Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.6/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false}],"android":[{"name":"flutter_treezor_entrust_sdk_bridge","path":"/Users/juliandalcalaf/Desktop/save-family-app/sf-app-platform/packages/flutter_treezor_entrust_sdk_bridge/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_android","path":"/Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_android-2.2.22/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_android","path":"/Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences_android-2.4.20/","native_build":true,"dependencies":[],"dev_dependency":false}],"macos":[{"name":"path_provider_foundation","path":"/Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_foundation-2.5.1/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_foundation","path":"/Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.6/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false}],"linux":[{"name":"path_provider_linux","path":"/Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_linux","path":"/Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.4.1/","native_build":false,"dependencies":["path_provider_linux"],"dev_dependency":false}],"windows":[{"name":"path_provider_windows","path":"/Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_windows","path":"/Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.4.1/","native_build":false,"dependencies":["path_provider_windows"],"dev_dependency":false}],"web":[{"name":"shared_preferences_web","path":"/Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences_web-2.4.3/","dependencies":[],"dev_dependency":false}]},"dependencyGraph":[{"name":"flutter_treezor_entrust_sdk_bridge","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_android","shared_preferences_foundation","shared_preferences_linux","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_android","dependencies":[]},{"name":"shared_preferences_foundation","dependencies":[]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]}],"date_created":"2026-03-18 14:45:38.408085","version":"3.35.7","swift_package_manager_enabled":{"ios":false,"macos":false}}

modules/auth/lib/src/features/onboarding/presentation/onboarding_screen.dart

@@ -32,7 +32,7 @@ class OnboardingScreen extends ConsumerWidget {
 
     void goToNext() {
       if (isLast) {
-        navigationContract.goTo(AppRoutes.legacyLogin);
+        navigationContract.goTo(AppRoutes.login);
       } else {
         pageController.nextPage(
           duration: const Duration(milliseconds: 400),
@@ -111,7 +111,7 @@ class OnboardingScreen extends ConsumerWidget {
                     ? const SizedBox.shrink()
                     : TextButton(
                         onPressed: () =>
-                            navigationContract.goTo(AppRoutes.legacyLogin),
+                            navigationContract.goTo(AppRoutes.login),
                         child: Text(
                           context.translate(I18n.skip),
                           style: AppFonts.stolzlStyle(

modules/auth/lib/src/features/sca_treezor/sca_pin_view.dart

@@ -15,6 +15,7 @@ class ScaPinView extends StatelessWidget {
   final VoidCallback onSubmit;
   final String clearPinText;
   final String? errorMessage;
+  final int pinLength;
 
   const ScaPinView({
     super.key,
@@ -30,6 +31,7 @@ class ScaPinView extends StatelessWidget {
     required this.onSubmit,
     required this.clearPinText,
     this.errorMessage,
+    this.pinLength = 6,
   });
 
   @override
@@ -49,7 +51,7 @@ class ScaPinView extends StatelessWidget {
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
               const SizedBox(width: 44),
-              _PinDots(length: pin.length, max: 6),
+              _PinDots(length: pin.length, max: pinLength),
               const SizedBox(width: 12),
               SizedBox(
                 width: 44,

modules/auth/lib/src/features/sign_up/presentation/state/sign_up_view_model.dart

@@ -495,7 +495,6 @@ class SignUpViewModel extends Notifier<SignUpViewState> {
   String _emailErrorFor(String value) {
     final email = value.trim();
     if (email.isEmpty) return I18n.errorEmailRequired;
-    if (email.contains('+')) return I18n.errorEmailPlusNotAllowed;
     if (!_isValidEmail(email)) return I18n.errorEmailInvalid;
     return '';
   }

modules/home/lib/home.dart

@@ -8,3 +8,6 @@ export 'src/features/limits/limits_builder.dart';
 export 'src/features/goals/goals_builder.dart';
 export 'src/features/extract/extract_builder.dart';
 export 'src/features/edit_child_profile/edit_child_profile_builder.dart';
+export 'src/features/card_pin/card_pin_builder.dart';
+export 'src/features/card_pin/card_pin_view_state.dart';
+export 'src/features/renew_card/renew_card_builder.dart';

modules/home/lib/src/features/card_pin/card_pin_builder.dart

@@ -0,0 +1,41 @@
+import 'package:flutter/material.dart';
+import 'package:get_it/get_it.dart';
+import 'package:go_router/go_router.dart';
+import 'package:navigation/navigation.dart';
+
+import 'card_pin_screen.dart';
+import 'card_pin_view_state.dart';
+
+class SetCardPinBuilder {
+  const SetCardPinBuilder();
+
+  Page<void> buildPage(BuildContext context, GoRouterState state) {
+    final childWalletId = state.pathParameters['childWalletId'] ?? '';
+    final navigationContract = GetIt.I<NavigationContract>();
+    return MaterialPage(
+      key: state.pageKey,
+      child: CardPinScreen(
+        childId: childWalletId,
+        navigation: navigationContract,
+        mode: CardPinMode.set,
+      ),
+    );
+  }
+}
+
+class ChangeCardPinBuilder {
+  const ChangeCardPinBuilder();
+
+  Page<void> buildPage(BuildContext context, GoRouterState state) {
+    final childWalletId = state.pathParameters['childWalletId'] ?? '';
+    final navigationContract = GetIt.I<NavigationContract>();
+    return MaterialPage(
+      key: state.pageKey,
+      child: CardPinScreen(
+        childId: childWalletId,
+        navigation: navigationContract,
+        mode: CardPinMode.change,
+      ),
+    );
+  }
+}

modules/home/lib/src/features/card_pin/card_pin_screen.dart

@@ -0,0 +1,136 @@
+import 'package:auth/auth.dart';
+import 'package:design_system/design_system.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:navigation/navigation.dart';
+import 'package:sf_localizations/sf_localizations.dart';
+
+import 'card_pin_view_model.dart';
+import 'card_pin_view_state.dart';
+
+class CardPinScreen extends ConsumerWidget {
+  final String childId;
+  final NavigationContract navigation;
+  final CardPinMode mode;
+
+  const CardPinScreen({
+    super.key,
+    required this.childId,
+    required this.navigation,
+    required this.mode,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final theme = ref.watch(themePortProvider);
+    final arg = (childId, mode);
+    final viewState = ref.watch(cardPinViewModelProvider(arg));
+    final viewModel = ref.read(cardPinViewModelProvider(arg).notifier);
+
+    ref.listen(cardPinViewModelProvider(arg), (prev, next) {
+      if (next.success && !(prev?.success ?? false)) {
+        showTopSnackbar(
+          context,
+          message: context.translate(I18n.cardPinSuccess),
+          type: MessageType.success,
+        );
+        navigation.goBack();
+        return;
+      }
+      if (next.errorMessage.isNotEmpty &&
+          next.errorMessage != (prev?.errorMessage ?? '')) {
+        if (next.errorMessage == 'cardPinMismatch') {
+          showTopSnackbar(
+            context,
+            message: context.translate(I18n.cardPinMismatch),
+            type: MessageType.error,
+          );
+        } else {
+          showTopSnackbar(
+            context,
+            message: context.translate(I18n.cardPinError),
+            type: MessageType.error,
+          );
+        }
+      }
+    });
+
+    if (viewState.isLoading) {
+      return const Scaffold(body: Center(child: AppLoadingIndicator()));
+    }
+
+    if (viewState.errorMessage.isNotEmpty && viewState.childProfile == null) {
+      return Scaffold(
+        body: Center(child: Text('Error: ${viewState.errorMessage}')),
+      );
+    }
+
+    final pinLength = viewState.step == CardPinStep.scaPin ? 6 : 4;
+    final stepTitle = _stepTitle(context, viewState.step);
+    final currentPin = switch (viewState.step) {
+      CardPinStep.currentPin => viewState.currentPin,
+      CardPinStep.newPin => viewState.newPin,
+      CardPinStep.confirmPin => viewState.confirmPin,
+      CardPinStep.scaPin => viewState.scaPin,
+    };
+
+    return Scaffold(
+      backgroundColor: theme.getColorFor(ThemeCode.backgroundSecondary),
+      appBar: AppBar(
+        backgroundColor: theme.getColorFor(ThemeCode.backgroundSecondary),
+        leading: IconButton(
+          icon: Icon(
+            Icons.arrow_back,
+            color: theme.getColorFor(ThemeCode.textPrimary),
+          ),
+          onPressed: () {
+            if (viewModel.isFirstStep) {
+              navigation.goBack();
+            } else {
+              viewModel.goBack();
+            }
+          },
+        ),
+      ),
+      body: Column(
+        children: [
+          Expanded(
+            child: SingleChildScrollView(
+              child: ScaPinView(
+                title: stepTitle,
+                pin: currentPin,
+                pinLength: pinLength,
+                isProcessing: viewState.isSigning || viewState.isSubmitting,
+                processingText: context.translate(I18n.scaSigning),
+                canSubmit: viewModel.canSubmitStep,
+                submitText: viewState.step == CardPinStep.scaPin
+                    ? context.translate(I18n.scaConnect)
+                    : context.translate(I18n.cardPinNext),
+                clearPinText: context.translate(I18n.scaClearPin),
+                onDigitPressed: viewModel.onDigitPressed,
+                onBackspacePressed: viewModel.onBackspacePressed,
+                onClearPin: viewModel.onClearPin,
+                onSubmit: viewModel.onStepSubmit,
+              ),
+            ),
+          ),
+          SafeArea(
+            child: TextButton(
+              onPressed: () => navigation.goBack(),
+              child: Text(context.translate(I18n.cancel)),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  String _stepTitle(BuildContext context, CardPinStep step) {
+    return switch (step) {
+      CardPinStep.currentPin => context.translate(I18n.cardPinCurrentStep),
+      CardPinStep.newPin => context.translate(I18n.cardPinNewStep),
+      CardPinStep.confirmPin => context.translate(I18n.cardPinConfirmStep),
+      CardPinStep.scaPin => context.translate(I18n.cardPinScaStep),
+    };
+  }
+}

modules/home/lib/src/features/card_pin/card_pin_view_model.dart

@@ -0,0 +1,257 @@
+import 'dart:convert';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:get_it/get_it.dart';
+import 'package:sca_treezor/sca_treezor.dart';
+import 'package:sf_shared/sf_shared.dart';
+
+import '../child_wallet/child_data_provider.dart';
+import 'card_pin_view_state.dart';
+
+final cardPinViewModelProvider = NotifierProvider.autoDispose
+    .family<CardPinViewModel, CardPinViewState, (String, CardPinMode)>(
+  CardPinViewModel.new,
+);
+
+class CardPinViewModel extends Notifier<CardPinViewState> {
+  final (String, CardPinMode) arg;
+  CardPinViewModel(this.arg);
+
+  String get childId => arg.$1;
+  CardPinMode get mode => arg.$2;
+
+  late final TreezorWalletConnectionService _connectionService;
+  late final TreezorWalletSignatureService _signatureService;
+
+  @override
+  CardPinViewState build() {
+    debugPrint('[CardPIN] build() mode=$mode childId=$childId');
+    _connectionService = GetIt.I<TreezorWalletConnectionService>();
+    _signatureService = GetIt.I<TreezorWalletSignatureService>();
+
+    ref.listen(childDataProvider(childId), (prev, next) {
+      state = state.copyWith(
+        isLoading: next.isLoading,
+        childProfile: next.childProfile,
+        childWallet: next.childWallet,
+        device: next.device,
+        errorMessage: next.errorMessage,
+      );
+      if (next.childProfile != null &&
+          prev?.childProfile == null &&
+          state.cardId.isEmpty) {
+        _loadCard(next.childProfile!.walletId);
+      }
+    });
+
+    final data = ref.read(childDataProvider(childId));
+    final initialStep =
+        mode == CardPinMode.change ? CardPinStep.currentPin : CardPinStep.newPin;
+
+    final initialState = CardPinViewState(
+      isLoading: data.isLoading,
+      childProfile: data.childProfile,
+      childWallet: data.childWallet,
+      device: data.device,
+      errorMessage: data.errorMessage,
+      step: initialStep,
+    );
+
+    if (data.childProfile != null) {
+      Future.microtask(() => _loadCard(data.childProfile!.walletId));
+    }
+
+    return initialState;
+  }
+
+  Future<void> _loadCard(String walletId) async {
+    debugPrint('[CardPIN] _loadCard walletId=$walletId');
+    try {
+      final card =
+          await ref.read(treezorRepositoryProvider).getCard(walletId: walletId);
+      if (!ref.mounted) return;
+      debugPrint('[CardPIN] _loadCard cardId=${card.cardId} status=${card.status}');
+      state = state.copyWith(cardId: card.cardId.toString());
+    } catch (e) {
+      debugPrint('[CardPIN] _loadCard error: $e');
+    }
+  }
+
+  String _currentStepPin() => switch (state.step) {
+        CardPinStep.currentPin => state.currentPin,
+        CardPinStep.newPin => state.newPin,
+        CardPinStep.confirmPin => state.confirmPin,
+        CardPinStep.scaPin => state.scaPin,
+      };
+
+  int get _currentStepMaxLength =>
+      state.step == CardPinStep.scaPin ? 6 : 4;
+
+  void onDigitPressed(String digit) {
+    final current = _currentStepPin();
+    if (current.length >= _currentStepMaxLength) return;
+    final updated = current + digit;
+    state = _updateStepPin(updated).copyWith(errorMessage: '');
+  }
+
+  void onBackspacePressed() {
+    final current = _currentStepPin();
+    if (current.isEmpty) return;
+    state = _updateStepPin(current.substring(0, current.length - 1));
+  }
+
+  void onClearPin() {
+    state = _updateStepPin('');
+  }
+
+  CardPinViewState _updateStepPin(String value) => switch (state.step) {
+        CardPinStep.currentPin => state.copyWith(currentPin: value),
+        CardPinStep.newPin => state.copyWith(newPin: value),
+        CardPinStep.confirmPin => state.copyWith(confirmPin: value),
+        CardPinStep.scaPin => state.copyWith(scaPin: value),
+      };
+
+  bool get canSubmitStep => _currentStepPin().length == _currentStepMaxLength;
+
+  void onStepSubmit() {
+    debugPrint('[CardPIN] onStepSubmit step=${state.step}');
+    switch (state.step) {
+      case CardPinStep.currentPin:
+        debugPrint('[CardPIN] currentPin entered, advancing to newPin');
+        state = state.copyWith(step: CardPinStep.newPin, errorMessage: '');
+      case CardPinStep.newPin:
+        debugPrint('[CardPIN] newPin entered, advancing to confirmPin');
+        state = state.copyWith(step: CardPinStep.confirmPin, errorMessage: '');
+      case CardPinStep.confirmPin:
+        if (state.confirmPin != state.newPin) {
+          debugPrint('[CardPIN] confirmPin MISMATCH');
+          state = state.copyWith(
+            confirmPin: '',
+            errorMessage: 'cardPinMismatch',
+          );
+          return;
+        }
+        debugPrint('[CardPIN] confirmPin matches, advancing to scaPin');
+        state = state.copyWith(step: CardPinStep.scaPin, errorMessage: '');
+      case CardPinStep.scaPin:
+        debugPrint('[CardPIN] scaPin entered, submitting...');
+        _submit();
+    }
+  }
+
+  void goBack() {
+    switch (state.step) {
+      case CardPinStep.currentPin:
+        break;
+      case CardPinStep.newPin:
+        if (mode == CardPinMode.change) {
+          state = state.copyWith(step: CardPinStep.currentPin, newPin: '');
+        }
+      case CardPinStep.confirmPin:
+        state = state.copyWith(step: CardPinStep.newPin, confirmPin: '');
+      case CardPinStep.scaPin:
+        state = state.copyWith(step: CardPinStep.confirmPin, scaPin: '');
+    }
+  }
+
+  bool get isFirstStep =>
+      (mode == CardPinMode.set && state.step == CardPinStep.newPin) ||
+      (mode == CardPinMode.change && state.step == CardPinStep.currentPin);
+
+  Future<void> _submit() async {
+    final cardId = state.cardId;
+    final walletId = state.childProfile?.walletId;
+    final userId = state.childProfile?.treezorUserId;
+    debugPrint('[CardPIN] _submit mode=$mode cardId=$cardId walletId=$walletId userId=$userId');
+    if (cardId.isEmpty || walletId == null) {
+      debugPrint('[CardPIN] _submit aborted: cardId or walletId missing');
+      return;
+    }
+
+    state = state.copyWith(isSigning: true, errorMessage: '');
+
+    try {
+      debugPrint('[CardPIN] connecting with SCA PIN...');
+      await _connectionService.connectWithPin(loginPin: state.scaPin);
+      if (!ref.mounted) return;
+      debugPrint('[CardPIN] SCA connection successful');
+
+      final String scaProof;
+      if (mode == CardPinMode.set) {
+        final url =
+            'https://savefamily.preprod.secure.treezor.co/cards/$cardId/setPIN';
+        final scaInput = jsonEncode({
+          'url': url,
+          'body': {
+            'newPIN': state.newPin,
+            'confirmPIN': state.confirmPin,
+            'userId': userId,
+          },
+        });
+        debugPrint('[CardPIN] setPIN scaInput: $scaInput');
+        scaProof = await _signatureService.generateJwsWithPin(
+          message: '',
+          input: scaInput,
+          pin: state.scaPin,
+        );
+        debugPrint('[CardPIN] setPIN scaProof: $scaProof');
+      } else {
+        final url =
+            'https://savefamily.preprod.secure.treezor.co/cards/$cardId/ChangePIN';
+        final scaInput = jsonEncode({
+          'url': url,
+          'body': {
+            'currentPIN': state.currentPin,
+            'newPIN': state.newPin,
+            'confirmPIN': state.confirmPin,
+            'userId': userId,
+          },
+        });
+        debugPrint('[CardPIN] changePIN scaInput: $scaInput');
+        scaProof = await _signatureService.generateJwsWithPin(
+          message: '',
+          input: scaInput,
+          pin: state.scaPin,
+        );
+        debugPrint('[CardPIN] changePIN scaProof: $scaProof');
+      }
+
+      if (!ref.mounted) return;
+      state = state.copyWith(isSigning: false, isSubmitting: true, scaPin: '');
+
+      if (mode == CardPinMode.set) {
+        debugPrint('[CardPIN] calling backend setCardPin walletId=$walletId');
+        await ref.read(treezorRepositoryProvider).setCardPin(
+              walletId: walletId,
+              newPin: state.newPin,
+              confirmPin: state.confirmPin,
+              scaProof: scaProof,
+            );
+        debugPrint('[CardPIN] setCardPin SUCCESS');
+      } else {
+        debugPrint('[CardPIN] calling backend changeCardPin walletId=$walletId');
+        await ref.read(treezorRepositoryProvider).changeCardPin(
+              walletId: walletId,
+              currentPin: state.currentPin,
+              newPin: state.newPin,
+              confirmPin: state.confirmPin,
+              scaProof: scaProof,
+            );
+        debugPrint('[CardPIN] changeCardPin SUCCESS');
+      }
+
+      if (!ref.mounted) return;
+      state = state.copyWith(isSubmitting: false, success: true);
+    } catch (e) {
+      debugPrint('[CardPIN] _submit ERROR: $e');
+      if (!ref.mounted) return;
+      state = state.copyWith(
+        isSigning: false,
+        isSubmitting: false,
+        scaPin: '',
+        errorMessage: e.toString(),
+      );
+    }
+  }
+}

modules/home/lib/src/features/card_pin/card_pin_view_state.dart

@@ -0,0 +1,28 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:sf_shared/sf_shared.dart';
+
+part 'card_pin_view_state.freezed.dart';
+
+enum CardPinMode { set, change }
+
+enum CardPinStep { currentPin, newPin, confirmPin, scaPin }
+
+@freezed
+abstract class CardPinViewState with _$CardPinViewState {
+  const factory CardPinViewState({
+    @Default(true) bool isLoading,
+    ChildProfileEntity? childProfile,
+    ChildWalletEntity? childWallet,
+    DeviceEntity? device,
+    @Default('') String cardId,
+    @Default('') String currentPin,
+    @Default('') String newPin,
+    @Default('') String confirmPin,
+    @Default('') String scaPin,
+    @Default(CardPinStep.newPin) CardPinStep step,
+    @Default(false) bool isSigning,
+    @Default(false) bool isSubmitting,
+    @Default(false) bool success,
+    @Default('') String errorMessage,
+  }) = _CardPinViewState;
+}

modules/home/lib/src/features/card_pin/card_pin_view_state.freezed.dart

@@ -0,0 +1,382 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'card_pin_view_state.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+/// @nodoc
+mixin _$CardPinViewState {
+
+ bool get isLoading; ChildProfileEntity? get childProfile; ChildWalletEntity? get childWallet; DeviceEntity? get device; String get cardId; String get currentPin; String get newPin; String get confirmPin; String get scaPin; CardPinStep get step; bool get isSigning; bool get isSubmitting; bool get success; String get errorMessage;
+/// Create a copy of CardPinViewState
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$CardPinViewStateCopyWith<CardPinViewState> get copyWith => _$CardPinViewStateCopyWithImpl<CardPinViewState>(this as CardPinViewState, _$identity);
+
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is CardPinViewState&&(identical(other.isLoading, isLoading) || other.isLoading == isLoading)&&(identical(other.childProfile, childProfile) || other.childProfile == childProfile)&&(identical(other.childWallet, childWallet) || other.childWallet == childWallet)&&(identical(other.device, device) || other.device == device)&&(identical(other.cardId, cardId) || other.cardId == cardId)&&(identical(other.currentPin, currentPin) || other.currentPin == currentPin)&&(identical(other.newPin, newPin) || other.newPin == newPin)&&(identical(other.confirmPin, confirmPin) || other.confirmPin == confirmPin)&&(identical(other.scaPin, scaPin) || other.scaPin == scaPin)&&(identical(other.step, step) || other.step == step)&&(identical(other.isSigning, isSigning) || other.isSigning == isSigning)&&(identical(other.isSubmitting, isSubmitting) || other.isSubmitting == isSubmitting)&&(identical(other.success, success) || other.success == success)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage));
+}
+
+
+@override
+int get hashCode => Object.hash(runtimeType,isLoading,childProfile,childWallet,device,cardId,currentPin,newPin,confirmPin,scaPin,step,isSigning,isSubmitting,success,errorMessage);
+
+@override
+String toString() {
+  return 'CardPinViewState(isLoading: $isLoading, childProfile: $childProfile, childWallet: $childWallet, device: $device, cardId: $cardId, currentPin: $currentPin, newPin: $newPin, confirmPin: $confirmPin, scaPin: $scaPin, step: $step, isSigning: $isSigning, isSubmitting: $isSubmitting, success: $success, errorMessage: $errorMessage)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $CardPinViewStateCopyWith<$Res>  {
+  factory $CardPinViewStateCopyWith(CardPinViewState value, $Res Function(CardPinViewState) _then) = _$CardPinViewStateCopyWithImpl;
+@useResult
+$Res call({
+ bool isLoading, ChildProfileEntity? childProfile, ChildWalletEntity? childWallet, DeviceEntity? device, String cardId, String currentPin, String newPin, String confirmPin, String scaPin, CardPinStep step, bool isSigning, bool isSubmitting, bool success, String errorMessage
+});
+
+
+$ChildProfileEntityCopyWith<$Res>? get childProfile;$ChildWalletEntityCopyWith<$Res>? get childWallet;$DeviceEntityCopyWith<$Res>? get device;
+
+}
+/// @nodoc
+class _$CardPinViewStateCopyWithImpl<$Res>
+    implements $CardPinViewStateCopyWith<$Res> {
+  _$CardPinViewStateCopyWithImpl(this._self, this._then);
+
+  final CardPinViewState _self;
+  final $Res Function(CardPinViewState) _then;
+
+/// Create a copy of CardPinViewState
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? isLoading = null,Object? childProfile = freezed,Object? childWallet = freezed,Object? device = freezed,Object? cardId = null,Object? currentPin = null,Object? newPin = null,Object? confirmPin = null,Object? scaPin = null,Object? step = null,Object? isSigning = null,Object? isSubmitting = null,Object? success = null,Object? errorMessage = null,}) {
+  return _then(_self.copyWith(
+isLoading: null == isLoading ? _self.isLoading : isLoading // ignore: cast_nullable_to_non_nullable
+as bool,childProfile: freezed == childProfile ? _self.childProfile : childProfile // ignore: cast_nullable_to_non_nullable
+as ChildProfileEntity?,childWallet: freezed == childWallet ? _self.childWallet : childWallet // ignore: cast_nullable_to_non_nullable
+as ChildWalletEntity?,device: freezed == device ? _self.device : device // ignore: cast_nullable_to_non_nullable
+as DeviceEntity?,cardId: null == cardId ? _self.cardId : cardId // ignore: cast_nullable_to_non_nullable
+as String,currentPin: null == currentPin ? _self.currentPin : currentPin // ignore: cast_nullable_to_non_nullable
+as String,newPin: null == newPin ? _self.newPin : newPin // ignore: cast_nullable_to_non_nullable
+as String,confirmPin: null == confirmPin ? _self.confirmPin : confirmPin // ignore: cast_nullable_to_non_nullable
+as String,scaPin: null == scaPin ? _self.scaPin : scaPin // ignore: cast_nullable_to_non_nullable
+as String,step: null == step ? _self.step : step // ignore: cast_nullable_to_non_nullable
+as CardPinStep,isSigning: null == isSigning ? _self.isSigning : isSigning // ignore: cast_nullable_to_non_nullable
+as bool,isSubmitting: null == isSubmitting ? _self.isSubmitting : isSubmitting // ignore: cast_nullable_to_non_nullable
+as bool,success: null == success ? _self.success : success // ignore: cast_nullable_to_non_nullable
+as bool,errorMessage: null == errorMessage ? _self.errorMessage : errorMessage // ignore: cast_nullable_to_non_nullable
+as String,
+  ));
+}
+/// Create a copy of CardPinViewState
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$ChildProfileEntityCopyWith<$Res>? get childProfile {
+    if (_self.childProfile == null) {
+    return null;
+  }
+
+  return $ChildProfileEntityCopyWith<$Res>(_self.childProfile!, (value) {
+    return _then(_self.copyWith(childProfile: value));
+  });
+}/// Create a copy of CardPinViewState
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$ChildWalletEntityCopyWith<$Res>? get childWallet {
+    if (_self.childWallet == null) {
+    return null;
+  }
+
+  return $ChildWalletEntityCopyWith<$Res>(_self.childWallet!, (value) {
+    return _then(_self.copyWith(childWallet: value));
+  });
+}/// Create a copy of CardPinViewState
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$DeviceEntityCopyWith<$Res>? get device {
+    if (_self.device == null) {
+    return null;
+  }
+
+  return $DeviceEntityCopyWith<$Res>(_self.device!, (value) {
+    return _then(_self.copyWith(device: value));
+  });
+}
+}
+
+
+/// Adds pattern-matching-related methods to [CardPinViewState].
+extension CardPinViewStatePatterns on CardPinViewState {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _CardPinViewState value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _CardPinViewState() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _CardPinViewState value)  $default,){
+final _that = this;
+switch (_that) {
+case _CardPinViewState():
+return $default(_that);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _CardPinViewState value)?  $default,){
+final _that = this;
+switch (_that) {
+case _CardPinViewState() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( bool isLoading,  ChildProfileEntity? childProfile,  ChildWalletEntity? childWallet,  DeviceEntity? device,  String cardId,  String currentPin,  String newPin,  String confirmPin,  String scaPin,  CardPinStep step,  bool isSigning,  bool isSubmitting,  bool success,  String errorMessage)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _CardPinViewState() when $default != null:
+return $default(_that.isLoading,_that.childProfile,_that.childWallet,_that.device,_that.cardId,_that.currentPin,_that.newPin,_that.confirmPin,_that.scaPin,_that.step,_that.isSigning,_that.isSubmitting,_that.success,_that.errorMessage);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( bool isLoading,  ChildProfileEntity? childProfile,  ChildWalletEntity? childWallet,  DeviceEntity? device,  String cardId,  String currentPin,  String newPin,  String confirmPin,  String scaPin,  CardPinStep step,  bool isSigning,  bool isSubmitting,  bool success,  String errorMessage)  $default,) {final _that = this;
+switch (_that) {
+case _CardPinViewState():
+return $default(_that.isLoading,_that.childProfile,_that.childWallet,_that.device,_that.cardId,_that.currentPin,_that.newPin,_that.confirmPin,_that.scaPin,_that.step,_that.isSigning,_that.isSubmitting,_that.success,_that.errorMessage);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( bool isLoading,  ChildProfileEntity? childProfile,  ChildWalletEntity? childWallet,  DeviceEntity? device,  String cardId,  String currentPin,  String newPin,  String confirmPin,  String scaPin,  CardPinStep step,  bool isSigning,  bool isSubmitting,  bool success,  String errorMessage)?  $default,) {final _that = this;
+switch (_that) {
+case _CardPinViewState() when $default != null:
+return $default(_that.isLoading,_that.childProfile,_that.childWallet,_that.device,_that.cardId,_that.currentPin,_that.newPin,_that.confirmPin,_that.scaPin,_that.step,_that.isSigning,_that.isSubmitting,_that.success,_that.errorMessage);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+
+
+class _CardPinViewState implements CardPinViewState {
+  const _CardPinViewState({this.isLoading = true, this.childProfile, this.childWallet, this.device, this.cardId = '', this.currentPin = '', this.newPin = '', this.confirmPin = '', this.scaPin = '', this.step = CardPinStep.newPin, this.isSigning = false, this.isSubmitting = false, this.success = false, this.errorMessage = ''});
+  
+
+@override@JsonKey() final  bool isLoading;
+@override final  ChildProfileEntity? childProfile;
+@override final  ChildWalletEntity? childWallet;
+@override final  DeviceEntity? device;
+@override@JsonKey() final  String cardId;
+@override@JsonKey() final  String currentPin;
+@override@JsonKey() final  String newPin;
+@override@JsonKey() final  String confirmPin;
+@override@JsonKey() final  String scaPin;
+@override@JsonKey() final  CardPinStep step;
+@override@JsonKey() final  bool isSigning;
+@override@JsonKey() final  bool isSubmitting;
+@override@JsonKey() final  bool success;
+@override@JsonKey() final  String errorMessage;
+
+/// Create a copy of CardPinViewState
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$CardPinViewStateCopyWith<_CardPinViewState> get copyWith => __$CardPinViewStateCopyWithImpl<_CardPinViewState>(this, _$identity);
+
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _CardPinViewState&&(identical(other.isLoading, isLoading) || other.isLoading == isLoading)&&(identical(other.childProfile, childProfile) || other.childProfile == childProfile)&&(identical(other.childWallet, childWallet) || other.childWallet == childWallet)&&(identical(other.device, device) || other.device == device)&&(identical(other.cardId, cardId) || other.cardId == cardId)&&(identical(other.currentPin, currentPin) || other.currentPin == currentPin)&&(identical(other.newPin, newPin) || other.newPin == newPin)&&(identical(other.confirmPin, confirmPin) || other.confirmPin == confirmPin)&&(identical(other.scaPin, scaPin) || other.scaPin == scaPin)&&(identical(other.step, step) || other.step == step)&&(identical(other.isSigning, isSigning) || other.isSigning == isSigning)&&(identical(other.isSubmitting, isSubmitting) || other.isSubmitting == isSubmitting)&&(identical(other.success, success) || other.success == success)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage));
+}
+
+
+@override
+int get hashCode => Object.hash(runtimeType,isLoading,childProfile,childWallet,device,cardId,currentPin,newPin,confirmPin,scaPin,step,isSigning,isSubmitting,success,errorMessage);
+
+@override
+String toString() {
+  return 'CardPinViewState(isLoading: $isLoading, childProfile: $childProfile, childWallet: $childWallet, device: $device, cardId: $cardId, currentPin: $currentPin, newPin: $newPin, confirmPin: $confirmPin, scaPin: $scaPin, step: $step, isSigning: $isSigning, isSubmitting: $isSubmitting, success: $success, errorMessage: $errorMessage)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$CardPinViewStateCopyWith<$Res> implements $CardPinViewStateCopyWith<$Res> {
+  factory _$CardPinViewStateCopyWith(_CardPinViewState value, $Res Function(_CardPinViewState) _then) = __$CardPinViewStateCopyWithImpl;
+@override @useResult
+$Res call({
+ bool isLoading, ChildProfileEntity? childProfile, ChildWalletEntity? childWallet, DeviceEntity? device, String cardId, String currentPin, String newPin, String confirmPin, String scaPin, CardPinStep step, bool isSigning, bool isSubmitting, bool success, String errorMessage
+});
+
+
+@override $ChildProfileEntityCopyWith<$Res>? get childProfile;@override $ChildWalletEntityCopyWith<$Res>? get childWallet;@override $DeviceEntityCopyWith<$Res>? get device;
+
+}
+/// @nodoc
+class __$CardPinViewStateCopyWithImpl<$Res>
+    implements _$CardPinViewStateCopyWith<$Res> {
+  __$CardPinViewStateCopyWithImpl(this._self, this._then);
+
+  final _CardPinViewState _self;
+  final $Res Function(_CardPinViewState) _then;
+
+/// Create a copy of CardPinViewState
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? isLoading = null,Object? childProfile = freezed,Object? childWallet = freezed,Object? device = freezed,Object? cardId = null,Object? currentPin = null,Object? newPin = null,Object? confirmPin = null,Object? scaPin = null,Object? step = null,Object? isSigning = null,Object? isSubmitting = null,Object? success = null,Object? errorMessage = null,}) {
+  return _then(_CardPinViewState(
+isLoading: null == isLoading ? _self.isLoading : isLoading // ignore: cast_nullable_to_non_nullable
+as bool,childProfile: freezed == childProfile ? _self.childProfile : childProfile // ignore: cast_nullable_to_non_nullable
+as ChildProfileEntity?,childWallet: freezed == childWallet ? _self.childWallet : childWallet // ignore: cast_nullable_to_non_nullable
+as ChildWalletEntity?,device: freezed == device ? _self.device : device // ignore: cast_nullable_to_non_nullable
+as DeviceEntity?,cardId: null == cardId ? _self.cardId : cardId // ignore: cast_nullable_to_non_nullable
+as String,currentPin: null == currentPin ? _self.currentPin : currentPin // ignore: cast_nullable_to_non_nullable
+as String,newPin: null == newPin ? _self.newPin : newPin // ignore: cast_nullable_to_non_nullable
+as String,confirmPin: null == confirmPin ? _self.confirmPin : confirmPin // ignore: cast_nullable_to_non_nullable
+as String,scaPin: null == scaPin ? _self.scaPin : scaPin // ignore: cast_nullable_to_non_nullable
+as String,step: null == step ? _self.step : step // ignore: cast_nullable_to_non_nullable
+as CardPinStep,isSigning: null == isSigning ? _self.isSigning : isSigning // ignore: cast_nullable_to_non_nullable
+as bool,isSubmitting: null == isSubmitting ? _self.isSubmitting : isSubmitting // ignore: cast_nullable_to_non_nullable
+as bool,success: null == success ? _self.success : success // ignore: cast_nullable_to_non_nullable
+as bool,errorMessage: null == errorMessage ? _self.errorMessage : errorMessage // ignore: cast_nullable_to_non_nullable
+as String,
+  ));
+}
+
+/// Create a copy of CardPinViewState
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$ChildProfileEntityCopyWith<$Res>? get childProfile {
+    if (_self.childProfile == null) {
+    return null;
+  }
+
+  return $ChildProfileEntityCopyWith<$Res>(_self.childProfile!, (value) {
+    return _then(_self.copyWith(childProfile: value));
+  });
+}/// Create a copy of CardPinViewState
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$ChildWalletEntityCopyWith<$Res>? get childWallet {
+    if (_self.childWallet == null) {
+    return null;
+  }
+
+  return $ChildWalletEntityCopyWith<$Res>(_self.childWallet!, (value) {
+    return _then(_self.copyWith(childWallet: value));
+  });
+}/// Create a copy of CardPinViewState
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$DeviceEntityCopyWith<$Res>? get device {
+    if (_self.device == null) {
+    return null;
+  }
+
+  return $DeviceEntityCopyWith<$Res>(_self.device!, (value) {
+    return _then(_self.copyWith(device: value));
+  });
+}
+}
+
+// dart format on

modules/home/lib/src/features/child_wallet/child_wallet_screen.dart

@@ -175,6 +175,16 @@ class _ChildWalletScreenState extends ConsumerState<ChildWalletScreen> {
                           ),
                         ),
                       ),
+                      IconButton(
+                        onPressed: () => widget.navigation.pushTo(
+                          AppRoutes.renewCard(widget.childId),
+                        ),
+                        icon: Icon(
+                          Icons.credit_card_outlined,
+                          color: theme.getColorFor(ThemeCode.backgroundPrimary),
+                          size: 24,
+                        ),
+                      ),
                       PopupMenuButton<String>(
                         icon: Icon(
                           Icons.more_vert,
@@ -187,6 +197,16 @@ class _ChildWalletScreenState extends ConsumerState<ChildWalletScreen> {
                             );
                           } else if (value == 'delete') {
                             _showDeleteConfirmation();
+                          } else if (value == 'set_pin') {
+                            widget.navigation.pushTo(
+                              AppRoutes.setCardPin(widget.childId),
+                            );
+                          } else if (value == 'change_pin') {
+                            widget.navigation.pushTo(
+                              AppRoutes.changeCardPin(widget.childId),
+                            );
+                          } else if (value == 'unblock_pin') {
+                            _showUnblockPinConfirmation();
                           }
                         },
                         itemBuilder: (_) => [
@@ -202,6 +222,45 @@ class _ChildWalletScreenState extends ConsumerState<ChildWalletScreen> {
                               ],
                             ),
                           ),
+                          if (!viewState.isPinBlocked && !(viewState.childProfile?.hasCardPin ?? false))
+                            PopupMenuItem(
+                              value: 'set_pin',
+                              child: Row(
+                                spacing: 8,
+                                children: [
+                                  Icon(Icons.pin_outlined),
+                                  Text(
+                                    context.translate(I18n.cardPinSet),
+                                  ),
+                                ],
+                              ),
+                            ),
+                          if (!viewState.isPinBlocked && (viewState.childProfile?.hasCardPin ?? false))
+                            PopupMenuItem(
+                              value: 'change_pin',
+                              child: Row(
+                                spacing: 8,
+                                children: [
+                                  Icon(Icons.lock_reset_outlined),
+                                  Text(
+                                    context.translate(I18n.cardPinChange),
+                                  ),
+                                ],
+                              ),
+                            ),
+                          if (viewState.isPinBlocked)
+                            PopupMenuItem(
+                              value: 'unblock_pin',
+                              child: Row(
+                                spacing: 8,
+                                children: [
+                                  Icon(Icons.lock_open_outlined),
+                                  Text(
+                                    context.translate(I18n.cardPinUnblock),
+                                  ),
+                                ],
+                              ),
+                            ),
                           PopupMenuItem(
                             value: 'delete',
                             child: Row(
@@ -504,6 +563,52 @@ class _ChildWalletScreenState extends ConsumerState<ChildWalletScreen> {
       showTopSnackbar(context, message: e.toString(), type: MessageType.error);
     }
   }
+
+  Future<void> _showUnblockPinConfirmation() async {
+    final theme = ref.read(themePortProvider);
+    final confirmTitle = context.translate(I18n.cardPinUnblock);
+    final confirmMessage = context.translate(I18n.cardPinUnblockConfirm);
+    final cancelText = context.translate(I18n.cancel);
+    final confirmText = context.translate(I18n.accept);
+    final successText = context.translate(I18n.cardPinUnblockSuccess);
+    final bgColor = theme.getColorFor(ThemeCode.backgroundPrimary);
+    final shape = RoundedRectangleBorder(
+      borderRadius: BorderRadius.circular(16),
+    );
+
+    showDialog(
+      context: context,
+      builder: (ctx) => AlertDialog(
+        backgroundColor: bgColor,
+        shape: shape,
+        title: Text(confirmTitle),
+        content: Text(confirmMessage),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.of(ctx).pop(),
+            child: Text(cancelText),
+          ),
+          TextButton(
+            onPressed: () async {
+              Navigator.of(ctx).pop();
+              final viewModel = ref.read(
+                childWalletViewModelProvider(widget.childId).notifier,
+              );
+              final success = await viewModel.unblockCardPin();
+              if (success && mounted) {
+                showTopSnackbar(
+                  context,
+                  message: successText,
+                  type: MessageType.success,
+                );
+              }
+            },
+            child: Text(confirmText),
+          ),
+        ],
+      ),
+    );
+  }
 }
 
 class _CardStatusSheet extends ConsumerStatefulWidget {

modules/home/lib/src/features/child_wallet/child_wallet_view_model.dart

@@ -124,6 +124,7 @@ class ChildWalletViewModel extends Notifier<ChildWalletViewState> {
         cardId: card.cardId.toString(),
         cardStatus: card.status,
         locked: CardStatus.fromString(card.status).isLocked,
+        isPinBlocked: card.isPinBlocked,
       );
     } catch (_) {}
   }
@@ -244,6 +245,29 @@ class ChildWalletViewModel extends Notifier<ChildWalletViewState> {
     }
   }
 
+  Future<bool> unblockCardPin() async {
+    final walletId = state.childProfile?.walletId;
+    if (walletId == null) return false;
+
+    state = state.copyWith(isUpdatingCard: true, cardStatusError: '');
+
+    try {
+      await ref.read(treezorRepositoryProvider).unblockCardPin(
+            walletId: walletId,
+          );
+      if (!ref.mounted) return false;
+      state = state.copyWith(isUpdatingCard: false);
+      return true;
+    } catch (e) {
+      if (!ref.mounted) return false;
+      state = state.copyWith(
+        isUpdatingCard: false,
+        cardStatusError: e.toString(),
+      );
+      return false;
+    }
+  }
+
   static int _cardStatusToInt(String status) {
     return CardStatus.fromString(status).apiCode;
   }

modules/home/lib/src/features/child_wallet/child_wallet_view_state.dart

@@ -13,6 +13,7 @@ abstract class ChildWalletViewState with _$ChildWalletViewState {
     @Default('') String cardId,
     @Default('') String cardStatus,
     @Default(false) bool locked,
+    @Default(false) bool isPinBlocked,
     @Default('') String errorMessage,
     @Default(false) bool isUpdatingCard,
     @Default('') String cardStatusError,

modules/home/lib/src/features/child_wallet/child_wallet_view_state.freezed.dart

@@ -14,7 +14,7 @@ T _$identity<T>(T value) => value;
 /// @nodoc
 mixin _$ChildWalletViewState {
 
- bool get isLoading; ChildProfileEntity? get childProfile; ChildWalletEntity? get childWallet; DeviceEntity? get device; String get cardId; String get cardStatus; bool get locked; String get errorMessage; bool get isUpdatingCard; String get cardStatusError; bool get cardStatusSuccess; bool get showPin; String get selectedStatus; String get pin; bool get isSigning; bool get isLoadingTransactions; List<List<WalletTransactionEntity>> get transactionPages; String? get nextCursor; bool get isLoadingMore; int get currentPage;
+ bool get isLoading; ChildProfileEntity? get childProfile; ChildWalletEntity? get childWallet; DeviceEntity? get device; String get cardId; String get cardStatus; bool get locked; bool get isPinBlocked; String get errorMessage; bool get isUpdatingCard; String get cardStatusError; bool get cardStatusSuccess; bool get showPin; String get selectedStatus; String get pin; bool get isSigning; bool get isLoadingTransactions; List<List<WalletTransactionEntity>> get transactionPages; String? get nextCursor; bool get isLoadingMore; int get currentPage;
 /// Create a copy of ChildWalletViewState
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -25,16 +25,16 @@ $ChildWalletViewStateCopyWith<ChildWalletViewState> get copyWith => _$ChildWalle
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is ChildWalletViewState&&(identical(other.isLoading, isLoading) || other.isLoading == isLoading)&&(identical(other.childProfile, childProfile) || other.childProfile == childProfile)&&(identical(other.childWallet, childWallet) || other.childWallet == childWallet)&&(identical(other.device, device) || other.device == device)&&(identical(other.cardId, cardId) || other.cardId == cardId)&&(identical(other.cardStatus, cardStatus) || other.cardStatus == cardStatus)&&(identical(other.locked, locked) || other.locked == locked)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage)&&(identical(other.isUpdatingCard, isUpdatingCard) || other.isUpdatingCard == isUpdatingCard)&&(identical(other.cardStatusError, cardStatusError) || other.cardStatusError == cardStatusError)&&(identical(other.cardStatusSuccess, cardStatusSuccess) || other.cardStatusSuccess == cardStatusSuccess)&&(identical(other.showPin, showPin) || other.showPin == showPin)&&(identical(other.selectedStatus, selectedStatus) || other.selectedStatus == selectedStatus)&&(identical(other.pin, pin) || other.pin == pin)&&(identical(other.isSigning, isSigning) || other.isSigning == isSigning)&&(identical(other.isLoadingTransactions, isLoadingTransactions) || other.isLoadingTransactions == isLoadingTransactions)&&const DeepCollectionEquality().equals(other.transactionPages, transactionPages)&&(identical(other.nextCursor, nextCursor) || other.nextCursor == nextCursor)&&(identical(other.isLoadingMore, isLoadingMore) || other.isLoadingMore == isLoadingMore)&&(identical(other.currentPage, currentPage) || other.currentPage == currentPage));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is ChildWalletViewState&&(identical(other.isLoading, isLoading) || other.isLoading == isLoading)&&(identical(other.childProfile, childProfile) || other.childProfile == childProfile)&&(identical(other.childWallet, childWallet) || other.childWallet == childWallet)&&(identical(other.device, device) || other.device == device)&&(identical(other.cardId, cardId) || other.cardId == cardId)&&(identical(other.cardStatus, cardStatus) || other.cardStatus == cardStatus)&&(identical(other.locked, locked) || other.locked == locked)&&(identical(other.isPinBlocked, isPinBlocked) || other.isPinBlocked == isPinBlocked)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage)&&(identical(other.isUpdatingCard, isUpdatingCard) || other.isUpdatingCard == isUpdatingCard)&&(identical(other.cardStatusError, cardStatusError) || other.cardStatusError == cardStatusError)&&(identical(other.cardStatusSuccess, cardStatusSuccess) || other.cardStatusSuccess == cardStatusSuccess)&&(identical(other.showPin, showPin) || other.showPin == showPin)&&(identical(other.selectedStatus, selectedStatus) || other.selectedStatus == selectedStatus)&&(identical(other.pin, pin) || other.pin == pin)&&(identical(other.isSigning, isSigning) || other.isSigning == isSigning)&&(identical(other.isLoadingTransactions, isLoadingTransactions) || other.isLoadingTransactions == isLoadingTransactions)&&const DeepCollectionEquality().equals(other.transactionPages, transactionPages)&&(identical(other.nextCursor, nextCursor) || other.nextCursor == nextCursor)&&(identical(other.isLoadingMore, isLoadingMore) || other.isLoadingMore == isLoadingMore)&&(identical(other.currentPage, currentPage) || other.currentPage == currentPage));
 }
 
 
 @override
-int get hashCode => Object.hashAll([runtimeType,isLoading,childProfile,childWallet,device,cardId,cardStatus,locked,errorMessage,isUpdatingCard,cardStatusError,cardStatusSuccess,showPin,selectedStatus,pin,isSigning,isLoadingTransactions,const DeepCollectionEquality().hash(transactionPages),nextCursor,isLoadingMore,currentPage]);
+int get hashCode => Object.hashAll([runtimeType,isLoading,childProfile,childWallet,device,cardId,cardStatus,locked,isPinBlocked,errorMessage,isUpdatingCard,cardStatusError,cardStatusSuccess,showPin,selectedStatus,pin,isSigning,isLoadingTransactions,const DeepCollectionEquality().hash(transactionPages),nextCursor,isLoadingMore,currentPage]);
 
 @override
 String toString() {
-  return 'ChildWalletViewState(isLoading: $isLoading, childProfile: $childProfile, childWallet: $childWallet, device: $device, cardId: $cardId, cardStatus: $cardStatus, locked: $locked, errorMessage: $errorMessage, isUpdatingCard: $isUpdatingCard, cardStatusError: $cardStatusError, cardStatusSuccess: $cardStatusSuccess, showPin: $showPin, selectedStatus: $selectedStatus, pin: $pin, isSigning: $isSigning, isLoadingTransactions: $isLoadingTransactions, transactionPages: $transactionPages, nextCursor: $nextCursor, isLoadingMore: $isLoadingMore, currentPage: $currentPage)';
+  return 'ChildWalletViewState(isLoading: $isLoading, childProfile: $childProfile, childWallet: $childWallet, device: $device, cardId: $cardId, cardStatus: $cardStatus, locked: $locked, isPinBlocked: $isPinBlocked, errorMessage: $errorMessage, isUpdatingCard: $isUpdatingCard, cardStatusError: $cardStatusError, cardStatusSuccess: $cardStatusSuccess, showPin: $showPin, selectedStatus: $selectedStatus, pin: $pin, isSigning: $isSigning, isLoadingTransactions: $isLoadingTransactions, transactionPages: $transactionPages, nextCursor: $nextCursor, isLoadingMore: $isLoadingMore, currentPage: $currentPage)';
 }
 
 
@@ -45,7 +45,7 @@ abstract mixin class $ChildWalletViewStateCopyWith<$Res>  {
   factory $ChildWalletViewStateCopyWith(ChildWalletViewState value, $Res Function(ChildWalletViewState) _then) = _$ChildWalletViewStateCopyWithImpl;
 @useResult
 $Res call({
- bool isLoading, ChildProfileEntity? childProfile, ChildWalletEntity? childWallet, DeviceEntity? device, String cardId, String cardStatus, bool locked, String errorMessage, bool isUpdatingCard, String cardStatusError, bool cardStatusSuccess, bool showPin, String selectedStatus, String pin, bool isSigning, bool isLoadingTransactions, List<List<WalletTransactionEntity>> transactionPages, String? nextCursor, bool isLoadingMore, int currentPage
+ bool isLoading, ChildProfileEntity? childProfile, ChildWalletEntity? childWallet, DeviceEntity? device, String cardId, String cardStatus, bool locked, bool isPinBlocked, String errorMessage, bool isUpdatingCard, String cardStatusError, bool cardStatusSuccess, bool showPin, String selectedStatus, String pin, bool isSigning, bool isLoadingTransactions, List<List<WalletTransactionEntity>> transactionPages, String? nextCursor, bool isLoadingMore, int currentPage
 });
 
 
@@ -62,7 +62,7 @@ class _$ChildWalletViewStateCopyWithImpl<$Res>
 
 /// Create a copy of ChildWalletViewState
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? isLoading = null,Object? childProfile = freezed,Object? childWallet = freezed,Object? device = freezed,Object? cardId = null,Object? cardStatus = null,Object? locked = null,Object? errorMessage = null,Object? isUpdatingCard = null,Object? cardStatusError = null,Object? cardStatusSuccess = null,Object? showPin = null,Object? selectedStatus = null,Object? pin = null,Object? isSigning = null,Object? isLoadingTransactions = null,Object? transactionPages = null,Object? nextCursor = freezed,Object? isLoadingMore = null,Object? currentPage = null,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? isLoading = null,Object? childProfile = freezed,Object? childWallet = freezed,Object? device = freezed,Object? cardId = null,Object? cardStatus = null,Object? locked = null,Object? isPinBlocked = null,Object? errorMessage = null,Object? isUpdatingCard = null,Object? cardStatusError = null,Object? cardStatusSuccess = null,Object? showPin = null,Object? selectedStatus = null,Object? pin = null,Object? isSigning = null,Object? isLoadingTransactions = null,Object? transactionPages = null,Object? nextCursor = freezed,Object? isLoadingMore = null,Object? currentPage = null,}) {
   return _then(_self.copyWith(
 isLoading: null == isLoading ? _self.isLoading : isLoading // ignore: cast_nullable_to_non_nullable
 as bool,childProfile: freezed == childProfile ? _self.childProfile : childProfile // ignore: cast_nullable_to_non_nullable
@@ -71,6 +71,7 @@ as ChildWalletEntity?,device: freezed == device ? _self.device : device // ignor
 as DeviceEntity?,cardId: null == cardId ? _self.cardId : cardId // ignore: cast_nullable_to_non_nullable
 as String,cardStatus: null == cardStatus ? _self.cardStatus : cardStatus // ignore: cast_nullable_to_non_nullable
 as String,locked: null == locked ? _self.locked : locked // ignore: cast_nullable_to_non_nullable
+as bool,isPinBlocked: null == isPinBlocked ? _self.isPinBlocked : isPinBlocked // ignore: cast_nullable_to_non_nullable
 as bool,errorMessage: null == errorMessage ? _self.errorMessage : errorMessage // ignore: cast_nullable_to_non_nullable
 as String,isUpdatingCard: null == isUpdatingCard ? _self.isUpdatingCard : isUpdatingCard // ignore: cast_nullable_to_non_nullable
 as bool,cardStatusError: null == cardStatusError ? _self.cardStatusError : cardStatusError // ignore: cast_nullable_to_non_nullable
@@ -205,10 +206,10 @@ return $default(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( bool isLoading,  ChildProfileEntity? childProfile,  ChildWalletEntity? childWallet,  DeviceEntity? device,  String cardId,  String cardStatus,  bool locked,  String errorMessage,  bool isUpdatingCard,  String cardStatusError,  bool cardStatusSuccess,  bool showPin,  String selectedStatus,  String pin,  bool isSigning,  bool isLoadingTransactions,  List<List<WalletTransactionEntity>> transactionPages,  String? nextCursor,  bool isLoadingMore,  int currentPage)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( bool isLoading,  ChildProfileEntity? childProfile,  ChildWalletEntity? childWallet,  DeviceEntity? device,  String cardId,  String cardStatus,  bool locked,  bool isPinBlocked,  String errorMessage,  bool isUpdatingCard,  String cardStatusError,  bool cardStatusSuccess,  bool showPin,  String selectedStatus,  String pin,  bool isSigning,  bool isLoadingTransactions,  List<List<WalletTransactionEntity>> transactionPages,  String? nextCursor,  bool isLoadingMore,  int currentPage)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _ChildWalletViewState() when $default != null:
-return $default(_that.isLoading,_that.childProfile,_that.childWallet,_that.device,_that.cardId,_that.cardStatus,_that.locked,_that.errorMessage,_that.isUpdatingCard,_that.cardStatusError,_that.cardStatusSuccess,_that.showPin,_that.selectedStatus,_that.pin,_that.isSigning,_that.isLoadingTransactions,_that.transactionPages,_that.nextCursor,_that.isLoadingMore,_that.currentPage);case _:
+return $default(_that.isLoading,_that.childProfile,_that.childWallet,_that.device,_that.cardId,_that.cardStatus,_that.locked,_that.isPinBlocked,_that.errorMessage,_that.isUpdatingCard,_that.cardStatusError,_that.cardStatusSuccess,_that.showPin,_that.selectedStatus,_that.pin,_that.isSigning,_that.isLoadingTransactions,_that.transactionPages,_that.nextCursor,_that.isLoadingMore,_that.currentPage);case _:
   return orElse();
 
 }
@@ -226,10 +227,10 @@ return $default(_that.isLoading,_that.childProfile,_that.childWallet,_that.devic
 /// }
 /// ```
 
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( bool isLoading,  ChildProfileEntity? childProfile,  ChildWalletEntity? childWallet,  DeviceEntity? device,  String cardId,  String cardStatus,  bool locked,  String errorMessage,  bool isUpdatingCard,  String cardStatusError,  bool cardStatusSuccess,  bool showPin,  String selectedStatus,  String pin,  bool isSigning,  bool isLoadingTransactions,  List<List<WalletTransactionEntity>> transactionPages,  String? nextCursor,  bool isLoadingMore,  int currentPage)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( bool isLoading,  ChildProfileEntity? childProfile,  ChildWalletEntity? childWallet,  DeviceEntity? device,  String cardId,  String cardStatus,  bool locked,  bool isPinBlocked,  String errorMessage,  bool isUpdatingCard,  String cardStatusError,  bool cardStatusSuccess,  bool showPin,  String selectedStatus,  String pin,  bool isSigning,  bool isLoadingTransactions,  List<List<WalletTransactionEntity>> transactionPages,  String? nextCursor,  bool isLoadingMore,  int currentPage)  $default,) {final _that = this;
 switch (_that) {
 case _ChildWalletViewState():
-return $default(_that.isLoading,_that.childProfile,_that.childWallet,_that.device,_that.cardId,_that.cardStatus,_that.locked,_that.errorMessage,_that.isUpdatingCard,_that.cardStatusError,_that.cardStatusSuccess,_that.showPin,_that.selectedStatus,_that.pin,_that.isSigning,_that.isLoadingTransactions,_that.transactionPages,_that.nextCursor,_that.isLoadingMore,_that.currentPage);case _:
+return $default(_that.isLoading,_that.childProfile,_that.childWallet,_that.device,_that.cardId,_that.cardStatus,_that.locked,_that.isPinBlocked,_that.errorMessage,_that.isUpdatingCard,_that.cardStatusError,_that.cardStatusSuccess,_that.showPin,_that.selectedStatus,_that.pin,_that.isSigning,_that.isLoadingTransactions,_that.transactionPages,_that.nextCursor,_that.isLoadingMore,_that.currentPage);case _:
   throw StateError('Unexpected subclass');
 
 }
@@ -246,10 +247,10 @@ return $default(_that.isLoading,_that.childProfile,_that.childWallet,_that.devic
 /// }
 /// ```
 
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( bool isLoading,  ChildProfileEntity? childProfile,  ChildWalletEntity? childWallet,  DeviceEntity? device,  String cardId,  String cardStatus,  bool locked,  String errorMessage,  bool isUpdatingCard,  String cardStatusError,  bool cardStatusSuccess,  bool showPin,  String selectedStatus,  String pin,  bool isSigning,  bool isLoadingTransactions,  List<List<WalletTransactionEntity>> transactionPages,  String? nextCursor,  bool isLoadingMore,  int currentPage)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( bool isLoading,  ChildProfileEntity? childProfile,  ChildWalletEntity? childWallet,  DeviceEntity? device,  String cardId,  String cardStatus,  bool locked,  bool isPinBlocked,  String errorMessage,  bool isUpdatingCard,  String cardStatusError,  bool cardStatusSuccess,  bool showPin,  String selectedStatus,  String pin,  bool isSigning,  bool isLoadingTransactions,  List<List<WalletTransactionEntity>> transactionPages,  String? nextCursor,  bool isLoadingMore,  int currentPage)?  $default,) {final _that = this;
 switch (_that) {
 case _ChildWalletViewState() when $default != null:
-return $default(_that.isLoading,_that.childProfile,_that.childWallet,_that.device,_that.cardId,_that.cardStatus,_that.locked,_that.errorMessage,_that.isUpdatingCard,_that.cardStatusError,_that.cardStatusSuccess,_that.showPin,_that.selectedStatus,_that.pin,_that.isSigning,_that.isLoadingTransactions,_that.transactionPages,_that.nextCursor,_that.isLoadingMore,_that.currentPage);case _:
+return $default(_that.isLoading,_that.childProfile,_that.childWallet,_that.device,_that.cardId,_that.cardStatus,_that.locked,_that.isPinBlocked,_that.errorMessage,_that.isUpdatingCard,_that.cardStatusError,_that.cardStatusSuccess,_that.showPin,_that.selectedStatus,_that.pin,_that.isSigning,_that.isLoadingTransactions,_that.transactionPages,_that.nextCursor,_that.isLoadingMore,_that.currentPage);case _:
   return null;
 
 }
@@ -261,7 +262,7 @@ return $default(_that.isLoading,_that.childProfile,_that.childWallet,_that.devic
 
 
 class _ChildWalletViewState implements ChildWalletViewState {
-  const _ChildWalletViewState({this.isLoading = true, this.childProfile, this.childWallet, this.device, this.cardId = '', this.cardStatus = '', this.locked = false, this.errorMessage = '', this.isUpdatingCard = false, this.cardStatusError = '', this.cardStatusSuccess = false, this.showPin = false, this.selectedStatus = '', this.pin = '', this.isSigning = false, this.isLoadingTransactions = false, final  List<List<WalletTransactionEntity>> transactionPages = const [], this.nextCursor, this.isLoadingMore = false, this.currentPage = 0}): _transactionPages = transactionPages;
+  const _ChildWalletViewState({this.isLoading = true, this.childProfile, this.childWallet, this.device, this.cardId = '', this.cardStatus = '', this.locked = false, this.isPinBlocked = false, this.errorMessage = '', this.isUpdatingCard = false, this.cardStatusError = '', this.cardStatusSuccess = false, this.showPin = false, this.selectedStatus = '', this.pin = '', this.isSigning = false, this.isLoadingTransactions = false, final  List<List<WalletTransactionEntity>> transactionPages = const [], this.nextCursor, this.isLoadingMore = false, this.currentPage = 0}): _transactionPages = transactionPages;
   
 
 @override@JsonKey() final  bool isLoading;
@@ -271,6 +272,7 @@ class _ChildWalletViewState implements ChildWalletViewState {
 @override@JsonKey() final  String cardId;
 @override@JsonKey() final  String cardStatus;
 @override@JsonKey() final  bool locked;
+@override@JsonKey() final  bool isPinBlocked;
 @override@JsonKey() final  String errorMessage;
 @override@JsonKey() final  bool isUpdatingCard;
 @override@JsonKey() final  String cardStatusError;
@@ -301,16 +303,16 @@ _$ChildWalletViewStateCopyWith<_ChildWalletViewState> get copyWith => __$ChildWa
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _ChildWalletViewState&&(identical(other.isLoading, isLoading) || other.isLoading == isLoading)&&(identical(other.childProfile, childProfile) || other.childProfile == childProfile)&&(identical(other.childWallet, childWallet) || other.childWallet == childWallet)&&(identical(other.device, device) || other.device == device)&&(identical(other.cardId, cardId) || other.cardId == cardId)&&(identical(other.cardStatus, cardStatus) || other.cardStatus == cardStatus)&&(identical(other.locked, locked) || other.locked == locked)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage)&&(identical(other.isUpdatingCard, isUpdatingCard) || other.isUpdatingCard == isUpdatingCard)&&(identical(other.cardStatusError, cardStatusError) || other.cardStatusError == cardStatusError)&&(identical(other.cardStatusSuccess, cardStatusSuccess) || other.cardStatusSuccess == cardStatusSuccess)&&(identical(other.showPin, showPin) || other.showPin == showPin)&&(identical(other.selectedStatus, selectedStatus) || other.selectedStatus == selectedStatus)&&(identical(other.pin, pin) || other.pin == pin)&&(identical(other.isSigning, isSigning) || other.isSigning == isSigning)&&(identical(other.isLoadingTransactions, isLoadingTransactions) || other.isLoadingTransactions == isLoadingTransactions)&&const DeepCollectionEquality().equals(other._transactionPages, _transactionPages)&&(identical(other.nextCursor, nextCursor) || other.nextCursor == nextCursor)&&(identical(other.isLoadingMore, isLoadingMore) || other.isLoadingMore == isLoadingMore)&&(identical(other.currentPage, currentPage) || other.currentPage == currentPage));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _ChildWalletViewState&&(identical(other.isLoading, isLoading) || other.isLoading == isLoading)&&(identical(other.childProfile, childProfile) || other.childProfile == childProfile)&&(identical(other.childWallet, childWallet) || other.childWallet == childWallet)&&(identical(other.device, device) || other.device == device)&&(identical(other.cardId, cardId) || other.cardId == cardId)&&(identical(other.cardStatus, cardStatus) || other.cardStatus == cardStatus)&&(identical(other.locked, locked) || other.locked == locked)&&(identical(other.isPinBlocked, isPinBlocked) || other.isPinBlocked == isPinBlocked)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage)&&(identical(other.isUpdatingCard, isUpdatingCard) || other.isUpdatingCard == isUpdatingCard)&&(identical(other.cardStatusError, cardStatusError) || other.cardStatusError == cardStatusError)&&(identical(other.cardStatusSuccess, cardStatusSuccess) || other.cardStatusSuccess == cardStatusSuccess)&&(identical(other.showPin, showPin) || other.showPin == showPin)&&(identical(other.selectedStatus, selectedStatus) || other.selectedStatus == selectedStatus)&&(identical(other.pin, pin) || other.pin == pin)&&(identical(other.isSigning, isSigning) || other.isSigning == isSigning)&&(identical(other.isLoadingTransactions, isLoadingTransactions) || other.isLoadingTransactions == isLoadingTransactions)&&const DeepCollectionEquality().equals(other._transactionPages, _transactionPages)&&(identical(other.nextCursor, nextCursor) || other.nextCursor == nextCursor)&&(identical(other.isLoadingMore, isLoadingMore) || other.isLoadingMore == isLoadingMore)&&(identical(other.currentPage, currentPage) || other.currentPage == currentPage));
 }
 
 
 @override
-int get hashCode => Object.hashAll([runtimeType,isLoading,childProfile,childWallet,device,cardId,cardStatus,locked,errorMessage,isUpdatingCard,cardStatusError,cardStatusSuccess,showPin,selectedStatus,pin,isSigning,isLoadingTransactions,const DeepCollectionEquality().hash(_transactionPages),nextCursor,isLoadingMore,currentPage]);
+int get hashCode => Object.hashAll([runtimeType,isLoading,childProfile,childWallet,device,cardId,cardStatus,locked,isPinBlocked,errorMessage,isUpdatingCard,cardStatusError,cardStatusSuccess,showPin,selectedStatus,pin,isSigning,isLoadingTransactions,const DeepCollectionEquality().hash(_transactionPages),nextCursor,isLoadingMore,currentPage]);
 
 @override
 String toString() {
-  return 'ChildWalletViewState(isLoading: $isLoading, childProfile: $childProfile, childWallet: $childWallet, device: $device, cardId: $cardId, cardStatus: $cardStatus, locked: $locked, errorMessage: $errorMessage, isUpdatingCard: $isUpdatingCard, cardStatusError: $cardStatusError, cardStatusSuccess: $cardStatusSuccess, showPin: $showPin, selectedStatus: $selectedStatus, pin: $pin, isSigning: $isSigning, isLoadingTransactions: $isLoadingTransactions, transactionPages: $transactionPages, nextCursor: $nextCursor, isLoadingMore: $isLoadingMore, currentPage: $currentPage)';
+  return 'ChildWalletViewState(isLoading: $isLoading, childProfile: $childProfile, childWallet: $childWallet, device: $device, cardId: $cardId, cardStatus: $cardStatus, locked: $locked, isPinBlocked: $isPinBlocked, errorMessage: $errorMessage, isUpdatingCard: $isUpdatingCard, cardStatusError: $cardStatusError, cardStatusSuccess: $cardStatusSuccess, showPin: $showPin, selectedStatus: $selectedStatus, pin: $pin, isSigning: $isSigning, isLoadingTransactions: $isLoadingTransactions, transactionPages: $transactionPages, nextCursor: $nextCursor, isLoadingMore: $isLoadingMore, currentPage: $currentPage)';
 }
 
 
@@ -321,7 +323,7 @@ abstract mixin class _$ChildWalletViewStateCopyWith<$Res> implements $ChildWalle
   factory _$ChildWalletViewStateCopyWith(_ChildWalletViewState value, $Res Function(_ChildWalletViewState) _then) = __$ChildWalletViewStateCopyWithImpl;
 @override @useResult
 $Res call({
- bool isLoading, ChildProfileEntity? childProfile, ChildWalletEntity? childWallet, DeviceEntity? device, String cardId, String cardStatus, bool locked, String errorMessage, bool isUpdatingCard, String cardStatusError, bool cardStatusSuccess, bool showPin, String selectedStatus, String pin, bool isSigning, bool isLoadingTransactions, List<List<WalletTransactionEntity>> transactionPages, String? nextCursor, bool isLoadingMore, int currentPage
+ bool isLoading, ChildProfileEntity? childProfile, ChildWalletEntity? childWallet, DeviceEntity? device, String cardId, String cardStatus, bool locked, bool isPinBlocked, String errorMessage, bool isUpdatingCard, String cardStatusError, bool cardStatusSuccess, bool showPin, String selectedStatus, String pin, bool isSigning, bool isLoadingTransactions, List<List<WalletTransactionEntity>> transactionPages, String? nextCursor, bool isLoadingMore, int currentPage
 });
 
 
@@ -338,7 +340,7 @@ class __$ChildWalletViewStateCopyWithImpl<$Res>
 
 /// Create a copy of ChildWalletViewState
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? isLoading = null,Object? childProfile = freezed,Object? childWallet = freezed,Object? device = freezed,Object? cardId = null,Object? cardStatus = null,Object? locked = null,Object? errorMessage = null,Object? isUpdatingCard = null,Object? cardStatusError = null,Object? cardStatusSuccess = null,Object? showPin = null,Object? selectedStatus = null,Object? pin = null,Object? isSigning = null,Object? isLoadingTransactions = null,Object? transactionPages = null,Object? nextCursor = freezed,Object? isLoadingMore = null,Object? currentPage = null,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? isLoading = null,Object? childProfile = freezed,Object? childWallet = freezed,Object? device = freezed,Object? cardId = null,Object? cardStatus = null,Object? locked = null,Object? isPinBlocked = null,Object? errorMessage = null,Object? isUpdatingCard = null,Object? cardStatusError = null,Object? cardStatusSuccess = null,Object? showPin = null,Object? selectedStatus = null,Object? pin = null,Object? isSigning = null,Object? isLoadingTransactions = null,Object? transactionPages = null,Object? nextCursor = freezed,Object? isLoadingMore = null,Object? currentPage = null,}) {
   return _then(_ChildWalletViewState(
 isLoading: null == isLoading ? _self.isLoading : isLoading // ignore: cast_nullable_to_non_nullable
 as bool,childProfile: freezed == childProfile ? _self.childProfile : childProfile // ignore: cast_nullable_to_non_nullable
@@ -347,6 +349,7 @@ as ChildWalletEntity?,device: freezed == device ? _self.device : device // ignor
 as DeviceEntity?,cardId: null == cardId ? _self.cardId : cardId // ignore: cast_nullable_to_non_nullable
 as String,cardStatus: null == cardStatus ? _self.cardStatus : cardStatus // ignore: cast_nullable_to_non_nullable
 as String,locked: null == locked ? _self.locked : locked // ignore: cast_nullable_to_non_nullable
+as bool,isPinBlocked: null == isPinBlocked ? _self.isPinBlocked : isPinBlocked // ignore: cast_nullable_to_non_nullable
 as bool,errorMessage: null == errorMessage ? _self.errorMessage : errorMessage // ignore: cast_nullable_to_non_nullable
 as String,isUpdatingCard: null == isUpdatingCard ? _self.isUpdatingCard : isUpdatingCard // ignore: cast_nullable_to_non_nullable
 as bool,cardStatusError: null == cardStatusError ? _self.cardStatusError : cardStatusError // ignore: cast_nullable_to_non_nullable

modules/home/lib/src/features/renew_card/renew_card_builder.dart

@@ -0,0 +1,22 @@
+import 'package:flutter/material.dart';
+import 'package:get_it/get_it.dart';
+import 'package:go_router/go_router.dart';
+import 'package:navigation/navigation.dart';
+
+import 'renew_card_screen.dart';
+
+class RenewCardBuilder {
+  const RenewCardBuilder();
+
+  Page<void> buildPage(BuildContext context, GoRouterState state) {
+    final childWalletId = state.pathParameters['childWalletId'] ?? '';
+    final navigationContract = GetIt.I<NavigationContract>();
+    return MaterialPage(
+      key: state.pageKey,
+      child: RenewCardScreen(
+        childId: childWalletId,
+        navigation: navigationContract,
+      ),
+    );
+  }
+}

modules/home/lib/src/features/renew_card/renew_card_screen.dart

@@ -0,0 +1,162 @@
+import 'package:auth/auth.dart';
+import 'package:design_system/design_system.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:navigation/navigation.dart';
+import 'package:sf_localizations/sf_localizations.dart';
+
+import 'renew_card_view_model.dart';
+import 'renew_card_view_state.dart';
+
+class RenewCardScreen extends ConsumerWidget {
+  final String childId;
+  final NavigationContract navigation;
+
+  const RenewCardScreen({
+    super.key,
+    required this.childId,
+    required this.navigation,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final theme = ref.watch(themePortProvider);
+    final viewState = ref.watch(renewCardViewModelProvider(childId));
+    final viewModel = ref.read(renewCardViewModelProvider(childId).notifier);
+
+    ref.listen(renewCardViewModelProvider(childId), (prev, next) {
+      if (next.success && !(prev?.success ?? false)) {
+        showTopSnackbar(
+          context,
+          message: context.translate(I18n.renewCardSuccess),
+          type: MessageType.success,
+        );
+        navigation.goBack();
+        return;
+      }
+      if (next.errorMessage.isNotEmpty &&
+          next.errorMessage != (prev?.errorMessage ?? '')) {
+        showTopSnackbar(
+          context,
+          message: context.translate(I18n.renewCardError),
+          type: MessageType.error,
+        );
+      }
+    });
+
+    if (viewState.isLoading) {
+      return const Scaffold(body: Center(child: AppLoadingIndicator()));
+    }
+
+    if (viewState.errorMessage.isNotEmpty && viewState.childProfile == null) {
+      return Scaffold(
+        body: Center(child: Text('Error: ${viewState.errorMessage}')),
+      );
+    }
+
+    if (viewState.step == RenewCardStep.scaPin) {
+      return Scaffold(
+        backgroundColor: theme.getColorFor(ThemeCode.backgroundSecondary),
+        appBar: AppBar(
+          backgroundColor: theme.getColorFor(ThemeCode.backgroundSecondary),
+          leading: IconButton(
+            icon: Icon(
+              Icons.arrow_back,
+              color: theme.getColorFor(ThemeCode.textPrimary),
+            ),
+            onPressed: viewModel.goBackToToken,
+          ),
+        ),
+        body: SafeArea(
+          child: Column(
+            children: [
+              Expanded(
+                child: SingleChildScrollView(
+                  child: ScaPinView(
+                    title: context.translate(I18n.renewCardPinTitle),
+                    pin: viewState.pin,
+                    isProcessing:
+                        viewState.isSigning || viewState.isSubmitting,
+                    processingText: context.translate(I18n.scaSigning),
+                    canSubmit: viewModel.canSubmitPin,
+                    submitText: context.translate(I18n.scaConnect),
+                    clearPinText: context.translate(I18n.scaClearPin),
+                    onDigitPressed: viewModel.onDigitPressed,
+                    onBackspacePressed: viewModel.onBackspacePressed,
+                    onClearPin: viewModel.onClearPin,
+                    onSubmit: () => viewModel.onPinSubmit(),
+                  ),
+                ),
+              ),
+              TextButton(
+                onPressed: () => navigation.goBack(),
+                child: Text(context.translate(I18n.cancel)),
+              ),
+            ],
+          ),
+        ),
+      );
+    }
+
+    return Scaffold(
+      backgroundColor: theme.getColorFor(ThemeCode.backgroundSecondary),
+      appBar: AppBar(
+        backgroundColor: theme.getColorFor(ThemeCode.backgroundSecondary),
+        leading: IconButton(
+          icon: Icon(
+            Icons.arrow_back,
+            color: theme.getColorFor(ThemeCode.textPrimary),
+          ),
+          onPressed: () => navigation.goBack(),
+        ),
+      ),
+      body: SafeArea(
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 20),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              const SizedBox(height: 20),
+              Text(
+                context.translate(I18n.renewCardTitle),
+                style: const TextStyle(
+                  fontSize: 24,
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+              const SizedBox(height: 12),
+              Text(
+                context.translate(I18n.renewCardTokenHint),
+                style: const TextStyle(fontSize: 16),
+              ),
+              const SizedBox(height: 20),
+              CustomTextField(
+                controller: viewModel.cardTokenController,
+                hint: 'XXXXXXXXXX',
+              ),
+              const Spacer(),
+              SizedBox(
+                width: double.infinity,
+                child: PrimaryButton(
+                  onPressed: viewState.cardToken.isEmpty
+                      ? null
+                      : viewModel.onCardTokenSubmit,
+                  text: context.translate(I18n.cardPinNext),
+                  color: theme.getColorFor(ThemeCode.buttonPrimary),
+                ),
+              ),
+              const SizedBox(height: 8),
+              Center(
+                child: TextButton(
+                  onPressed: () => navigation.goBack(),
+                  child: Text(context.translate(I18n.cancel)),
+                ),
+              ),
+              const SizedBox(height: 16),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

modules/home/lib/src/features/renew_card/renew_card_view_model.dart

@@ -0,0 +1,141 @@
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:get_it/get_it.dart';
+import 'package:sca_treezor/sca_treezor.dart';
+import 'package:sf_shared/sf_shared.dart';
+
+import '../child_wallet/child_data_provider.dart';
+import 'renew_card_view_state.dart';
+
+final renewCardViewModelProvider = NotifierProvider.autoDispose
+    .family<RenewCardViewModel, RenewCardViewState, String>(
+  RenewCardViewModel.new,
+);
+
+class RenewCardViewModel extends Notifier<RenewCardViewState> {
+  final String childId;
+  RenewCardViewModel(this.childId);
+
+  late final TextEditingController cardTokenController;
+  late final TreezorWalletConnectionService _connectionService;
+  late final TreezorWalletSignatureService _signatureService;
+
+  @override
+  RenewCardViewState build() {
+    _connectionService = GetIt.I<TreezorWalletConnectionService>();
+    _signatureService = GetIt.I<TreezorWalletSignatureService>();
+
+    cardTokenController = TextEditingController();
+    cardTokenController.addListener(_onTokenChanged);
+    ref.onDispose(_disposeControllers);
+
+    ref.listen(childDataProvider(childId), (prev, next) {
+      state = state.copyWith(
+        isLoading: next.isLoading,
+        childProfile: next.childProfile,
+        childWallet: next.childWallet,
+        device: next.device,
+        errorMessage: next.errorMessage,
+      );
+    });
+
+    final data = ref.read(childDataProvider(childId));
+    return RenewCardViewState(
+      isLoading: data.isLoading,
+      childProfile: data.childProfile,
+      childWallet: data.childWallet,
+      device: data.device,
+      errorMessage: data.errorMessage,
+    );
+  }
+
+  void _disposeControllers() {
+    cardTokenController.removeListener(_onTokenChanged);
+    cardTokenController.dispose();
+  }
+
+  void _onTokenChanged() {
+    state = state.copyWith(cardToken: cardTokenController.text.trim());
+  }
+
+  void onCardTokenSubmit() {
+    if (state.cardToken.isEmpty) return;
+    state = state.copyWith(step: RenewCardStep.scaPin, pin: '', errorMessage: '');
+  }
+
+  void goBackToToken() {
+    state = state.copyWith(step: RenewCardStep.cardToken, pin: '');
+  }
+
+  void onDigitPressed(String digit) {
+    if (state.pin.length >= 6) return;
+    state = state.copyWith(pin: state.pin + digit, errorMessage: '');
+  }
+
+  void onBackspacePressed() {
+    if (state.pin.isEmpty) return;
+    state = state.copyWith(pin: state.pin.substring(0, state.pin.length - 1));
+  }
+
+  void onClearPin() {
+    state = state.copyWith(pin: '');
+  }
+
+  bool get canSubmitPin => state.pin.length == 6;
+
+  Future<void> onPinSubmit() async {
+    final childProfile = state.childProfile;
+    final cardToken = state.cardToken;
+    if (childProfile == null || cardToken.isEmpty) return;
+
+    state = state.copyWith(isSigning: true, errorMessage: '');
+
+    try {
+      debugPrint('[RenewCard] connecting with SCA PIN...');
+      await _connectionService.connectWithPin(loginPin: state.pin);
+      if (!ref.mounted) return;
+      debugPrint('[RenewCard] SCA connection successful');
+
+      final url =
+          'https://savefamily.sandbox.treezor.co/v1/cards/$cardToken/public-token-activation';
+      final scaInput = jsonEncode({
+        'url': url,
+        'body': <String, dynamic>{},
+      });
+      debugPrint('[RenewCard] scaInput: $scaInput');
+
+      final scaProof = await _signatureService.generateJwsWithPin(
+        message: '',
+        input: scaInput,
+        pin: state.pin,
+      );
+      debugPrint('[RenewCard] scaProof: $scaProof');
+
+      if (!ref.mounted) return;
+      state = state.copyWith(isSigning: false, isSubmitting: true, pin: '');
+
+      debugPrint('[RenewCard] calling backend renewCard childProfileId=${childProfile.id} publicToken=$cardToken');
+      await ref.read(treezorRepositoryProvider).renewCard(
+            childProfileId: childProfile.id,
+            publicToken: cardToken,
+            scaProof: scaProof,
+          );
+      debugPrint('[RenewCard] renewCard SUCCESS');
+
+      if (!ref.mounted) return;
+      ref.read(walletRefreshProvider.notifier).refresh();
+      state = state.copyWith(isSubmitting: false, success: true);
+    } catch (e) {
+      debugPrint('[RenewCard] ERROR: $e');
+      if (!ref.mounted) return;
+      state = state.copyWith(
+        isSigning: false,
+        isSubmitting: false,
+        pin: '',
+        errorMessage: e.toString(),
+      );
+    }
+  }
+}

modules/home/lib/src/features/renew_card/renew_card_view_state.dart

@@ -0,0 +1,23 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:sf_shared/sf_shared.dart';
+
+part 'renew_card_view_state.freezed.dart';
+
+enum RenewCardStep { cardToken, scaPin }
+
+@freezed
+abstract class RenewCardViewState with _$RenewCardViewState {
+  const factory RenewCardViewState({
+    @Default(true) bool isLoading,
+    ChildProfileEntity? childProfile,
+    ChildWalletEntity? childWallet,
+    DeviceEntity? device,
+    @Default('') String cardToken,
+    @Default('') String pin,
+    @Default(RenewCardStep.cardToken) RenewCardStep step,
+    @Default(false) bool isSigning,
+    @Default(false) bool isSubmitting,
+    @Default(false) bool success,
+    @Default('') String errorMessage,
+  }) = _RenewCardViewState;
+}

modules/home/lib/src/features/renew_card/renew_card_view_state.freezed.dart

@@ -0,0 +1,373 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'renew_card_view_state.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+/// @nodoc
+mixin _$RenewCardViewState {
+
+ bool get isLoading; ChildProfileEntity? get childProfile; ChildWalletEntity? get childWallet; DeviceEntity? get device; String get cardToken; String get pin; RenewCardStep get step; bool get isSigning; bool get isSubmitting; bool get success; String get errorMessage;
+/// Create a copy of RenewCardViewState
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$RenewCardViewStateCopyWith<RenewCardViewState> get copyWith => _$RenewCardViewStateCopyWithImpl<RenewCardViewState>(this as RenewCardViewState, _$identity);
+
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is RenewCardViewState&&(identical(other.isLoading, isLoading) || other.isLoading == isLoading)&&(identical(other.childProfile, childProfile) || other.childProfile == childProfile)&&(identical(other.childWallet, childWallet) || other.childWallet == childWallet)&&(identical(other.device, device) || other.device == device)&&(identical(other.cardToken, cardToken) || other.cardToken == cardToken)&&(identical(other.pin, pin) || other.pin == pin)&&(identical(other.step, step) || other.step == step)&&(identical(other.isSigning, isSigning) || other.isSigning == isSigning)&&(identical(other.isSubmitting, isSubmitting) || other.isSubmitting == isSubmitting)&&(identical(other.success, success) || other.success == success)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage));
+}
+
+
+@override
+int get hashCode => Object.hash(runtimeType,isLoading,childProfile,childWallet,device,cardToken,pin,step,isSigning,isSubmitting,success,errorMessage);
+
+@override
+String toString() {
+  return 'RenewCardViewState(isLoading: $isLoading, childProfile: $childProfile, childWallet: $childWallet, device: $device, cardToken: $cardToken, pin: $pin, step: $step, isSigning: $isSigning, isSubmitting: $isSubmitting, success: $success, errorMessage: $errorMessage)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $RenewCardViewStateCopyWith<$Res>  {
+  factory $RenewCardViewStateCopyWith(RenewCardViewState value, $Res Function(RenewCardViewState) _then) = _$RenewCardViewStateCopyWithImpl;
+@useResult
+$Res call({
+ bool isLoading, ChildProfileEntity? childProfile, ChildWalletEntity? childWallet, DeviceEntity? device, String cardToken, String pin, RenewCardStep step, bool isSigning, bool isSubmitting, bool success, String errorMessage
+});
+
+
+$ChildProfileEntityCopyWith<$Res>? get childProfile;$ChildWalletEntityCopyWith<$Res>? get childWallet;$DeviceEntityCopyWith<$Res>? get device;
+
+}
+/// @nodoc
+class _$RenewCardViewStateCopyWithImpl<$Res>
+    implements $RenewCardViewStateCopyWith<$Res> {
+  _$RenewCardViewStateCopyWithImpl(this._self, this._then);
+
+  final RenewCardViewState _self;
+  final $Res Function(RenewCardViewState) _then;
+
+/// Create a copy of RenewCardViewState
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? isLoading = null,Object? childProfile = freezed,Object? childWallet = freezed,Object? device = freezed,Object? cardToken = null,Object? pin = null,Object? step = null,Object? isSigning = null,Object? isSubmitting = null,Object? success = null,Object? errorMessage = null,}) {
+  return _then(_self.copyWith(
+isLoading: null == isLoading ? _self.isLoading : isLoading // ignore: cast_nullable_to_non_nullable
+as bool,childProfile: freezed == childProfile ? _self.childProfile : childProfile // ignore: cast_nullable_to_non_nullable
+as ChildProfileEntity?,childWallet: freezed == childWallet ? _self.childWallet : childWallet // ignore: cast_nullable_to_non_nullable
+as ChildWalletEntity?,device: freezed == device ? _self.device : device // ignore: cast_nullable_to_non_nullable
+as DeviceEntity?,cardToken: null == cardToken ? _self.cardToken : cardToken // ignore: cast_nullable_to_non_nullable
+as String,pin: null == pin ? _self.pin : pin // ignore: cast_nullable_to_non_nullable
+as String,step: null == step ? _self.step : step // ignore: cast_nullable_to_non_nullable
+as RenewCardStep,isSigning: null == isSigning ? _self.isSigning : isSigning // ignore: cast_nullable_to_non_nullable
+as bool,isSubmitting: null == isSubmitting ? _self.isSubmitting : isSubmitting // ignore: cast_nullable_to_non_nullable
+as bool,success: null == success ? _self.success : success // ignore: cast_nullable_to_non_nullable
+as bool,errorMessage: null == errorMessage ? _self.errorMessage : errorMessage // ignore: cast_nullable_to_non_nullable
+as String,
+  ));
+}
+/// Create a copy of RenewCardViewState
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$ChildProfileEntityCopyWith<$Res>? get childProfile {
+    if (_self.childProfile == null) {
+    return null;
+  }
+
+  return $ChildProfileEntityCopyWith<$Res>(_self.childProfile!, (value) {
+    return _then(_self.copyWith(childProfile: value));
+  });
+}/// Create a copy of RenewCardViewState
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$ChildWalletEntityCopyWith<$Res>? get childWallet {
+    if (_self.childWallet == null) {
+    return null;
+  }
+
+  return $ChildWalletEntityCopyWith<$Res>(_self.childWallet!, (value) {
+    return _then(_self.copyWith(childWallet: value));
+  });
+}/// Create a copy of RenewCardViewState
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$DeviceEntityCopyWith<$Res>? get device {
+    if (_self.device == null) {
+    return null;
+  }
+
+  return $DeviceEntityCopyWith<$Res>(_self.device!, (value) {
+    return _then(_self.copyWith(device: value));
+  });
+}
+}
+
+
+/// Adds pattern-matching-related methods to [RenewCardViewState].
+extension RenewCardViewStatePatterns on RenewCardViewState {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _RenewCardViewState value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _RenewCardViewState() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _RenewCardViewState value)  $default,){
+final _that = this;
+switch (_that) {
+case _RenewCardViewState():
+return $default(_that);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _RenewCardViewState value)?  $default,){
+final _that = this;
+switch (_that) {
+case _RenewCardViewState() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( bool isLoading,  ChildProfileEntity? childProfile,  ChildWalletEntity? childWallet,  DeviceEntity? device,  String cardToken,  String pin,  RenewCardStep step,  bool isSigning,  bool isSubmitting,  bool success,  String errorMessage)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _RenewCardViewState() when $default != null:
+return $default(_that.isLoading,_that.childProfile,_that.childWallet,_that.device,_that.cardToken,_that.pin,_that.step,_that.isSigning,_that.isSubmitting,_that.success,_that.errorMessage);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( bool isLoading,  ChildProfileEntity? childProfile,  ChildWalletEntity? childWallet,  DeviceEntity? device,  String cardToken,  String pin,  RenewCardStep step,  bool isSigning,  bool isSubmitting,  bool success,  String errorMessage)  $default,) {final _that = this;
+switch (_that) {
+case _RenewCardViewState():
+return $default(_that.isLoading,_that.childProfile,_that.childWallet,_that.device,_that.cardToken,_that.pin,_that.step,_that.isSigning,_that.isSubmitting,_that.success,_that.errorMessage);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( bool isLoading,  ChildProfileEntity? childProfile,  ChildWalletEntity? childWallet,  DeviceEntity? device,  String cardToken,  String pin,  RenewCardStep step,  bool isSigning,  bool isSubmitting,  bool success,  String errorMessage)?  $default,) {final _that = this;
+switch (_that) {
+case _RenewCardViewState() when $default != null:
+return $default(_that.isLoading,_that.childProfile,_that.childWallet,_that.device,_that.cardToken,_that.pin,_that.step,_that.isSigning,_that.isSubmitting,_that.success,_that.errorMessage);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+
+
+class _RenewCardViewState implements RenewCardViewState {
+  const _RenewCardViewState({this.isLoading = true, this.childProfile, this.childWallet, this.device, this.cardToken = '', this.pin = '', this.step = RenewCardStep.cardToken, this.isSigning = false, this.isSubmitting = false, this.success = false, this.errorMessage = ''});
+  
+
+@override@JsonKey() final  bool isLoading;
+@override final  ChildProfileEntity? childProfile;
+@override final  ChildWalletEntity? childWallet;
+@override final  DeviceEntity? device;
+@override@JsonKey() final  String cardToken;
+@override@JsonKey() final  String pin;
+@override@JsonKey() final  RenewCardStep step;
+@override@JsonKey() final  bool isSigning;
+@override@JsonKey() final  bool isSubmitting;
+@override@JsonKey() final  bool success;
+@override@JsonKey() final  String errorMessage;
+
+/// Create a copy of RenewCardViewState
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$RenewCardViewStateCopyWith<_RenewCardViewState> get copyWith => __$RenewCardViewStateCopyWithImpl<_RenewCardViewState>(this, _$identity);
+
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _RenewCardViewState&&(identical(other.isLoading, isLoading) || other.isLoading == isLoading)&&(identical(other.childProfile, childProfile) || other.childProfile == childProfile)&&(identical(other.childWallet, childWallet) || other.childWallet == childWallet)&&(identical(other.device, device) || other.device == device)&&(identical(other.cardToken, cardToken) || other.cardToken == cardToken)&&(identical(other.pin, pin) || other.pin == pin)&&(identical(other.step, step) || other.step == step)&&(identical(other.isSigning, isSigning) || other.isSigning == isSigning)&&(identical(other.isSubmitting, isSubmitting) || other.isSubmitting == isSubmitting)&&(identical(other.success, success) || other.success == success)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage));
+}
+
+
+@override
+int get hashCode => Object.hash(runtimeType,isLoading,childProfile,childWallet,device,cardToken,pin,step,isSigning,isSubmitting,success,errorMessage);
+
+@override
+String toString() {
+  return 'RenewCardViewState(isLoading: $isLoading, childProfile: $childProfile, childWallet: $childWallet, device: $device, cardToken: $cardToken, pin: $pin, step: $step, isSigning: $isSigning, isSubmitting: $isSubmitting, success: $success, errorMessage: $errorMessage)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$RenewCardViewStateCopyWith<$Res> implements $RenewCardViewStateCopyWith<$Res> {
+  factory _$RenewCardViewStateCopyWith(_RenewCardViewState value, $Res Function(_RenewCardViewState) _then) = __$RenewCardViewStateCopyWithImpl;
+@override @useResult
+$Res call({
+ bool isLoading, ChildProfileEntity? childProfile, ChildWalletEntity? childWallet, DeviceEntity? device, String cardToken, String pin, RenewCardStep step, bool isSigning, bool isSubmitting, bool success, String errorMessage
+});
+
+
+@override $ChildProfileEntityCopyWith<$Res>? get childProfile;@override $ChildWalletEntityCopyWith<$Res>? get childWallet;@override $DeviceEntityCopyWith<$Res>? get device;
+
+}
+/// @nodoc
+class __$RenewCardViewStateCopyWithImpl<$Res>
+    implements _$RenewCardViewStateCopyWith<$Res> {
+  __$RenewCardViewStateCopyWithImpl(this._self, this._then);
+
+  final _RenewCardViewState _self;
+  final $Res Function(_RenewCardViewState) _then;
+
+/// Create a copy of RenewCardViewState
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? isLoading = null,Object? childProfile = freezed,Object? childWallet = freezed,Object? device = freezed,Object? cardToken = null,Object? pin = null,Object? step = null,Object? isSigning = null,Object? isSubmitting = null,Object? success = null,Object? errorMessage = null,}) {
+  return _then(_RenewCardViewState(
+isLoading: null == isLoading ? _self.isLoading : isLoading // ignore: cast_nullable_to_non_nullable
+as bool,childProfile: freezed == childProfile ? _self.childProfile : childProfile // ignore: cast_nullable_to_non_nullable
+as ChildProfileEntity?,childWallet: freezed == childWallet ? _self.childWallet : childWallet // ignore: cast_nullable_to_non_nullable
+as ChildWalletEntity?,device: freezed == device ? _self.device : device // ignore: cast_nullable_to_non_nullable
+as DeviceEntity?,cardToken: null == cardToken ? _self.cardToken : cardToken // ignore: cast_nullable_to_non_nullable
+as String,pin: null == pin ? _self.pin : pin // ignore: cast_nullable_to_non_nullable
+as String,step: null == step ? _self.step : step // ignore: cast_nullable_to_non_nullable
+as RenewCardStep,isSigning: null == isSigning ? _self.isSigning : isSigning // ignore: cast_nullable_to_non_nullable
+as bool,isSubmitting: null == isSubmitting ? _self.isSubmitting : isSubmitting // ignore: cast_nullable_to_non_nullable
+as bool,success: null == success ? _self.success : success // ignore: cast_nullable_to_non_nullable
+as bool,errorMessage: null == errorMessage ? _self.errorMessage : errorMessage // ignore: cast_nullable_to_non_nullable
+as String,
+  ));
+}
+
+/// Create a copy of RenewCardViewState
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$ChildProfileEntityCopyWith<$Res>? get childProfile {
+    if (_self.childProfile == null) {
+    return null;
+  }
+
+  return $ChildProfileEntityCopyWith<$Res>(_self.childProfile!, (value) {
+    return _then(_self.copyWith(childProfile: value));
+  });
+}/// Create a copy of RenewCardViewState
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$ChildWalletEntityCopyWith<$Res>? get childWallet {
+    if (_self.childWallet == null) {
+    return null;
+  }
+
+  return $ChildWalletEntityCopyWith<$Res>(_self.childWallet!, (value) {
+    return _then(_self.copyWith(childWallet: value));
+  });
+}/// Create a copy of RenewCardViewState
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$DeviceEntityCopyWith<$Res>? get device {
+    if (_self.device == null) {
+    return null;
+  }
+
+  return $DeviceEntityCopyWith<$Res>(_self.device!, (value) {
+    return _then(_self.copyWith(device: value));
+  });
+}
+}
+
+// dart format on

modules/legacy/melos_legacy.iml

@@ -32,6 +32,9 @@
       <excludeFolder url="file://$MODULE_DIR$/packages/legacy_design_system/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/packages/legacy_design_system/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/packages/legacy_design_system/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/settings/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/settings/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/settings/build" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Dart SDK" level="project" />

modules/legacy/modules/account/lib/src/core/data/datasource/devices_remote_datasource.dart

@@ -1,7 +1,7 @@
 import 'package:account/src/features/linked_devices/domain/entities/update_device_request_entity.dart';
 
 abstract class DevicesRemoteDatasource {
-  Future<void> deleteDevice({required String userId, required String deviceId});
+  Future<void> deleteDevice({required String deviceId});
 
-  Future<void> updateDevice({required String userId, required UpdateDeviceRequestEntity request});
+  Future<void> updateDevice({required UpdateDeviceRequestEntity request});
 }

modules/legacy/modules/account/lib/src/core/data/datasource/devices_remote_datasource_impl.dart

@@ -12,7 +12,7 @@ class DevicesRemoteDatasourceImpl implements DevicesRemoteDatasource {
   final QuestiaRepository _repository;
 
   @override
-  Future<void> deleteDevice({required String userId, required String deviceId}) async {
+  Future<void> deleteDevice({required String deviceId}) async {
     try {
       await _repository.delete<void>(
         '/devices/$deviceId',
@@ -23,7 +23,7 @@ class DevicesRemoteDatasourceImpl implements DevicesRemoteDatasource {
   }
 
   @override
-  Future<void> updateDevice({required String userId, required UpdateDeviceRequestEntity request}) async {
+  Future<void> updateDevice({required UpdateDeviceRequestEntity request}) async {
     try {
       final body = request.toModel().toJson();
       await _repository.put<void>(

modules/legacy/modules/account/lib/src/core/data/repositories/devices_repository_impl.dart

@@ -9,12 +9,12 @@ class DevicesRepositoryImpl implements DevicesRepository {
   final DevicesRemoteDatasource _remote;
 
   @override
-  Future<void> deleteDevice({required String userId, required String deviceId}) {
-    return _remote.deleteDevice(userId: userId, deviceId: deviceId);
+  Future<void> deleteDevice({required String deviceId}) {
+    return _remote.deleteDevice(deviceId: deviceId);
   }
 
   @override
-  Future<void> updateDevice({required String userId, required UpdateDeviceRequestEntity request}) {
-    return _remote.updateDevice(userId: userId, request: request);
+  Future<void> updateDevice({required UpdateDeviceRequestEntity request}) {
+    return _remote.updateDevice(request: request);
   }
 }

modules/legacy/modules/account/lib/src/core/domain/repositories/devices_repository.dart

@@ -1,10 +1,9 @@
 import 'package:account/src/features/linked_devices/domain/entities/update_device_request_entity.dart';
 
 abstract class DevicesRepository {
-  Future<void> deleteDevice({required String userId, required String deviceId});
+  Future<void> deleteDevice({required String deviceId});
 
   Future<void> updateDevice({
-    required String userId,
     required UpdateDeviceRequestEntity request
   });
 }

modules/legacy/modules/account/lib/src/features/change_password/presentation/change_password_screen.dart

@@ -16,6 +16,9 @@ class ChangePasswordScreen extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
 
     final theme = ref.watch(themePortProvider);
+    final password = ref.watch(
+      changePasswordViewModelProvider.select((s)=>s.newPassword)
+    );
 
     return LegacyPageLayout(
       theme: theme,
@@ -28,11 +31,11 @@ class ChangePasswordScreen extends ConsumerWidget {
         child: SingleChildScrollView(child: Column(
           crossAxisAlignment: CrossAxisAlignment.center,
           children: [
-            const _PasswordSection(),
-            SizedBox(height: SizeUtils.getByScreen(small: 24, big: 22)),
             const _NewPasswordSection(),
             SizedBox(height: SizeUtils.getByScreen(small: 24, big: 22)),
             const _RepeatPasswordSection(),
+            SizedBox(height: SizeUtils.getByScreen(small: 24, big: 22)),
+            _PasswordCriteriaList(password: password),
             const _ErrorMessageSection()
           ],
         ))
@@ -42,29 +45,6 @@ class ChangePasswordScreen extends ConsumerWidget {
   }
 }
 
-class _PasswordSection extends ConsumerWidget {
-
-  const _PasswordSection();
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-
-    final vm = ref.read(changePasswordViewModelProvider.notifier);
-    final showPassword = ref.watch(
-      changePasswordViewModelProvider.select((s)=>s.showCurrentPassword)
-    );
-
-    return CustomTextField(
-      controller: vm.currentPasswordController,
-      hint: '********',
-      label: context.translate(I18n.password),
-      showPassword: showPassword,
-      onVisibilityChanged: vm.toggleCurrentPasswordVisibility,
-    );
-  }
-
-}
-
 class _NewPasswordSection extends ConsumerWidget {
 
   const _NewPasswordSection();
@@ -111,6 +91,89 @@ class _RepeatPasswordSection extends ConsumerWidget {
 
 }
 
+class _PasswordCriteriaList extends StatelessWidget {
+  final String password;
+
+  const _PasswordCriteriaList({required this.password});
+
+  static final _upperRegex = RegExp(r'[A-Z]');
+  static final _digitRegex = RegExp(r'[0-9]');
+  static final _specialRegex =
+  RegExp(r'[!@#$%^&*(),.?":{}|<>\-_+=\[\]\\\/~`]');
+
+  @override
+  Widget build(BuildContext context) {
+    final hasInput = password.isNotEmpty;
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      spacing: 6,
+      children: [
+        _CriteriaRow(
+          label: context.translate(I18n.passwordLength),
+          met: password.length >= 8,
+          hasInput: hasInput,
+        ),
+        _CriteriaRow(
+          label: context.translate(I18n.passwordCapital),
+          met: _upperRegex.hasMatch(password),
+          hasInput: hasInput,
+        ),
+        _CriteriaRow(
+          label: context.translate(I18n.passwordNumber),
+          met: _digitRegex.hasMatch(password),
+          hasInput: hasInput,
+        ),
+        _CriteriaRow(
+          label: context.translate(I18n.passwordSpecial),
+          met: _specialRegex.hasMatch(password),
+          hasInput: hasInput,
+        ),
+      ],
+    );
+  }
+}
+
+class _CriteriaRow extends StatelessWidget {
+  final String label;
+  final bool met;
+  final bool hasInput;
+
+  const _CriteriaRow({
+    required this.label,
+    required this.met,
+    required this.hasInput,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final Color color;
+    final IconData icon;
+
+    if (!hasInput) {
+      color = Colors.grey;
+      icon = Icons.circle_outlined;
+    } else if (met) {
+      color = Colors.green;
+      icon = Icons.check_circle;
+    } else {
+      color = Colors.red.shade400;
+      icon = Icons.cancel;
+    }
+
+    return Row(
+      spacing: 8,
+      children: [
+        Icon(icon, size: 16, color: color),
+        Text(
+          label,
+          style: TextStyle(fontSize: 13, color: color),
+        ),
+      ],
+    );
+  }
+}
+
 class _ErrorMessageSection extends ConsumerWidget {
 
   const _ErrorMessageSection();
@@ -136,7 +199,9 @@ class _ErrorMessageSection extends ConsumerWidget {
           ),
         ],
       );
-    } else return SizedBox.shrink();
+    } else {
+      return SizedBox.shrink();
+    }
   }
 }
 

modules/legacy/modules/account/lib/src/features/change_password/presentation/state/change_password_view_model.dart

@@ -14,7 +14,6 @@ NotifierProvider.autoDispose<ChangePasswordViewModel, ChangePasswordViewState>(
 class ChangePasswordViewModel extends Notifier<ChangePasswordViewState> {
   late final ChangePasswordUseCase _changePasswordUseCase;
 
-  late final TextEditingController currentPasswordController;
   late final TextEditingController newPasswordController;
   late final TextEditingController repeatPasswordController;
   late final TextEditingController passwordController;
@@ -29,10 +28,6 @@ class ChangePasswordViewModel extends Notifier<ChangePasswordViewState> {
   }
 
   void _initControllers() {
-
-    currentPasswordController = TextEditingController();
-    currentPasswordController.addListener(_onCurrentPasswordChanged);
-
     newPasswordController = TextEditingController();
     newPasswordController.addListener(_onNewPasswordChanged);
 
@@ -60,17 +55,6 @@ class ChangePasswordViewModel extends Notifier<ChangePasswordViewState> {
     );
   }
 
-  void _onCurrentPasswordChanged() {
-    final value = currentPasswordController.text;
-
-    if (value == state.currentPassword) return;
-
-    state = state.copyWith(
-      currentPassword: value,
-        errorMessage: ''
-    );
-  }
-
   void _onNewPasswordChanged() {
     final value = newPasswordController.text;
 
@@ -94,11 +78,14 @@ class ChangePasswordViewModel extends Notifier<ChangePasswordViewState> {
   }
 
   bool _validateForm() {
-    if (state.currentPassword.trim().isEmpty){
-    state = state.copyWith(errorMessage: 'errorMessageCurrentPasswordIsEmpty');
-    return false;
-    }
-    if (state.newPassword.trim().isEmpty){
+    final _upperRegex = RegExp(r'[A-Z]');
+    final _digitRegex = RegExp(r'[0-9]');
+    final _specialRegex =
+    RegExp(r'[!@#$%^&*(),.?":{}|<>\-_+=\[\]\\\/~`]');
+
+    final password = state.newPassword.trim();
+
+    if (password.isEmpty){
       state = state.copyWith(errorMessage: 'errorMessageNewPasswordIsEmpty');
       return false;
     }
@@ -106,10 +93,26 @@ class ChangePasswordViewModel extends Notifier<ChangePasswordViewState> {
       state = state.copyWith(errorMessage: 'errorMessageRepeatPasswordIsEmpty');
       return false;
     }
-    if (state.newPassword.trim() != state.repeatPassword.trim()){
+    if (password != state.repeatPassword.trim()){
       state = state.copyWith(errorMessage: 'errorMessagePasswordsDontMatch');
       return false;
     }
+    if (password.length < 8){
+      state = state.copyWith(errorMessage: 'errorPasswordMinLength');
+      return false;
+    }
+    if (!_upperRegex.hasMatch(password)) {
+      state = state.copyWith(errorMessage: 'errorPasswordUppercase');
+      return false;
+    }
+    if (!_digitRegex.hasMatch(password)) {
+      state = state.copyWith(errorMessage: 'errorPasswordDigits');
+      return false;
+    }
+    if (!_specialRegex.hasMatch(password)) {
+      state = state.copyWith(errorMessage: 'errorPasswordSpecial');
+      return false;
+    }
     return true;
   }
 
@@ -155,9 +158,6 @@ class ChangePasswordViewModel extends Notifier<ChangePasswordViewState> {
   }
 
   void disposeControllers() {
-    currentPasswordController.removeListener(_onCurrentPasswordChanged);
-    currentPasswordController.dispose();
-
     newPasswordController.removeListener(_onNewPasswordChanged);
     newPasswordController.dispose();
 

modules/legacy/modules/account/lib/src/features/change_password/presentation/state/change_password_view_state.dart

@@ -7,10 +7,8 @@ abstract class ChangePasswordViewState with _$ChangePasswordViewState {
   const factory ChangePasswordViewState({
     @Default(false) bool isLoading,
     @Default(false) bool isComplete,
-    @Default(false) bool showCurrentPassword,
     @Default(false) bool showNewPassword,
     @Default(false) bool showRepeatedPassword,
-    @Default('') String currentPassword,
     @Default('') String newPassword,
     @Default('') String repeatPassword,
     @Default('') String errorMessage

modules/legacy/modules/account/lib/src/features/linked_devices/presentation/linked_devices_screen.dart

@@ -27,28 +27,36 @@ class LinkedDevicesScreen extends ConsumerWidget {
       title: context.translate(I18n.linkedDevices),
       showEdit: true,
       onEditChange: vm.toggleIsEditing,
-      body: ListView.separated(
-        itemBuilder: (BuildContext context, int index)=>_LinkedDeviceCard(
-          device: state.linkedDevices[index],
-          isEditing: state.isEditing,
-          onDelete: ()=>vm.deleteDevice(state.linkedDevices[index]),
-        ),
-        separatorBuilder: (BuildContext context, int index)=>SizedBox(
-          height: SizeUtils.getByScreen(small: 18, big: 17)
-        ),
-        itemCount: state.linkedDevices.length
-      ),
+      body: state.isLoading
+          ? const Center(child: CircularProgressIndicator())
+          : Padding(
+              padding: EdgeInsets.symmetric(horizontal: SizeUtils.getByScreen(small: 10, big: 12)),
+              child: ListView.separated(
+                  itemBuilder: (BuildContext context, int index)=>_LinkedDeviceCard(
+                    navigationContract: navigationContract,
+                    device: state.linkedDevices[index],
+                    isEditing: state.isEditing,
+                    onDelete: ()=>vm.deleteDevice(state.linkedDevices[index]),
+                  ),
+                  separatorBuilder: (BuildContext context, int index)=>SizedBox(
+                      height: SizeUtils.getByScreen(small: 18, big: 17)
+                  ),
+                  itemCount: state.linkedDevices.length
+              ),
+            ),
     );
   }
 }
 
 class _LinkedDeviceCard extends ConsumerWidget {
 
+  final NavigationContract navigationContract;
   final DeviceEntity device;
   final bool isEditing;
   final Function onDelete;
 
   const _LinkedDeviceCard({
+    required this.navigationContract,
     required this.device,
     required this.isEditing,
     required this.onDelete,
@@ -76,7 +84,7 @@ class _LinkedDeviceCard extends ConsumerWidget {
               shape: BoxShape.circle,
               color: theme.getColorFor(ThemeCode.backgroundPrimary),
             ),
-            padding: EdgeInsets.all(SizeUtils.getByScreen(small: 4, big: 12)),
+            padding: EdgeInsets.all(SizeUtils.getByScreen(small: 8, big: 12)),
             child: Icon(SFIcons.watch,
               size: SizeUtils.getByScreen(small: 40, big: 44),
               color: theme.getColorFor(ThemeCode.legacyPrimary),
@@ -110,7 +118,10 @@ class _LinkedDeviceCard extends ConsumerWidget {
               ),
               child: IconButton(
                 onPressed: (){showDialog(context: context, builder: (context)=>Dialog(
-                  child: DeleteDeviceDialog(device: device),
+                  child: DeleteDeviceDialog(
+                    navigationContract: navigationContract,
+                    device: device,
+                  ),
                 ));},
                 icon: Icon(
                   Icons.close,

modules/legacy/modules/account/lib/src/features/linked_devices/presentation/state/linked_devices_view_model.dart

@@ -70,19 +70,32 @@ class LinkedDevicesViewModel extends Notifier<LinkedDevicesViewState> {
     );
   }
 
-  Future<bool> deleteDevice(DeviceEntity device) async {
+  Future<void> deleteDevice(DeviceEntity device) async {
     try {
-      await _devicesRepository.deleteDevice(userId: state.loggedUser!.id, deviceId: device.identificator);
-      List<DeviceEntity> newList = state.linkedDevices;
-      newList.remove(device);
-
       state = state.copyWith(
-          linkedDevices: newList
+        isLoading: true,
+        isComplete: false,
       );
 
-      return true;
+      await _devicesRepository.deleteDevice(deviceId: device.id);
+      List<DeviceEntity> newList = state.linkedDevices.toList();
+      newList.remove(device);
+
+      if (device == state.selectedDevice) {
+        ref.invalidate(selectedDeviceProvider);
+      }
+
+      state = state.copyWith(
+        linkedDevices: newList,
+        isLoading: false,
+        isComplete: true,
+      );
     } catch (e) {
-      return false;
+      state = state.copyWith(
+        isLoading: false,
+        errorMessage: e.toString(),
+      );
+      return;
     }
   }
 
@@ -102,9 +115,7 @@ class LinkedDevicesViewModel extends Notifier<LinkedDevicesViewState> {
     if (deviceName.isEmpty) return;
 
     try {
-      final userId = state.loggedUser!.id;
       _devicesRepository.updateDevice(
-        userId: userId,
         request: _toRequest(device));
 
     } catch(e) {
@@ -114,8 +125,6 @@ class LinkedDevicesViewModel extends Notifier<LinkedDevicesViewState> {
         errorMessage: e.toString()
       );
     }
-
-
   }
 
   void disposeControllers() {

modules/legacy/modules/account/lib/src/features/linked_devices/presentation/widgets/delete_device_dialog.dart

@@ -2,15 +2,20 @@ import 'package:account/src/features/linked_devices/presentation/state/linked_de
 import 'package:design_system/design_system.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:navigation/navigation.dart';
 import 'package:sf_localizations/sf_localizations.dart';
 import 'package:sf_shared/sf_shared.dart';
 import 'package:utils/utils.dart';
 
 class DeleteDeviceDialog extends ConsumerWidget {
 
+  final NavigationContract navigationContract;
   final DeviceEntity device;
 
-  const DeleteDeviceDialog({required this.device});
+  const DeleteDeviceDialog({
+    required this.navigationContract,
+    required this.device
+  });
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -21,15 +26,15 @@ class DeleteDeviceDialog extends ConsumerWidget {
     return Container(
       padding: SizeUtils.getByScreen(
           small: EdgeInsets.symmetric(horizontal: 32, vertical: 30),
-          big: EdgeInsets.symmetric(horizontal: 30, vertical: 28)
+          big: EdgeInsets.symmetric(horizontal: 24, vertical: 18)
       ),
       width: SizeUtils.getByScreen(small: 360, big: 350),
-      height: SizeUtils.getByScreen(small: 195, big: 185),
+      height: SizeUtils.getByScreen(small: 184, big: 160),
       child: Column(
         children: [
           Text(context.translate(I18n.deleteDeviceDialog),
             textAlign: TextAlign.center,
-            style: TextStyle(fontSize: SizeUtils.getByScreen(small: 19, big: 18)),
+            style: TextStyle(fontSize: SizeUtils.getByScreen(small: 17, big: 16)),
           ),
           SizedBox(height: SizeUtils.getByScreen(small: 28, big: 27)),
           Row(
@@ -46,7 +51,20 @@ class DeleteDeviceDialog extends ConsumerWidget {
               Expanded(child: PrimaryButton(
                 onPressed: () async {
                   await vm.deleteDevice(device);
-                  Navigator.pop(context);
+
+                  final isComplete = ref.read(
+                    linkedDevicesViewModelProvider.select((s)=>s.isComplete)
+                  );
+                  if (isComplete) {
+                    Navigator.pop(context);
+                  }
+
+                  final noMoreDevices = ref.read(
+                    linkedDevicesViewModelProvider.select((s)=>s.linkedDevices)
+                                                              ).isEmpty;
+                  if (noMoreDevices) {
+                    navigationContract.goTo(AppRoutes.legacyDeviceSetup);
+                  }
                 },
                 text: context.translate(I18n.delete),
                 color: theme.getColorFor(ThemeCode.legacyPrimary),

modules/legacy/modules/control_panel/lib/control_panel.dart

@@ -1,3 +1,9 @@
+export 'src/core/data/models/latest_positions_response_model.dart';
+export 'src/core/domain/entities/address_entity.dart';
+export 'src/core/domain/entities/network_entity.dart';
+export 'src/core/domain/entities/position_entity.dart';
+export 'src/core/utils/battery_utils.dart';
+export 'src/core/utils/date_format_utils.dart';
 export 'src/features/control_panel/control_panel_builder.dart';
 export 'src/features/control_panel/presentation/state/control_panel_view_model.dart';
 export 'src/shared/widgets/device_map.dart';

modules/legacy/modules/control_panel/lib/src/core/data/models/latest_positions_response_model.dart

@@ -72,11 +72,11 @@ extension LatestPositionsResponseModelMapper on LatestPositionsResponseModel {
 @freezed
 abstract class LatestPositionsAddressResponseModel with _$LatestPositionsAddressResponseModel {
   const factory LatestPositionsAddressResponseModel({
-    required String street,
-    required String city,
-    required String province,
-    required String state,
-    required String country,
+    String? street,
+    String? city,
+    String? province,
+    String? state,
+    String? country,
   }) = _LatestPositionsAddressResponseModel;
 
   factory LatestPositionsAddressResponseModel.fromJson(Map<String, dynamic> json) =>

modules/legacy/modules/control_panel/lib/src/core/data/models/latest_positions_response_model.freezed.dart

@@ -628,7 +628,7 @@ $LatestPositionsAddressResponseModelCopyWith<$Res>? get address {
 /// @nodoc
 mixin _$LatestPositionsAddressResponseModel {
 
- String get street; String get city; String get province; String get state; String get country;
+ String? get street; String? get city; String? get province; String? get state; String? get country;
 /// Create a copy of LatestPositionsAddressResponseModel
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -661,7 +661,7 @@ abstract mixin class $LatestPositionsAddressResponseModelCopyWith<$Res>  {
   factory $LatestPositionsAddressResponseModelCopyWith(LatestPositionsAddressResponseModel value, $Res Function(LatestPositionsAddressResponseModel) _then) = _$LatestPositionsAddressResponseModelCopyWithImpl;
 @useResult
 $Res call({
- String street, String city, String province, String state, String country
+ String? street, String? city, String? province, String? state, String? country
 });
 
 
@@ -678,14 +678,14 @@ class _$LatestPositionsAddressResponseModelCopyWithImpl<$Res>
 
 /// Create a copy of LatestPositionsAddressResponseModel
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? street = null,Object? city = null,Object? province = null,Object? state = null,Object? country = null,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? street = freezed,Object? city = freezed,Object? province = freezed,Object? state = freezed,Object? country = freezed,}) {
   return _then(_self.copyWith(
-street: null == street ? _self.street : street // ignore: cast_nullable_to_non_nullable
-as String,city: null == city ? _self.city : city // ignore: cast_nullable_to_non_nullable
-as String,province: null == province ? _self.province : province // ignore: cast_nullable_to_non_nullable
-as String,state: null == state ? _self.state : state // ignore: cast_nullable_to_non_nullable
-as String,country: null == country ? _self.country : country // ignore: cast_nullable_to_non_nullable
-as String,
+street: freezed == street ? _self.street : street // ignore: cast_nullable_to_non_nullable
+as String?,city: freezed == city ? _self.city : city // ignore: cast_nullable_to_non_nullable
+as String?,province: freezed == province ? _self.province : province // ignore: cast_nullable_to_non_nullable
+as String?,state: freezed == state ? _self.state : state // ignore: cast_nullable_to_non_nullable
+as String?,country: freezed == country ? _self.country : country // ignore: cast_nullable_to_non_nullable
+as String?,
   ));
 }
 
@@ -770,7 +770,7 @@ return $default(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String street,  String city,  String province,  String state,  String country)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String? street,  String? city,  String? province,  String? state,  String? country)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _LatestPositionsAddressResponseModel() when $default != null:
 return $default(_that.street,_that.city,_that.province,_that.state,_that.country);case _:
@@ -791,7 +791,7 @@ return $default(_that.street,_that.city,_that.province,_that.state,_that.country
 /// }
 /// ```
 
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String street,  String city,  String province,  String state,  String country)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String? street,  String? city,  String? province,  String? state,  String? country)  $default,) {final _that = this;
 switch (_that) {
 case _LatestPositionsAddressResponseModel():
 return $default(_that.street,_that.city,_that.province,_that.state,_that.country);case _:
@@ -811,7 +811,7 @@ return $default(_that.street,_that.city,_that.province,_that.state,_that.country
 /// }
 /// ```
 
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String street,  String city,  String province,  String state,  String country)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String? street,  String? city,  String? province,  String? state,  String? country)?  $default,) {final _that = this;
 switch (_that) {
 case _LatestPositionsAddressResponseModel() when $default != null:
 return $default(_that.street,_that.city,_that.province,_that.state,_that.country);case _:
@@ -826,14 +826,14 @@ return $default(_that.street,_that.city,_that.province,_that.state,_that.country
 @JsonSerializable()
 
 class _LatestPositionsAddressResponseModel implements LatestPositionsAddressResponseModel {
-  const _LatestPositionsAddressResponseModel({required this.street, required this.city, required this.province, required this.state, required this.country});
+  const _LatestPositionsAddressResponseModel({this.street, this.city, this.province, this.state, this.country});
   factory _LatestPositionsAddressResponseModel.fromJson(Map<String, dynamic> json) => _$LatestPositionsAddressResponseModelFromJson(json);
 
-@override final  String street;
-@override final  String city;
-@override final  String province;
-@override final  String state;
-@override final  String country;
+@override final  String? street;
+@override final  String? city;
+@override final  String? province;
+@override final  String? state;
+@override final  String? country;
 
 /// Create a copy of LatestPositionsAddressResponseModel
 /// with the given fields replaced by the non-null parameter values.
@@ -868,7 +868,7 @@ abstract mixin class _$LatestPositionsAddressResponseModelCopyWith<$Res> impleme
   factory _$LatestPositionsAddressResponseModelCopyWith(_LatestPositionsAddressResponseModel value, $Res Function(_LatestPositionsAddressResponseModel) _then) = __$LatestPositionsAddressResponseModelCopyWithImpl;
 @override @useResult
 $Res call({
- String street, String city, String province, String state, String country
+ String? street, String? city, String? province, String? state, String? country
 });
 
 
@@ -885,14 +885,14 @@ class __$LatestPositionsAddressResponseModelCopyWithImpl<$Res>
 
 /// Create a copy of LatestPositionsAddressResponseModel
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? street = null,Object? city = null,Object? province = null,Object? state = null,Object? country = null,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? street = freezed,Object? city = freezed,Object? province = freezed,Object? state = freezed,Object? country = freezed,}) {
   return _then(_LatestPositionsAddressResponseModel(
-street: null == street ? _self.street : street // ignore: cast_nullable_to_non_nullable
-as String,city: null == city ? _self.city : city // ignore: cast_nullable_to_non_nullable
-as String,province: null == province ? _self.province : province // ignore: cast_nullable_to_non_nullable
-as String,state: null == state ? _self.state : state // ignore: cast_nullable_to_non_nullable
-as String,country: null == country ? _self.country : country // ignore: cast_nullable_to_non_nullable
-as String,
+street: freezed == street ? _self.street : street // ignore: cast_nullable_to_non_nullable
+as String?,city: freezed == city ? _self.city : city // ignore: cast_nullable_to_non_nullable
+as String?,province: freezed == province ? _self.province : province // ignore: cast_nullable_to_non_nullable
+as String?,state: freezed == state ? _self.state : state // ignore: cast_nullable_to_non_nullable
+as String?,country: freezed == country ? _self.country : country // ignore: cast_nullable_to_non_nullable
+as String?,
   ));
 }
 

modules/legacy/modules/control_panel/lib/src/core/data/models/latest_positions_response_model.g.dart

@@ -81,11 +81,11 @@ Map<String, dynamic> _$LatestPositionsItemResponseModelToJson(
 _LatestPositionsAddressResponseModel
 _$LatestPositionsAddressResponseModelFromJson(Map<String, dynamic> json) =>
     _LatestPositionsAddressResponseModel(
-      street: json['street'] as String,
-      city: json['city'] as String,
-      province: json['province'] as String,
-      state: json['state'] as String,
-      country: json['country'] as String,
+      street: json['street'] as String?,
+      city: json['city'] as String?,
+      province: json['province'] as String?,
+      state: json['state'] as String?,
+      country: json['country'] as String?,
     );
 
 Map<String, dynamic> _$LatestPositionsAddressResponseModelToJson(

modules/legacy/modules/control_panel/lib/src/features/control_panel/presentation/control_panel_screen.dart

@@ -258,7 +258,6 @@ class _MapSection extends ConsumerWidget {
               child: DeviceMap(
                 selectedPosition: state.selectedPosition,
                 selectedDevice: state.selectedDevice,
-                markerSize: 40,
               ),
             ),
           ),

modules/legacy/modules/control_panel/lib/src/features/control_panel/presentation/state/control_panel_view_model.dart

@@ -69,8 +69,9 @@ class ControlPanelViewModel extends Notifier<ControlPanelViewState> {
     final latestPositions = positionLists
         .where((list) => list.isNotEmpty)
         .map((list) {
-          final valid = list.where((p) => p.latitude != 0 || p.longitude != 0);
-          return valid.isNotEmpty ? valid.last : list.last;
+          final valid = list.where((p) => p.latitude != 0 || p.longitude != 0).toList()
+            ..sort((a, b) => b.createdAt.compareTo(a.createdAt));
+          return valid.isNotEmpty ? valid.first : list.last;
         })
         .toList();
 

modules/legacy/modules/control_panel/lib/src/shared/widgets/device_map.dart

@@ -5,25 +5,21 @@ import 'package:design_system/design_system.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:flutter_svg/svg.dart';
 import 'package:latlong2/latlong.dart';
+import 'package:legacy_shared/legacy_shared.dart';
 import 'package:sf_shared/sf_shared.dart';
-import 'package:utils/utils.dart';
 
 const _defaultCenter = LatLng(40.4168, -3.7038);
 const _defaultZoom = 15.0;
-const _tileServerUrl = 'https://tile.openstreetmap.org/{z}/{x}/{y}.png';
 
 class DeviceMap extends ConsumerStatefulWidget {
   final PositionEntity? selectedPosition;
   final DeviceEntity? selectedDevice;
-  final double markerSize;
 
   const DeviceMap({
     super.key,
     required this.selectedPosition,
     required this.selectedDevice,
-    this.markerSize = 80,
   });
 
   @override
@@ -62,6 +58,8 @@ class _DeviceMapState extends ConsumerState<DeviceMap> {
 
   @override
   Widget build(BuildContext context) {
+    final mapStyle = ref.watch(mapStyleProvider);
+    final primaryColor = ref.read(themePortProvider).getColorFor(ThemeCode.legacyPrimary);
     final initialCenter = widget.selectedPosition != null
         ? LatLng(
             widget.selectedPosition!.latitude,
@@ -78,7 +76,7 @@ class _DeviceMapState extends ConsumerState<DeviceMap> {
       ),
       children: [
         TileLayer(
-          urlTemplate: _tileServerUrl,
+          urlTemplate: mapStyle.urlTemplate,
           userAgentPackageName: 'com.savefamily.sf_platform',
         ),
         MarkerLayer(
@@ -89,15 +87,9 @@ class _DeviceMapState extends ConsumerState<DeviceMap> {
                   widget.selectedPosition!.latitude,
                   widget.selectedPosition!.longitude,
                 ),
-                width: widget.markerSize * 2.5,
-                height: widget.markerSize * 1.8,
-                child: Align(
-                  alignment: Alignment.topCenter,
-                  child: SvgPicture.asset(
-                    'assets/shared/images/location.svg',
-                    height: widget.markerSize,
-                  ),
-                ),
+                width: 100,
+                height: 100,
+                child: PulsingLocationMarker(color: primaryColor),
                 rotate: true,
               ),
           ],
@@ -107,7 +99,7 @@ class _DeviceMapState extends ConsumerState<DeviceMap> {
             alignment: Alignment.bottomCenter,
             child: LocationBanner(
               position: widget.selectedPosition!,
-              battery: widget.selectedDevice?.battery ?? 0,
+              device: widget.selectedDevice,
             ),
           ),
       ],
@@ -117,86 +109,156 @@ class _DeviceMapState extends ConsumerState<DeviceMap> {
 
 class LocationBanner extends ConsumerWidget {
   final PositionEntity position;
-  final int battery;
+  final DeviceEntity? device;
 
   const LocationBanner({
     super.key,
     required this.position,
-    required this.battery,
+    this.device,
   });
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final theme = ref.read(themePortProvider);
-    final batteryIcon = toBatteryIcon(battery);
+    final primaryColor = theme.getColorFor(ThemeCode.legacyPrimary);
+    final batteryValue = device?.battery ?? 0;
+    final batteryIcon = toBatteryIcon(batteryValue);
     final dateText = formatPositionDate(position.positionDate);
 
+    final localDevice = device;
+    final name = localDevice?.carrierName;
+    final deviceName = localDevice != null
+        ? (name != null && name.isNotEmpty ? name : localDevice.identificator)
+        : null;
+    final initial = deviceName != null && deviceName.isNotEmpty
+        ? deviceName[0].toUpperCase()
+        : null;
+
     final addressText = [
       position.address?.street,
       position.address?.province,
-      position.address?.country,
     ].whereType<String>().where((s) => s.isNotEmpty).join(', ');
 
-    return Container(
-      height: SizeUtils.getByScreen(small: 60, big: 58),
-      width: SizeUtils.getByScreen(small: 300, big: 298),
-      margin: EdgeInsets.only(
-        bottom: SizeUtils.getByScreen(small: 20, big: 16),
-      ),
-      decoration: BoxDecoration(
-        color: theme.getColorFor(ThemeCode.backgroundPrimary),
-        borderRadius: BorderRadius.all(
-          Radius.circular(SizeUtils.getByScreen(small: 9, big: 8)),
-        ),
-      ),
-      child: Row(
-        children: [
-          Icon(
-            SFIcons.location,
-            size: SizeUtils.getByScreen(small: 40, big: 38),
-            color: theme.getColorFor(ThemeCode.legacyPrimary),
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final isCompact = constraints.maxWidth < 320;
+
+        return Container(
+          width: isCompact ? constraints.maxWidth * 0.85 : 340,
+          margin: EdgeInsets.only(bottom: isCompact ? 8 : 16),
+          padding: EdgeInsets.symmetric(
+            horizontal: isCompact ? 8 : 12,
+            vertical: isCompact ? 6 : 10,
           ),
-          Expanded(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                Text(
-                  addressText,
-                  overflow: TextOverflow.ellipsis,
+          decoration: BoxDecoration(
+            color: Colors.white,
+            borderRadius: BorderRadius.circular(isCompact ? 10 : 16),
+            boxShadow: [
+              BoxShadow(
+                color: Colors.black.withValues(alpha: 0.1),
+                blurRadius: isCompact ? 6 : 10,
+                offset: const Offset(0, 2),
+              ),
+            ],
+          ),
+          child: Row(
+            children: [
+              if (initial != null)
+                Container(
+                  width: isCompact ? 30 : 42,
+                  height: isCompact ? 30 : 42,
+                  decoration: BoxDecoration(
+                    color: primaryColor.withValues(alpha: 0.12),
+                    shape: BoxShape.circle,
+                  ),
+                  child: Center(
+                    child: Text(
+                      initial,
+                      style: TextStyle(
+                        fontSize: isCompact ? 13 : 18,
+                        fontWeight: FontWeight.w700,
+                        color: primaryColor,
+                      ),
+                    ),
+                  ),
                 ),
-                Row(
+              SizedBox(width: isCompact ? 6 : 10),
+              Expanded(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  mainAxisSize: MainAxisSize.min,
                   children: [
-                    Flexible(
-                      child: Text(
-                        dateText,
+                    if (deviceName != null)
+                      Text(
+                        deviceName,
                         style: TextStyle(
-                          fontSize: SizeUtils.getByScreen(small: 12, big: 11),
+                          fontSize: isCompact ? 12 : 14,
+                          fontWeight: FontWeight.w600,
+                          color: Colors.grey.shade800,
                         ),
                         overflow: TextOverflow.ellipsis,
                       ),
-                    ),
-                    if (position.networks.isNotEmpty)
-                      Text(
-                        ' | ${position.networks.first.signal}',
-                        style: TextStyle(
-                          fontSize: SizeUtils.getByScreen(small: 12, big: 11),
+                    if (addressText.isNotEmpty)
+                      Padding(
+                        padding: EdgeInsets.only(
+                            top: deviceName != null ? 1 : 0),
+                        child: Text(
+                          addressText,
+                          style: TextStyle(
+                            fontSize: isCompact ? 9 : 11,
+                            color: Colors.grey.shade500,
+                          ),
+                          overflow: TextOverflow.ellipsis,
                         ),
                       ),
-                    Icon(batteryIcon),
-                    Text(
-                      '$battery%',
-                      style: TextStyle(
-                        fontSize: SizeUtils.getByScreen(small: 12, big: 11),
-                      ),
-                    ),
                   ],
                 ),
-              ],
-            ),
+              ),
+              Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.end,
+                children: [
+                  Row(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      Icon(
+                        batteryIcon,
+                        size: isCompact ? 13 : 16,
+                        color: batteryValue > 20
+                            ? primaryColor
+                            : Colors.orange,
+                      ),
+                      const SizedBox(width: 2),
+                      Text(
+                        '$batteryValue%',
+                        style: TextStyle(
+                          fontSize: isCompact ? 10 : 12,
+                          fontWeight: FontWeight.w600,
+                          color: batteryValue > 20
+                              ? primaryColor
+                              : Colors.orange,
+                        ),
+                      ),
+                    ],
+                  ),
+                  if (!isCompact)
+                    Padding(
+                      padding: const EdgeInsets.only(top: 3),
+                      child: Text(
+                        dateText,
+                        style: TextStyle(
+                          fontSize: 10,
+                          color: Colors.grey.shade400,
+                        ),
+                      ),
+                    ),
+                ],
+              ),
+            ],
           ),
-        ],
-      ),
+        );
+      },
     );
   }
 }
+

modules/legacy/modules/device_management/lib/device_management.dart

@@ -9,4 +9,6 @@ export 'src/features/locate_device/locate_device_builder.dart';
 export 'src/features/health/health_builder.dart';
 export 'src/features/rewards/rewards_builder.dart';
 export 'src/features/activity_meter/activity_meter_builder.dart';
-export 'src/features/apps_use/apps_use_builder.dart';
+export 'src/features/apps_use/apps_use_builder.dart';
+export 'src/features/volume_control/volume_control_builder.dart';
+export 'src/features/call_history/call_history_builder.dart';

modules/legacy/modules/device_management/lib/src/core/data/datasources/contacts_remote_datasource_impl.dart

@@ -68,17 +68,31 @@ class ContactsRemoteDatasourceImpl implements ContactsRemoteDatasource {
     required String deviceId,
     required List<Map<String, String>> contacts,
   }) async {
-    await safeCall(
-      () => _repository.post<dynamic>(
-        '/contact-lists',
-        body: {
-          'userId': userId,
-          'deviceId': deviceId,
-          'type': 'secondary',
-          'contacts': contacts,
-        },
+    await Future.wait([
+      safeCall(
+        () => _repository.post<dynamic>(
+          '/contact-lists',
+          body: {
+            'userId': userId,
+            'deviceId': deviceId,
+            'type': 'secondary',
+            'contacts': contacts,
+          },
+        ),
+        'Error syncing contacts to device',
       ),
-      'Error syncing contacts to device',
-    );
+      safeCall(
+        () => _repository.post<dynamic>(
+          '/contact-lists',
+          body: {
+            'userId': userId,
+            'deviceId': deviceId,
+            'type': 'white',
+            'contacts': contacts,
+          },
+        ),
+        'Error syncing whitelist to device',
+      ),
+    ]);
   }
 }

modules/legacy/modules/device_management/lib/src/core/data/datasources/functions_remote_datasource.dart

@@ -1,7 +0,0 @@
-import 'package:device_management/src/features/remote_connection/domain/entities/picture_entity.dart';
-
-abstract class FunctionsRemoteDatasource {
-  Future<List<PictureEntity>> getPictures({required String userId});
-
-  Future<PictureEntity> takePicture({required String userId});
-}

modules/legacy/modules/device_management/lib/src/core/data/datasources/functions_remote_datasource_impl.dart

@@ -1,55 +0,0 @@
-import 'package:device_management/src/core/data/datasources/functions_remote_datasource.dart';
-import 'package:device_management/src/features/remote_connection/domain/entities/picture_entity.dart';
-import 'package:sf_infrastructure/sf_infrastructure.dart';
-
-class FunctionsRemoteDatasourceImpl implements FunctionsRemoteDatasource {
-  FunctionsRemoteDatasourceImpl(this._repository);
-
-  final QuestiaRepository _repository;
-
-  @override
-  Future<List<PictureEntity>> getPictures({required String userId}) async {
-    /*try {
-      final response = await _repository.get<Map<String, dynamic>>(
-        '',
-      );
-
-      final data = response.data;
-      if (data == null || data.isEmpty) {
-        throw Exception('Empty response from /users/:userId/contacts');
-      }
-
-      final model = GetPicturesResponseModel.fromJson(data);
-      return model.toEntity();
-    } on DioException catch (error) {
-      throw mapDioError(error, defaultMessage: 'Error to get pictures');
-    }*/
-    return [];
-  }
-
-  @override
-  Future<PictureEntity> takePicture({required String userId}) async {
-    /*try {
-      final response = await _repository.get<Map<String, dynamic>>(
-        '',
-      );
-
-      final data = response.data;
-      if (data == null || data.isEmpty) {
-        throw Exception('Empty response from /users/:userId/contacts');
-      }
-
-      final model = GetContactsResponseModel.fromJson(data);
-      return model.toEntity();
-    } on DioException catch (error) {
-      throw mapDioError(error, defaultMessage: 'Error to get contacts');
-    }*/
-    return PictureEntity(
-      id: '1',
-      deviceId: '1111',
-      createdAt: DateTime.now(),
-      takenAt: DateTime.now(),
-      asset: 'assets/shared/images/iso_sf.png',
-    );
-  }
-}

modules/legacy/modules/device_management/lib/src/core/data/datasources/health_query_builder.dart

@@ -19,7 +19,7 @@ class HealthQueryBuilder {
     String orderField = 'occurredAt',
   }) {
     final orderBy = base64Encode(
-      utf8.encode('[{"field":"$orderField","order":"${orderDirection.value}"}]'),
+      utf8.encode('[{"field":"$orderField","sortDirection":"${orderDirection.value}"}]'),
     );
 
     final params = <String, dynamic>{'orderBy': orderBy};

modules/legacy/modules/device_management/lib/src/core/data/datasources/pictures_remote_datasource.dart

@@ -0,0 +1,7 @@
+import 'package:device_management/src/features/remote_connection/domain/entities/picture_entity.dart';
+
+abstract class PicturesRemoteDatasource {
+  Future<List<PictureEntity>> getPictures({required String deviceId});
+
+  Future<PictureEntity> takePicture({required String deviceId});
+}

modules/legacy/modules/device_management/lib/src/core/data/datasources/pictures_remote_datasource_impl.dart

@@ -0,0 +1,37 @@
+import 'package:device_management/src/core/data/datasources/pictures_remote_datasource.dart';
+import 'package:device_management/src/core/data/models/get_pictures_response_model.dart';
+import 'package:device_management/src/features/remote_connection/domain/entities/picture_entity.dart';
+import 'package:dio/dio.dart';
+import 'package:legacy_shared/legacy_shared.dart';
+import 'package:sf_infrastructure/sf_infrastructure.dart';
+
+class PicturesRemoteDatasourceImpl implements PicturesRemoteDatasource {
+  PicturesRemoteDatasourceImpl(this._repository);
+
+  final QuestiaRepository _repository;
+
+  @override
+  Future<List<PictureEntity>> getPictures({required String deviceId}) async {
+    try {
+      final response = await _repository.get<Map<String, dynamic>>(
+        '/devices/identificator/$deviceId/photos',
+      );
+
+      final data = response.data;
+      if (data == null || data.isEmpty) {
+        return [];
+      }
+
+      final model = GetPicturesResponseModel.fromJson(data);
+      return model.toEntity();
+    } on DioException catch (error) {
+      if (error.response?.statusCode == 404) return [];
+      throw mapDioError(error, defaultMessage: 'Error getting pictures');
+    }
+  }
+
+  @override
+  Future<PictureEntity> takePicture({required String deviceId}) async {
+    throw UnimplementedError('takePicture is handled via commands');
+  }
+}

modules/legacy/modules/device_management/lib/src/core/data/models/get_pictures_response_model.dart

@@ -0,0 +1,50 @@
+import 'package:device_management/src/features/remote_connection/domain/entities/picture_entity.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'get_pictures_response_model.freezed.dart';
+part 'get_pictures_response_model.g.dart';
+
+@freezed
+abstract class GetPicturesResponseModel with _$GetPicturesResponseModel {
+  const factory GetPicturesResponseModel({
+    required List<GetPicturesItemResponseModel> items,
+  }) = _GetPicturesResponseModel;
+
+  factory GetPicturesResponseModel.fromJson(Map<String, dynamic> json) =>
+      _$GetPicturesResponseModelFromJson(json);
+}
+
+@freezed
+abstract class GetPicturesItemResponseModel
+    with _$GetPicturesItemResponseModel {
+  const factory GetPicturesItemResponseModel({
+    required String id,
+    required String deviceIdentificator,
+    String? imgType,
+    String? timestamp,
+    required String fileId,
+    String? fileName,
+    String? contentType,
+    required int createdAt,
+  }) = _GetPicturesItemResponseModel;
+
+  factory GetPicturesItemResponseModel.fromJson(Map<String, dynamic> json) =>
+      _$GetPicturesItemResponseModelFromJson(json);
+}
+
+extension GetPicturesResponseModelMapper on GetPicturesResponseModel {
+  List<PictureEntity> toEntity() {
+    return items
+        .map((item) => PictureEntity(
+              id: item.id,
+              deviceIdentificator: item.deviceIdentificator,
+              imgType: item.imgType,
+              timestamp: item.timestamp,
+              fileId: item.fileId,
+              fileName: item.fileName,
+              contentType: item.contentType,
+              createdAt: item.createdAt,
+            ))
+        .toList();
+  }
+}

modules/legacy/modules/device_management/lib/src/core/data/models/get_pictures_response_model.freezed.dart

@@ -0,0 +1,567 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'get_pictures_response_model.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+
+/// @nodoc
+mixin _$GetPicturesResponseModel {
+
+ List<GetPicturesItemResponseModel> get items;
+/// Create a copy of GetPicturesResponseModel
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$GetPicturesResponseModelCopyWith<GetPicturesResponseModel> get copyWith => _$GetPicturesResponseModelCopyWithImpl<GetPicturesResponseModel>(this as GetPicturesResponseModel, _$identity);
+
+  /// Serializes this GetPicturesResponseModel to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is GetPicturesResponseModel&&const DeepCollectionEquality().equals(other.items, items));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(items));
+
+@override
+String toString() {
+  return 'GetPicturesResponseModel(items: $items)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $GetPicturesResponseModelCopyWith<$Res>  {
+  factory $GetPicturesResponseModelCopyWith(GetPicturesResponseModel value, $Res Function(GetPicturesResponseModel) _then) = _$GetPicturesResponseModelCopyWithImpl;
+@useResult
+$Res call({
+ List<GetPicturesItemResponseModel> items
+});
+
+
+
+
+}
+/// @nodoc
+class _$GetPicturesResponseModelCopyWithImpl<$Res>
+    implements $GetPicturesResponseModelCopyWith<$Res> {
+  _$GetPicturesResponseModelCopyWithImpl(this._self, this._then);
+
+  final GetPicturesResponseModel _self;
+  final $Res Function(GetPicturesResponseModel) _then;
+
+/// Create a copy of GetPicturesResponseModel
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? items = null,}) {
+  return _then(_self.copyWith(
+items: null == items ? _self.items : items // ignore: cast_nullable_to_non_nullable
+as List<GetPicturesItemResponseModel>,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [GetPicturesResponseModel].
+extension GetPicturesResponseModelPatterns on GetPicturesResponseModel {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _GetPicturesResponseModel value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _GetPicturesResponseModel() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _GetPicturesResponseModel value)  $default,){
+final _that = this;
+switch (_that) {
+case _GetPicturesResponseModel():
+return $default(_that);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _GetPicturesResponseModel value)?  $default,){
+final _that = this;
+switch (_that) {
+case _GetPicturesResponseModel() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( List<GetPicturesItemResponseModel> items)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _GetPicturesResponseModel() when $default != null:
+return $default(_that.items);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( List<GetPicturesItemResponseModel> items)  $default,) {final _that = this;
+switch (_that) {
+case _GetPicturesResponseModel():
+return $default(_that.items);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( List<GetPicturesItemResponseModel> items)?  $default,) {final _that = this;
+switch (_that) {
+case _GetPicturesResponseModel() when $default != null:
+return $default(_that.items);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _GetPicturesResponseModel implements GetPicturesResponseModel {
+  const _GetPicturesResponseModel({required final  List<GetPicturesItemResponseModel> items}): _items = items;
+  factory _GetPicturesResponseModel.fromJson(Map<String, dynamic> json) => _$GetPicturesResponseModelFromJson(json);
+
+ final  List<GetPicturesItemResponseModel> _items;
+@override List<GetPicturesItemResponseModel> get items {
+  if (_items is EqualUnmodifiableListView) return _items;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableListView(_items);
+}
+
+
+/// Create a copy of GetPicturesResponseModel
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$GetPicturesResponseModelCopyWith<_GetPicturesResponseModel> get copyWith => __$GetPicturesResponseModelCopyWithImpl<_GetPicturesResponseModel>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$GetPicturesResponseModelToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _GetPicturesResponseModel&&const DeepCollectionEquality().equals(other._items, _items));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(_items));
+
+@override
+String toString() {
+  return 'GetPicturesResponseModel(items: $items)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$GetPicturesResponseModelCopyWith<$Res> implements $GetPicturesResponseModelCopyWith<$Res> {
+  factory _$GetPicturesResponseModelCopyWith(_GetPicturesResponseModel value, $Res Function(_GetPicturesResponseModel) _then) = __$GetPicturesResponseModelCopyWithImpl;
+@override @useResult
+$Res call({
+ List<GetPicturesItemResponseModel> items
+});
+
+
+
+
+}
+/// @nodoc
+class __$GetPicturesResponseModelCopyWithImpl<$Res>
+    implements _$GetPicturesResponseModelCopyWith<$Res> {
+  __$GetPicturesResponseModelCopyWithImpl(this._self, this._then);
+
+  final _GetPicturesResponseModel _self;
+  final $Res Function(_GetPicturesResponseModel) _then;
+
+/// Create a copy of GetPicturesResponseModel
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? items = null,}) {
+  return _then(_GetPicturesResponseModel(
+items: null == items ? _self._items : items // ignore: cast_nullable_to_non_nullable
+as List<GetPicturesItemResponseModel>,
+  ));
+}
+
+
+}
+
+
+/// @nodoc
+mixin _$GetPicturesItemResponseModel {
+
+ String get id; String get deviceIdentificator; String? get imgType; String? get timestamp; String get fileId; String? get fileName; String? get contentType; int get createdAt;
+/// Create a copy of GetPicturesItemResponseModel
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$GetPicturesItemResponseModelCopyWith<GetPicturesItemResponseModel> get copyWith => _$GetPicturesItemResponseModelCopyWithImpl<GetPicturesItemResponseModel>(this as GetPicturesItemResponseModel, _$identity);
+
+  /// Serializes this GetPicturesItemResponseModel to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is GetPicturesItemResponseModel&&(identical(other.id, id) || other.id == id)&&(identical(other.deviceIdentificator, deviceIdentificator) || other.deviceIdentificator == deviceIdentificator)&&(identical(other.imgType, imgType) || other.imgType == imgType)&&(identical(other.timestamp, timestamp) || other.timestamp == timestamp)&&(identical(other.fileId, fileId) || other.fileId == fileId)&&(identical(other.fileName, fileName) || other.fileName == fileName)&&(identical(other.contentType, contentType) || other.contentType == contentType)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,deviceIdentificator,imgType,timestamp,fileId,fileName,contentType,createdAt);
+
+@override
+String toString() {
+  return 'GetPicturesItemResponseModel(id: $id, deviceIdentificator: $deviceIdentificator, imgType: $imgType, timestamp: $timestamp, fileId: $fileId, fileName: $fileName, contentType: $contentType, createdAt: $createdAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $GetPicturesItemResponseModelCopyWith<$Res>  {
+  factory $GetPicturesItemResponseModelCopyWith(GetPicturesItemResponseModel value, $Res Function(GetPicturesItemResponseModel) _then) = _$GetPicturesItemResponseModelCopyWithImpl;
+@useResult
+$Res call({
+ String id, String deviceIdentificator, String? imgType, String? timestamp, String fileId, String? fileName, String? contentType, int createdAt
+});
+
+
+
+
+}
+/// @nodoc
+class _$GetPicturesItemResponseModelCopyWithImpl<$Res>
+    implements $GetPicturesItemResponseModelCopyWith<$Res> {
+  _$GetPicturesItemResponseModelCopyWithImpl(this._self, this._then);
+
+  final GetPicturesItemResponseModel _self;
+  final $Res Function(GetPicturesItemResponseModel) _then;
+
+/// Create a copy of GetPicturesItemResponseModel
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? deviceIdentificator = null,Object? imgType = freezed,Object? timestamp = freezed,Object? fileId = null,Object? fileName = freezed,Object? contentType = freezed,Object? createdAt = null,}) {
+  return _then(_self.copyWith(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,deviceIdentificator: null == deviceIdentificator ? _self.deviceIdentificator : deviceIdentificator // ignore: cast_nullable_to_non_nullable
+as String,imgType: freezed == imgType ? _self.imgType : imgType // ignore: cast_nullable_to_non_nullable
+as String?,timestamp: freezed == timestamp ? _self.timestamp : timestamp // ignore: cast_nullable_to_non_nullable
+as String?,fileId: null == fileId ? _self.fileId : fileId // ignore: cast_nullable_to_non_nullable
+as String,fileName: freezed == fileName ? _self.fileName : fileName // ignore: cast_nullable_to_non_nullable
+as String?,contentType: freezed == contentType ? _self.contentType : contentType // ignore: cast_nullable_to_non_nullable
+as String?,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as int,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [GetPicturesItemResponseModel].
+extension GetPicturesItemResponseModelPatterns on GetPicturesItemResponseModel {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _GetPicturesItemResponseModel value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _GetPicturesItemResponseModel() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _GetPicturesItemResponseModel value)  $default,){
+final _that = this;
+switch (_that) {
+case _GetPicturesItemResponseModel():
+return $default(_that);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _GetPicturesItemResponseModel value)?  $default,){
+final _that = this;
+switch (_that) {
+case _GetPicturesItemResponseModel() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String deviceIdentificator,  String? imgType,  String? timestamp,  String fileId,  String? fileName,  String? contentType,  int createdAt)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _GetPicturesItemResponseModel() when $default != null:
+return $default(_that.id,_that.deviceIdentificator,_that.imgType,_that.timestamp,_that.fileId,_that.fileName,_that.contentType,_that.createdAt);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String deviceIdentificator,  String? imgType,  String? timestamp,  String fileId,  String? fileName,  String? contentType,  int createdAt)  $default,) {final _that = this;
+switch (_that) {
+case _GetPicturesItemResponseModel():
+return $default(_that.id,_that.deviceIdentificator,_that.imgType,_that.timestamp,_that.fileId,_that.fileName,_that.contentType,_that.createdAt);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String deviceIdentificator,  String? imgType,  String? timestamp,  String fileId,  String? fileName,  String? contentType,  int createdAt)?  $default,) {final _that = this;
+switch (_that) {
+case _GetPicturesItemResponseModel() when $default != null:
+return $default(_that.id,_that.deviceIdentificator,_that.imgType,_that.timestamp,_that.fileId,_that.fileName,_that.contentType,_that.createdAt);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _GetPicturesItemResponseModel implements GetPicturesItemResponseModel {
+  const _GetPicturesItemResponseModel({required this.id, required this.deviceIdentificator, this.imgType, this.timestamp, required this.fileId, this.fileName, this.contentType, required this.createdAt});
+  factory _GetPicturesItemResponseModel.fromJson(Map<String, dynamic> json) => _$GetPicturesItemResponseModelFromJson(json);
+
+@override final  String id;
+@override final  String deviceIdentificator;
+@override final  String? imgType;
+@override final  String? timestamp;
+@override final  String fileId;
+@override final  String? fileName;
+@override final  String? contentType;
+@override final  int createdAt;
+
+/// Create a copy of GetPicturesItemResponseModel
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$GetPicturesItemResponseModelCopyWith<_GetPicturesItemResponseModel> get copyWith => __$GetPicturesItemResponseModelCopyWithImpl<_GetPicturesItemResponseModel>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$GetPicturesItemResponseModelToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _GetPicturesItemResponseModel&&(identical(other.id, id) || other.id == id)&&(identical(other.deviceIdentificator, deviceIdentificator) || other.deviceIdentificator == deviceIdentificator)&&(identical(other.imgType, imgType) || other.imgType == imgType)&&(identical(other.timestamp, timestamp) || other.timestamp == timestamp)&&(identical(other.fileId, fileId) || other.fileId == fileId)&&(identical(other.fileName, fileName) || other.fileName == fileName)&&(identical(other.contentType, contentType) || other.contentType == contentType)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,deviceIdentificator,imgType,timestamp,fileId,fileName,contentType,createdAt);
+
+@override
+String toString() {
+  return 'GetPicturesItemResponseModel(id: $id, deviceIdentificator: $deviceIdentificator, imgType: $imgType, timestamp: $timestamp, fileId: $fileId, fileName: $fileName, contentType: $contentType, createdAt: $createdAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$GetPicturesItemResponseModelCopyWith<$Res> implements $GetPicturesItemResponseModelCopyWith<$Res> {
+  factory _$GetPicturesItemResponseModelCopyWith(_GetPicturesItemResponseModel value, $Res Function(_GetPicturesItemResponseModel) _then) = __$GetPicturesItemResponseModelCopyWithImpl;
+@override @useResult
+$Res call({
+ String id, String deviceIdentificator, String? imgType, String? timestamp, String fileId, String? fileName, String? contentType, int createdAt
+});
+
+
+
+
+}
+/// @nodoc
+class __$GetPicturesItemResponseModelCopyWithImpl<$Res>
+    implements _$GetPicturesItemResponseModelCopyWith<$Res> {
+  __$GetPicturesItemResponseModelCopyWithImpl(this._self, this._then);
+
+  final _GetPicturesItemResponseModel _self;
+  final $Res Function(_GetPicturesItemResponseModel) _then;
+
+/// Create a copy of GetPicturesItemResponseModel
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? deviceIdentificator = null,Object? imgType = freezed,Object? timestamp = freezed,Object? fileId = null,Object? fileName = freezed,Object? contentType = freezed,Object? createdAt = null,}) {
+  return _then(_GetPicturesItemResponseModel(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,deviceIdentificator: null == deviceIdentificator ? _self.deviceIdentificator : deviceIdentificator // ignore: cast_nullable_to_non_nullable
+as String,imgType: freezed == imgType ? _self.imgType : imgType // ignore: cast_nullable_to_non_nullable
+as String?,timestamp: freezed == timestamp ? _self.timestamp : timestamp // ignore: cast_nullable_to_non_nullable
+as String?,fileId: null == fileId ? _self.fileId : fileId // ignore: cast_nullable_to_non_nullable
+as String,fileName: freezed == fileName ? _self.fileName : fileName // ignore: cast_nullable_to_non_nullable
+as String?,contentType: freezed == contentType ? _self.contentType : contentType // ignore: cast_nullable_to_non_nullable
+as String?,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as int,
+  ));
+}
+
+
+}
+
+// dart format on

modules/legacy/modules/device_management/lib/src/core/data/models/get_pictures_response_model.g.dart

@@ -0,0 +1,47 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'get_pictures_response_model.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_GetPicturesResponseModel _$GetPicturesResponseModelFromJson(
+  Map<String, dynamic> json,
+) => _GetPicturesResponseModel(
+  items: (json['items'] as List<dynamic>)
+      .map(
+        (e) => GetPicturesItemResponseModel.fromJson(e as Map<String, dynamic>),
+      )
+      .toList(),
+);
+
+Map<String, dynamic> _$GetPicturesResponseModelToJson(
+  _GetPicturesResponseModel instance,
+) => <String, dynamic>{'items': instance.items};
+
+_GetPicturesItemResponseModel _$GetPicturesItemResponseModelFromJson(
+  Map<String, dynamic> json,
+) => _GetPicturesItemResponseModel(
+  id: json['id'] as String,
+  deviceIdentificator: json['deviceIdentificator'] as String,
+  imgType: json['imgType'] as String?,
+  timestamp: json['timestamp'] as String?,
+  fileId: json['fileId'] as String,
+  fileName: json['fileName'] as String?,
+  contentType: json['contentType'] as String?,
+  createdAt: (json['createdAt'] as num).toInt(),
+);
+
+Map<String, dynamic> _$GetPicturesItemResponseModelToJson(
+  _GetPicturesItemResponseModel instance,
+) => <String, dynamic>{
+  'id': instance.id,
+  'deviceIdentificator': instance.deviceIdentificator,
+  'imgType': instance.imgType,
+  'timestamp': instance.timestamp,
+  'fileId': instance.fileId,
+  'fileName': instance.fileName,
+  'contentType': instance.contentType,
+  'createdAt': instance.createdAt,
+};

modules/legacy/modules/device_management/lib/src/core/data/repositories/functions_repository_impl.dart

@@ -1,21 +0,0 @@
-import 'package:device_management/src/core/data/datasources/functions_remote_datasource.dart';
-import 'package:device_management/src/core/domain/repositories/functions_repository.dart';
-import 'package:device_management/src/features/remote_connection/domain/entities/picture_entity.dart';
-
-class FunctionsRepositoryImpl implements FunctionsRepository {
-  const FunctionsRepositoryImpl(this._remote);
-
-  final FunctionsRemoteDatasource _remote;
-
-  @override
-  Future<List<PictureEntity>> getPictures({required String userId}) async {
-    await Future<void>.delayed(const Duration(milliseconds: 2000));
-    return _remote.getPictures(userId: userId);
-  }
-
-  @override
-  Future<PictureEntity> takePicture({required String userId}) async {
-    await Future<void>.delayed(const Duration(milliseconds: 2000));
-    return _remote.takePicture(userId: userId);
-  }
-}

modules/legacy/modules/device_management/lib/src/core/data/repositories/pictures_repository_impl.dart

@@ -0,0 +1,20 @@
+import 'package:device_management/src/features/remote_connection/domain/entities/picture_entity.dart';
+
+import '../../domain/repositories/pictures_repository.dart';
+import '../datasources/pictures_remote_datasource.dart';
+
+class PicturesRepositoryImpl implements PicturesRepository {
+  const PicturesRepositoryImpl(this._remote);
+
+  final PicturesRemoteDatasource _remote;
+
+  @override
+  Future<List<PictureEntity>> getPictures({required String deviceId}) {
+    return _remote.getPictures(deviceId: deviceId);
+  }
+
+  @override
+  Future<PictureEntity> takePicture({required String deviceId}) {
+    return _remote.takePicture(deviceId: deviceId);
+  }
+}

modules/legacy/modules/device_management/lib/src/core/domain/repositories/functions_repository.dart

@@ -1,7 +0,0 @@
-import 'package:device_management/src/features/remote_connection/domain/entities/picture_entity.dart';
-
-abstract class FunctionsRepository {
-  Future<List<PictureEntity>> getPictures({required String userId});
-
-  Future<PictureEntity> takePicture({required String userId});
-}

modules/legacy/modules/device_management/lib/src/core/domain/repositories/pictures_repository.dart

@@ -0,0 +1,7 @@
+import 'package:device_management/src/features/remote_connection/domain/entities/picture_entity.dart';
+
+abstract class PicturesRepository {
+  Future<List<PictureEntity>> getPictures({required String deviceId});
+
+  Future<PictureEntity> takePicture({required String deviceId});
+}

modules/legacy/modules/device_management/lib/src/core/providers/functions_remote_datasource_provider.dart

@@ -1,9 +0,0 @@
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:device_management/src/core/data/datasources/functions_remote_datasource.dart';
-import 'package:device_management/src/core/data/datasources/functions_remote_datasource_impl.dart';
-import 'package:sf_infrastructure/sf_infrastructure.dart';
-
-final functionsRemoteDatasourceProvider = Provider<FunctionsRemoteDatasource>((ref) {
-  final questiaRepository = getIt<QuestiaRepository>();
-  return FunctionsRemoteDatasourceImpl(questiaRepository);
-});

modules/legacy/modules/device_management/lib/src/core/providers/functions_repository_provider.dart

@@ -1,9 +0,0 @@
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:device_management/src/core/providers/functions_remote_datasource_provider.dart';
-import 'package:device_management/src/core/data/repositories/functions_repository_impl.dart';
-import 'package:device_management/src/core/domain/repositories/functions_repository.dart';
-
-final functionsRepositoryProvider = Provider<FunctionsRepository>((ref) {
-  final remote = ref.read(functionsRemoteDatasourceProvider);
-  return FunctionsRepositoryImpl(remote);
-});

modules/legacy/modules/device_management/lib/src/core/providers/pictures_remote_datasource_provider.dart

@@ -0,0 +1,10 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:sf_infrastructure/sf_infrastructure.dart';
+
+import '../data/datasources/pictures_remote_datasource.dart';
+import '../data/datasources/pictures_remote_datasource_impl.dart';
+
+final picturesRemoteDatasourceProvider = Provider<PicturesRemoteDatasource>((ref) {
+  final questiaRepository = getIt<QuestiaRepository>();
+  return PicturesRemoteDatasourceImpl(questiaRepository);
+});

modules/legacy/modules/device_management/lib/src/core/providers/pictures_repository_provider.dart

@@ -0,0 +1,10 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../data/repositories/pictures_repository_impl.dart';
+import '../domain/repositories/pictures_repository.dart';
+import 'pictures_remote_datasource_provider.dart';
+
+final picturesRepositoryProvider = Provider<PicturesRepository>((ref) {
+  final remote = ref.read(picturesRemoteDatasourceProvider);
+  return PicturesRepositoryImpl(remote);
+});

modules/legacy/modules/device_management/lib/src/features/call_history/call_history_builder.dart

@@ -0,0 +1,15 @@
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+
+import 'presentation/call_history_screen.dart';
+
+class CallHistoryBuilder {
+  const CallHistoryBuilder();
+
+  Page<void> buildPage(BuildContext context, GoRouterState state) {
+    return MaterialPage<void>(
+      key: state.pageKey,
+      child: const CallHistoryScreen(),
+    );
+  }
+}

modules/legacy/modules/device_management/lib/src/features/call_history/data/call_history_datasource.dart

@@ -0,0 +1,42 @@
+import 'package:dio/dio.dart';
+import 'package:legacy_shared/legacy_shared.dart';
+import 'package:sf_infrastructure/sf_infrastructure.dart';
+
+import 'call_history_entity.dart';
+import 'call_history_response_model.dart';
+
+class CallHistoryDatasource {
+  CallHistoryDatasource(this._repository);
+
+  final QuestiaRepository _repository;
+
+  Future<List<CallHistoryEntity>> getCallHistory({
+    required String deviceIdentificator,
+  }) async {
+    try {
+      final response = await _repository.get<Map<String, dynamic>>(
+        '/devices/identificator/$deviceIdentificator/call-histories',
+      );
+
+      final data = response.data;
+      if (data == null || data.isEmpty) return [];
+
+      final model = CallHistoryResponseModel.fromJson(data);
+      return model.items
+          .map((item) => CallHistoryEntity(
+                deviceIdentificator: item.deviceIdentificator,
+                phone: item.phone,
+                name: item.name,
+                isIncoming: item.isIncoming,
+                isAccepted: item.isAccepted,
+                duration: item.duration,
+                occurredAt: item.occurredAt,
+                createdAt: item.createdAt,
+              ))
+          .toList();
+    } on DioException catch (error) {
+      if (error.response?.statusCode == 404) return [];
+      throw mapDioError(error, defaultMessage: 'Error getting call history');
+    }
+  }
+}

modules/legacy/modules/device_management/lib/src/features/call_history/data/call_history_datasource_provider.dart

@@ -0,0 +1,9 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:get_it/get_it.dart';
+import 'package:sf_infrastructure/sf_infrastructure.dart';
+
+import 'call_history_datasource.dart';
+
+final callHistoryDatasourceProvider = Provider<CallHistoryDatasource>((ref) {
+  return CallHistoryDatasource(GetIt.I<QuestiaRepository>());
+});

modules/legacy/modules/device_management/lib/src/features/call_history/data/call_history_entity.dart

@@ -0,0 +1,17 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'call_history_entity.freezed.dart';
+
+@freezed
+abstract class CallHistoryEntity with _$CallHistoryEntity {
+  const factory CallHistoryEntity({
+    required String deviceIdentificator,
+    required String phone,
+    String? name,
+    required bool isIncoming,
+    required bool isAccepted,
+    required int duration,
+    required int occurredAt,
+    required int createdAt,
+  }) = _CallHistoryEntity;
+}

modules/legacy/modules/device_management/lib/src/features/call_history/data/call_history_entity.freezed.dart

@@ -0,0 +1,292 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'call_history_entity.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+/// @nodoc
+mixin _$CallHistoryEntity {
+
+ String get deviceIdentificator; String get phone; String? get name; bool get isIncoming; bool get isAccepted; int get duration; int get occurredAt; int get createdAt;
+/// Create a copy of CallHistoryEntity
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$CallHistoryEntityCopyWith<CallHistoryEntity> get copyWith => _$CallHistoryEntityCopyWithImpl<CallHistoryEntity>(this as CallHistoryEntity, _$identity);
+
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is CallHistoryEntity&&(identical(other.deviceIdentificator, deviceIdentificator) || other.deviceIdentificator == deviceIdentificator)&&(identical(other.phone, phone) || other.phone == phone)&&(identical(other.name, name) || other.name == name)&&(identical(other.isIncoming, isIncoming) || other.isIncoming == isIncoming)&&(identical(other.isAccepted, isAccepted) || other.isAccepted == isAccepted)&&(identical(other.duration, duration) || other.duration == duration)&&(identical(other.occurredAt, occurredAt) || other.occurredAt == occurredAt)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt));
+}
+
+
+@override
+int get hashCode => Object.hash(runtimeType,deviceIdentificator,phone,name,isIncoming,isAccepted,duration,occurredAt,createdAt);
+
+@override
+String toString() {
+  return 'CallHistoryEntity(deviceIdentificator: $deviceIdentificator, phone: $phone, name: $name, isIncoming: $isIncoming, isAccepted: $isAccepted, duration: $duration, occurredAt: $occurredAt, createdAt: $createdAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $CallHistoryEntityCopyWith<$Res>  {
+  factory $CallHistoryEntityCopyWith(CallHistoryEntity value, $Res Function(CallHistoryEntity) _then) = _$CallHistoryEntityCopyWithImpl;
+@useResult
+$Res call({
+ String deviceIdentificator, String phone, String? name, bool isIncoming, bool isAccepted, int duration, int occurredAt, int createdAt
+});
+
+
+
+
+}
+/// @nodoc
+class _$CallHistoryEntityCopyWithImpl<$Res>
+    implements $CallHistoryEntityCopyWith<$Res> {
+  _$CallHistoryEntityCopyWithImpl(this._self, this._then);
+
+  final CallHistoryEntity _self;
+  final $Res Function(CallHistoryEntity) _then;
+
+/// Create a copy of CallHistoryEntity
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? deviceIdentificator = null,Object? phone = null,Object? name = freezed,Object? isIncoming = null,Object? isAccepted = null,Object? duration = null,Object? occurredAt = null,Object? createdAt = null,}) {
+  return _then(_self.copyWith(
+deviceIdentificator: null == deviceIdentificator ? _self.deviceIdentificator : deviceIdentificator // ignore: cast_nullable_to_non_nullable
+as String,phone: null == phone ? _self.phone : phone // ignore: cast_nullable_to_non_nullable
+as String,name: freezed == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
+as String?,isIncoming: null == isIncoming ? _self.isIncoming : isIncoming // ignore: cast_nullable_to_non_nullable
+as bool,isAccepted: null == isAccepted ? _self.isAccepted : isAccepted // ignore: cast_nullable_to_non_nullable
+as bool,duration: null == duration ? _self.duration : duration // ignore: cast_nullable_to_non_nullable
+as int,occurredAt: null == occurredAt ? _self.occurredAt : occurredAt // ignore: cast_nullable_to_non_nullable
+as int,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as int,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [CallHistoryEntity].
+extension CallHistoryEntityPatterns on CallHistoryEntity {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _CallHistoryEntity value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _CallHistoryEntity() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _CallHistoryEntity value)  $default,){
+final _that = this;
+switch (_that) {
+case _CallHistoryEntity():
+return $default(_that);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _CallHistoryEntity value)?  $default,){
+final _that = this;
+switch (_that) {
+case _CallHistoryEntity() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String deviceIdentificator,  String phone,  String? name,  bool isIncoming,  bool isAccepted,  int duration,  int occurredAt,  int createdAt)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _CallHistoryEntity() when $default != null:
+return $default(_that.deviceIdentificator,_that.phone,_that.name,_that.isIncoming,_that.isAccepted,_that.duration,_that.occurredAt,_that.createdAt);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String deviceIdentificator,  String phone,  String? name,  bool isIncoming,  bool isAccepted,  int duration,  int occurredAt,  int createdAt)  $default,) {final _that = this;
+switch (_that) {
+case _CallHistoryEntity():
+return $default(_that.deviceIdentificator,_that.phone,_that.name,_that.isIncoming,_that.isAccepted,_that.duration,_that.occurredAt,_that.createdAt);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String deviceIdentificator,  String phone,  String? name,  bool isIncoming,  bool isAccepted,  int duration,  int occurredAt,  int createdAt)?  $default,) {final _that = this;
+switch (_that) {
+case _CallHistoryEntity() when $default != null:
+return $default(_that.deviceIdentificator,_that.phone,_that.name,_that.isIncoming,_that.isAccepted,_that.duration,_that.occurredAt,_that.createdAt);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+
+
+class _CallHistoryEntity implements CallHistoryEntity {
+  const _CallHistoryEntity({required this.deviceIdentificator, required this.phone, this.name, required this.isIncoming, required this.isAccepted, required this.duration, required this.occurredAt, required this.createdAt});
+  
+
+@override final  String deviceIdentificator;
+@override final  String phone;
+@override final  String? name;
+@override final  bool isIncoming;
+@override final  bool isAccepted;
+@override final  int duration;
+@override final  int occurredAt;
+@override final  int createdAt;
+
+/// Create a copy of CallHistoryEntity
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$CallHistoryEntityCopyWith<_CallHistoryEntity> get copyWith => __$CallHistoryEntityCopyWithImpl<_CallHistoryEntity>(this, _$identity);
+
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _CallHistoryEntity&&(identical(other.deviceIdentificator, deviceIdentificator) || other.deviceIdentificator == deviceIdentificator)&&(identical(other.phone, phone) || other.phone == phone)&&(identical(other.name, name) || other.name == name)&&(identical(other.isIncoming, isIncoming) || other.isIncoming == isIncoming)&&(identical(other.isAccepted, isAccepted) || other.isAccepted == isAccepted)&&(identical(other.duration, duration) || other.duration == duration)&&(identical(other.occurredAt, occurredAt) || other.occurredAt == occurredAt)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt));
+}
+
+
+@override
+int get hashCode => Object.hash(runtimeType,deviceIdentificator,phone,name,isIncoming,isAccepted,duration,occurredAt,createdAt);
+
+@override
+String toString() {
+  return 'CallHistoryEntity(deviceIdentificator: $deviceIdentificator, phone: $phone, name: $name, isIncoming: $isIncoming, isAccepted: $isAccepted, duration: $duration, occurredAt: $occurredAt, createdAt: $createdAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$CallHistoryEntityCopyWith<$Res> implements $CallHistoryEntityCopyWith<$Res> {
+  factory _$CallHistoryEntityCopyWith(_CallHistoryEntity value, $Res Function(_CallHistoryEntity) _then) = __$CallHistoryEntityCopyWithImpl;
+@override @useResult
+$Res call({
+ String deviceIdentificator, String phone, String? name, bool isIncoming, bool isAccepted, int duration, int occurredAt, int createdAt
+});
+
+
+
+
+}
+/// @nodoc
+class __$CallHistoryEntityCopyWithImpl<$Res>
+    implements _$CallHistoryEntityCopyWith<$Res> {
+  __$CallHistoryEntityCopyWithImpl(this._self, this._then);
+
+  final _CallHistoryEntity _self;
+  final $Res Function(_CallHistoryEntity) _then;
+
+/// Create a copy of CallHistoryEntity
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? deviceIdentificator = null,Object? phone = null,Object? name = freezed,Object? isIncoming = null,Object? isAccepted = null,Object? duration = null,Object? occurredAt = null,Object? createdAt = null,}) {
+  return _then(_CallHistoryEntity(
+deviceIdentificator: null == deviceIdentificator ? _self.deviceIdentificator : deviceIdentificator // ignore: cast_nullable_to_non_nullable
+as String,phone: null == phone ? _self.phone : phone // ignore: cast_nullable_to_non_nullable
+as String,name: freezed == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
+as String?,isIncoming: null == isIncoming ? _self.isIncoming : isIncoming // ignore: cast_nullable_to_non_nullable
+as bool,isAccepted: null == isAccepted ? _self.isAccepted : isAccepted // ignore: cast_nullable_to_non_nullable
+as bool,duration: null == duration ? _self.duration : duration // ignore: cast_nullable_to_non_nullable
+as int,occurredAt: null == occurredAt ? _self.occurredAt : occurredAt // ignore: cast_nullable_to_non_nullable
+as int,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as int,
+  ));
+}
+
+
+}
+
+// dart format on

modules/legacy/modules/device_management/lib/src/features/call_history/data/call_history_response_model.dart

@@ -0,0 +1,32 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'call_history_response_model.freezed.dart';
+part 'call_history_response_model.g.dart';
+
+@freezed
+abstract class CallHistoryResponseModel with _$CallHistoryResponseModel {
+  const factory CallHistoryResponseModel({
+    required int total,
+    required List<CallHistoryItemModel> items,
+  }) = _CallHistoryResponseModel;
+
+  factory CallHistoryResponseModel.fromJson(Map<String, dynamic> json) =>
+      _$CallHistoryResponseModelFromJson(json);
+}
+
+@freezed
+abstract class CallHistoryItemModel with _$CallHistoryItemModel {
+  const factory CallHistoryItemModel({
+    required String deviceIdentificator,
+    required String phone,
+    String? name,
+    required bool isIncoming,
+    required bool isAccepted,
+    required int duration,
+    required int occurredAt,
+    required int createdAt,
+  }) = _CallHistoryItemModel;
+
+  factory CallHistoryItemModel.fromJson(Map<String, dynamic> json) =>
+      _$CallHistoryItemModelFromJson(json);
+}

modules/legacy/modules/device_management/lib/src/features/call_history/data/call_history_response_model.freezed.dart

@@ -0,0 +1,570 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'call_history_response_model.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+
+/// @nodoc
+mixin _$CallHistoryResponseModel {
+
+ int get total; List<CallHistoryItemModel> get items;
+/// Create a copy of CallHistoryResponseModel
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$CallHistoryResponseModelCopyWith<CallHistoryResponseModel> get copyWith => _$CallHistoryResponseModelCopyWithImpl<CallHistoryResponseModel>(this as CallHistoryResponseModel, _$identity);
+
+  /// Serializes this CallHistoryResponseModel to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is CallHistoryResponseModel&&(identical(other.total, total) || other.total == total)&&const DeepCollectionEquality().equals(other.items, items));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,total,const DeepCollectionEquality().hash(items));
+
+@override
+String toString() {
+  return 'CallHistoryResponseModel(total: $total, items: $items)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $CallHistoryResponseModelCopyWith<$Res>  {
+  factory $CallHistoryResponseModelCopyWith(CallHistoryResponseModel value, $Res Function(CallHistoryResponseModel) _then) = _$CallHistoryResponseModelCopyWithImpl;
+@useResult
+$Res call({
+ int total, List<CallHistoryItemModel> items
+});
+
+
+
+
+}
+/// @nodoc
+class _$CallHistoryResponseModelCopyWithImpl<$Res>
+    implements $CallHistoryResponseModelCopyWith<$Res> {
+  _$CallHistoryResponseModelCopyWithImpl(this._self, this._then);
+
+  final CallHistoryResponseModel _self;
+  final $Res Function(CallHistoryResponseModel) _then;
+
+/// Create a copy of CallHistoryResponseModel
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? total = null,Object? items = null,}) {
+  return _then(_self.copyWith(
+total: null == total ? _self.total : total // ignore: cast_nullable_to_non_nullable
+as int,items: null == items ? _self.items : items // ignore: cast_nullable_to_non_nullable
+as List<CallHistoryItemModel>,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [CallHistoryResponseModel].
+extension CallHistoryResponseModelPatterns on CallHistoryResponseModel {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _CallHistoryResponseModel value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _CallHistoryResponseModel() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _CallHistoryResponseModel value)  $default,){
+final _that = this;
+switch (_that) {
+case _CallHistoryResponseModel():
+return $default(_that);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _CallHistoryResponseModel value)?  $default,){
+final _that = this;
+switch (_that) {
+case _CallHistoryResponseModel() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( int total,  List<CallHistoryItemModel> items)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _CallHistoryResponseModel() when $default != null:
+return $default(_that.total,_that.items);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( int total,  List<CallHistoryItemModel> items)  $default,) {final _that = this;
+switch (_that) {
+case _CallHistoryResponseModel():
+return $default(_that.total,_that.items);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( int total,  List<CallHistoryItemModel> items)?  $default,) {final _that = this;
+switch (_that) {
+case _CallHistoryResponseModel() when $default != null:
+return $default(_that.total,_that.items);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _CallHistoryResponseModel implements CallHistoryResponseModel {
+  const _CallHistoryResponseModel({required this.total, required final  List<CallHistoryItemModel> items}): _items = items;
+  factory _CallHistoryResponseModel.fromJson(Map<String, dynamic> json) => _$CallHistoryResponseModelFromJson(json);
+
+@override final  int total;
+ final  List<CallHistoryItemModel> _items;
+@override List<CallHistoryItemModel> get items {
+  if (_items is EqualUnmodifiableListView) return _items;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableListView(_items);
+}
+
+
+/// Create a copy of CallHistoryResponseModel
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$CallHistoryResponseModelCopyWith<_CallHistoryResponseModel> get copyWith => __$CallHistoryResponseModelCopyWithImpl<_CallHistoryResponseModel>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$CallHistoryResponseModelToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _CallHistoryResponseModel&&(identical(other.total, total) || other.total == total)&&const DeepCollectionEquality().equals(other._items, _items));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,total,const DeepCollectionEquality().hash(_items));
+
+@override
+String toString() {
+  return 'CallHistoryResponseModel(total: $total, items: $items)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$CallHistoryResponseModelCopyWith<$Res> implements $CallHistoryResponseModelCopyWith<$Res> {
+  factory _$CallHistoryResponseModelCopyWith(_CallHistoryResponseModel value, $Res Function(_CallHistoryResponseModel) _then) = __$CallHistoryResponseModelCopyWithImpl;
+@override @useResult
+$Res call({
+ int total, List<CallHistoryItemModel> items
+});
+
+
+
+
+}
+/// @nodoc
+class __$CallHistoryResponseModelCopyWithImpl<$Res>
+    implements _$CallHistoryResponseModelCopyWith<$Res> {
+  __$CallHistoryResponseModelCopyWithImpl(this._self, this._then);
+
+  final _CallHistoryResponseModel _self;
+  final $Res Function(_CallHistoryResponseModel) _then;
+
+/// Create a copy of CallHistoryResponseModel
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? total = null,Object? items = null,}) {
+  return _then(_CallHistoryResponseModel(
+total: null == total ? _self.total : total // ignore: cast_nullable_to_non_nullable
+as int,items: null == items ? _self._items : items // ignore: cast_nullable_to_non_nullable
+as List<CallHistoryItemModel>,
+  ));
+}
+
+
+}
+
+
+/// @nodoc
+mixin _$CallHistoryItemModel {
+
+ String get deviceIdentificator; String get phone; String? get name; bool get isIncoming; bool get isAccepted; int get duration; int get occurredAt; int get createdAt;
+/// Create a copy of CallHistoryItemModel
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$CallHistoryItemModelCopyWith<CallHistoryItemModel> get copyWith => _$CallHistoryItemModelCopyWithImpl<CallHistoryItemModel>(this as CallHistoryItemModel, _$identity);
+
+  /// Serializes this CallHistoryItemModel to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is CallHistoryItemModel&&(identical(other.deviceIdentificator, deviceIdentificator) || other.deviceIdentificator == deviceIdentificator)&&(identical(other.phone, phone) || other.phone == phone)&&(identical(other.name, name) || other.name == name)&&(identical(other.isIncoming, isIncoming) || other.isIncoming == isIncoming)&&(identical(other.isAccepted, isAccepted) || other.isAccepted == isAccepted)&&(identical(other.duration, duration) || other.duration == duration)&&(identical(other.occurredAt, occurredAt) || other.occurredAt == occurredAt)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,deviceIdentificator,phone,name,isIncoming,isAccepted,duration,occurredAt,createdAt);
+
+@override
+String toString() {
+  return 'CallHistoryItemModel(deviceIdentificator: $deviceIdentificator, phone: $phone, name: $name, isIncoming: $isIncoming, isAccepted: $isAccepted, duration: $duration, occurredAt: $occurredAt, createdAt: $createdAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $CallHistoryItemModelCopyWith<$Res>  {
+  factory $CallHistoryItemModelCopyWith(CallHistoryItemModel value, $Res Function(CallHistoryItemModel) _then) = _$CallHistoryItemModelCopyWithImpl;
+@useResult
+$Res call({
+ String deviceIdentificator, String phone, String? name, bool isIncoming, bool isAccepted, int duration, int occurredAt, int createdAt
+});
+
+
+
+
+}
+/// @nodoc
+class _$CallHistoryItemModelCopyWithImpl<$Res>
+    implements $CallHistoryItemModelCopyWith<$Res> {
+  _$CallHistoryItemModelCopyWithImpl(this._self, this._then);
+
+  final CallHistoryItemModel _self;
+  final $Res Function(CallHistoryItemModel) _then;
+
+/// Create a copy of CallHistoryItemModel
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? deviceIdentificator = null,Object? phone = null,Object? name = freezed,Object? isIncoming = null,Object? isAccepted = null,Object? duration = null,Object? occurredAt = null,Object? createdAt = null,}) {
+  return _then(_self.copyWith(
+deviceIdentificator: null == deviceIdentificator ? _self.deviceIdentificator : deviceIdentificator // ignore: cast_nullable_to_non_nullable
+as String,phone: null == phone ? _self.phone : phone // ignore: cast_nullable_to_non_nullable
+as String,name: freezed == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
+as String?,isIncoming: null == isIncoming ? _self.isIncoming : isIncoming // ignore: cast_nullable_to_non_nullable
+as bool,isAccepted: null == isAccepted ? _self.isAccepted : isAccepted // ignore: cast_nullable_to_non_nullable
+as bool,duration: null == duration ? _self.duration : duration // ignore: cast_nullable_to_non_nullable
+as int,occurredAt: null == occurredAt ? _self.occurredAt : occurredAt // ignore: cast_nullable_to_non_nullable
+as int,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as int,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [CallHistoryItemModel].
+extension CallHistoryItemModelPatterns on CallHistoryItemModel {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _CallHistoryItemModel value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _CallHistoryItemModel() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _CallHistoryItemModel value)  $default,){
+final _that = this;
+switch (_that) {
+case _CallHistoryItemModel():
+return $default(_that);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _CallHistoryItemModel value)?  $default,){
+final _that = this;
+switch (_that) {
+case _CallHistoryItemModel() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String deviceIdentificator,  String phone,  String? name,  bool isIncoming,  bool isAccepted,  int duration,  int occurredAt,  int createdAt)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _CallHistoryItemModel() when $default != null:
+return $default(_that.deviceIdentificator,_that.phone,_that.name,_that.isIncoming,_that.isAccepted,_that.duration,_that.occurredAt,_that.createdAt);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String deviceIdentificator,  String phone,  String? name,  bool isIncoming,  bool isAccepted,  int duration,  int occurredAt,  int createdAt)  $default,) {final _that = this;
+switch (_that) {
+case _CallHistoryItemModel():
+return $default(_that.deviceIdentificator,_that.phone,_that.name,_that.isIncoming,_that.isAccepted,_that.duration,_that.occurredAt,_that.createdAt);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String deviceIdentificator,  String phone,  String? name,  bool isIncoming,  bool isAccepted,  int duration,  int occurredAt,  int createdAt)?  $default,) {final _that = this;
+switch (_that) {
+case _CallHistoryItemModel() when $default != null:
+return $default(_that.deviceIdentificator,_that.phone,_that.name,_that.isIncoming,_that.isAccepted,_that.duration,_that.occurredAt,_that.createdAt);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _CallHistoryItemModel implements CallHistoryItemModel {
+  const _CallHistoryItemModel({required this.deviceIdentificator, required this.phone, this.name, required this.isIncoming, required this.isAccepted, required this.duration, required this.occurredAt, required this.createdAt});
+  factory _CallHistoryItemModel.fromJson(Map<String, dynamic> json) => _$CallHistoryItemModelFromJson(json);
+
+@override final  String deviceIdentificator;
+@override final  String phone;
+@override final  String? name;
+@override final  bool isIncoming;
+@override final  bool isAccepted;
+@override final  int duration;
+@override final  int occurredAt;
+@override final  int createdAt;
+
+/// Create a copy of CallHistoryItemModel
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$CallHistoryItemModelCopyWith<_CallHistoryItemModel> get copyWith => __$CallHistoryItemModelCopyWithImpl<_CallHistoryItemModel>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$CallHistoryItemModelToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _CallHistoryItemModel&&(identical(other.deviceIdentificator, deviceIdentificator) || other.deviceIdentificator == deviceIdentificator)&&(identical(other.phone, phone) || other.phone == phone)&&(identical(other.name, name) || other.name == name)&&(identical(other.isIncoming, isIncoming) || other.isIncoming == isIncoming)&&(identical(other.isAccepted, isAccepted) || other.isAccepted == isAccepted)&&(identical(other.duration, duration) || other.duration == duration)&&(identical(other.occurredAt, occurredAt) || other.occurredAt == occurredAt)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,deviceIdentificator,phone,name,isIncoming,isAccepted,duration,occurredAt,createdAt);
+
+@override
+String toString() {
+  return 'CallHistoryItemModel(deviceIdentificator: $deviceIdentificator, phone: $phone, name: $name, isIncoming: $isIncoming, isAccepted: $isAccepted, duration: $duration, occurredAt: $occurredAt, createdAt: $createdAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$CallHistoryItemModelCopyWith<$Res> implements $CallHistoryItemModelCopyWith<$Res> {
+  factory _$CallHistoryItemModelCopyWith(_CallHistoryItemModel value, $Res Function(_CallHistoryItemModel) _then) = __$CallHistoryItemModelCopyWithImpl;
+@override @useResult
+$Res call({
+ String deviceIdentificator, String phone, String? name, bool isIncoming, bool isAccepted, int duration, int occurredAt, int createdAt
+});
+
+
+
+
+}
+/// @nodoc
+class __$CallHistoryItemModelCopyWithImpl<$Res>
+    implements _$CallHistoryItemModelCopyWith<$Res> {
+  __$CallHistoryItemModelCopyWithImpl(this._self, this._then);
+
+  final _CallHistoryItemModel _self;
+  final $Res Function(_CallHistoryItemModel) _then;
+
+/// Create a copy of CallHistoryItemModel
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? deviceIdentificator = null,Object? phone = null,Object? name = freezed,Object? isIncoming = null,Object? isAccepted = null,Object? duration = null,Object? occurredAt = null,Object? createdAt = null,}) {
+  return _then(_CallHistoryItemModel(
+deviceIdentificator: null == deviceIdentificator ? _self.deviceIdentificator : deviceIdentificator // ignore: cast_nullable_to_non_nullable
+as String,phone: null == phone ? _self.phone : phone // ignore: cast_nullable_to_non_nullable
+as String,name: freezed == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
+as String?,isIncoming: null == isIncoming ? _self.isIncoming : isIncoming // ignore: cast_nullable_to_non_nullable
+as bool,isAccepted: null == isAccepted ? _self.isAccepted : isAccepted // ignore: cast_nullable_to_non_nullable
+as bool,duration: null == duration ? _self.duration : duration // ignore: cast_nullable_to_non_nullable
+as int,occurredAt: null == occurredAt ? _self.occurredAt : occurredAt // ignore: cast_nullable_to_non_nullable
+as int,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as int,
+  ));
+}
+
+
+}
+
+// dart format on

modules/legacy/modules/device_management/lib/src/features/call_history/data/call_history_response_model.g.dart

@@ -0,0 +1,46 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'call_history_response_model.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_CallHistoryResponseModel _$CallHistoryResponseModelFromJson(
+  Map<String, dynamic> json,
+) => _CallHistoryResponseModel(
+  total: (json['total'] as num).toInt(),
+  items: (json['items'] as List<dynamic>)
+      .map((e) => CallHistoryItemModel.fromJson(e as Map<String, dynamic>))
+      .toList(),
+);
+
+Map<String, dynamic> _$CallHistoryResponseModelToJson(
+  _CallHistoryResponseModel instance,
+) => <String, dynamic>{'total': instance.total, 'items': instance.items};
+
+_CallHistoryItemModel _$CallHistoryItemModelFromJson(
+  Map<String, dynamic> json,
+) => _CallHistoryItemModel(
+  deviceIdentificator: json['deviceIdentificator'] as String,
+  phone: json['phone'] as String,
+  name: json['name'] as String?,
+  isIncoming: json['isIncoming'] as bool,
+  isAccepted: json['isAccepted'] as bool,
+  duration: (json['duration'] as num).toInt(),
+  occurredAt: (json['occurredAt'] as num).toInt(),
+  createdAt: (json['createdAt'] as num).toInt(),
+);
+
+Map<String, dynamic> _$CallHistoryItemModelToJson(
+  _CallHistoryItemModel instance,
+) => <String, dynamic>{
+  'deviceIdentificator': instance.deviceIdentificator,
+  'phone': instance.phone,
+  'name': instance.name,
+  'isIncoming': instance.isIncoming,
+  'isAccepted': instance.isAccepted,
+  'duration': instance.duration,
+  'occurredAt': instance.occurredAt,
+  'createdAt': instance.createdAt,
+};

modules/legacy/modules/device_management/lib/src/features/call_history/presentation/call_history_screen.dart

@@ -0,0 +1,321 @@
+import 'package:design_system/design_system.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:legacy_shared/legacy_shared.dart';
+import 'package:sf_localizations/sf_localizations.dart';
+
+import '../data/call_history_entity.dart';
+import 'state/call_history_view_model.dart';
+import 'state/call_history_view_state.dart';
+
+class CallHistoryScreen extends ConsumerWidget {
+  const CallHistoryScreen({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final theme = ref.watch(themePortProvider);
+    final state = ref.watch(callHistoryViewModelProvider);
+    final vm = ref.read(callHistoryViewModelProvider.notifier);
+    final filtered = state.filteredCalls;
+
+    return LegacyPageLayout(
+      theme: theme,
+      title: context.translate(I18n.callHistory),
+      body: state.isLoading
+          ? const Center(child: CircularProgressIndicator())
+          : state.errorMessage.isNotEmpty
+              ? Center(
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      Icon(Icons.error_outline,
+                          size: 64, color: Colors.grey.shade300),
+                      const SizedBox(height: 12),
+                      Text(
+                        state.errorMessage,
+                        style: TextStyle(
+                            color: Colors.grey.shade500, fontSize: 14),
+                        textAlign: TextAlign.center,
+                      ),
+                    ],
+                  ),
+                )
+              : Column(
+                  children: [
+                    _FilterBar(
+                      selected: state.filter,
+                      onChanged: vm.setFilter,
+                    ),
+                    Expanded(
+                      child: filtered.isEmpty
+                          ? Center(
+                              child: Column(
+                                mainAxisSize: MainAxisSize.min,
+                                children: [
+                                  Icon(Icons.phone_missed_outlined,
+                                      size: 64,
+                                      color: Colors.grey.shade300),
+                                  const SizedBox(height: 12),
+                                  Text(
+                                    context
+                                        .translate(I18n.callHistoryEmpty),
+                                    style: TextStyle(
+                                        color: Colors.grey.shade500,
+                                        fontSize: 14),
+                                  ),
+                                ],
+                              ),
+                            )
+                          : ListView.builder(
+                              padding: const EdgeInsets.symmetric(
+                                  horizontal: 16, vertical: 4),
+                              itemCount: filtered.length,
+                              itemBuilder: (context, index) {
+                                final call = filtered[index];
+                                final showDateHeader = index == 0 ||
+                                    !_isSameDay(
+                                      filtered[index - 1].occurredAt,
+                                      call.occurredAt,
+                                    );
+
+                                return Column(
+                                  crossAxisAlignment:
+                                      CrossAxisAlignment.start,
+                                  children: [
+                                    if (showDateHeader)
+                                      _DateHeader(
+                                          timestamp: call.occurredAt),
+                                    _CallTile(
+                                      call: call,
+                                      primaryColor: theme.getColorFor(
+                                          ThemeCode.legacyPrimary),
+                                    ),
+                                  ],
+                                );
+                              },
+                            ),
+                    ),
+                  ],
+                ),
+    );
+  }
+
+  static bool _isSameDay(int ts1, int ts2) {
+    final d1 = DateTime.fromMillisecondsSinceEpoch(ts1);
+    final d2 = DateTime.fromMillisecondsSinceEpoch(ts2);
+    return d1.year == d2.year && d1.month == d2.month && d1.day == d2.day;
+  }
+}
+
+class _FilterBar extends StatelessWidget {
+  final CallFilter selected;
+  final ValueChanged<CallFilter> onChanged;
+
+  const _FilterBar({required this.selected, required this.onChanged});
+
+  @override
+  Widget build(BuildContext context) {
+    final filters = CallFilter.values;
+    final selectedIndex = filters.indexOf(selected);
+
+    return Container(
+      margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+      padding: const EdgeInsets.all(4),
+      height: 40,
+      decoration: BoxDecoration(
+        color: Colors.grey.shade200,
+        borderRadius: BorderRadius.circular(10),
+      ),
+      child: LayoutBuilder(
+        builder: (context, constraints) {
+          final tabWidth = constraints.maxWidth / filters.length;
+
+          return Stack(
+            children: [
+              AnimatedPositioned(
+                duration: const Duration(milliseconds: 200),
+                curve: Curves.easeInOut,
+                left: selectedIndex * tabWidth,
+                top: 0,
+                bottom: 0,
+                width: tabWidth,
+                child: Container(
+                  decoration: BoxDecoration(
+                    color: Colors.white,
+                    borderRadius: BorderRadius.circular(8),
+                    boxShadow: [
+                      BoxShadow(
+                        color: Colors.black.withValues(alpha: 0.08),
+                        blurRadius: 4,
+                        offset: const Offset(0, 1),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+              Row(
+                children: filters.map((filter) {
+                  final isSelected = filter == selected;
+                  final label = switch (filter) {
+                    CallFilter.all =>
+                      context.translate(I18n.locationListAll),
+                    CallFilter.incoming =>
+                      context.translate(I18n.callIncoming),
+                    CallFilter.outgoing =>
+                      context.translate(I18n.callOutgoing),
+                    CallFilter.missed =>
+                      context.translate(I18n.callMissed),
+                  };
+
+                  return Expanded(
+                    child: GestureDetector(
+                      onTap: () => onChanged(filter),
+                      behavior: HitTestBehavior.opaque,
+                      child: Center(
+                        child: Text(
+                          label,
+                          style: TextStyle(
+                            fontSize: 13,
+                            fontWeight: isSelected
+                                ? FontWeight.w600
+                                : FontWeight.w500,
+                            color: isSelected
+                                ? Colors.black87
+                                : Colors.grey.shade600,
+                          ),
+                        ),
+                      ),
+                    ),
+                  );
+                }).toList(),
+              ),
+            ],
+          );
+        },
+      ),
+    );
+  }
+}
+
+class _DateHeader extends StatelessWidget {
+  final int timestamp;
+
+  const _DateHeader({required this.timestamp});
+
+  @override
+  Widget build(BuildContext context) {
+    final date = DateTime.fromMillisecondsSinceEpoch(timestamp);
+    final now = DateTime.now();
+    final today = DateTime(now.year, now.month, now.day);
+    final dateDay = DateTime(date.year, date.month, date.day);
+    final diff = today.difference(dateDay).inDays;
+
+    String label;
+    if (diff == 0) {
+      label = context.translate(I18n.today);
+    } else if (diff == 1) {
+      label = context.translate(I18n.yesterday);
+    } else {
+      label =
+          '${date.day.toString().padLeft(2, '0')}/${date.month.toString().padLeft(2, '0')}/${date.year}';
+    }
+
+    return Padding(
+      padding: const EdgeInsets.only(top: 12, bottom: 6, left: 4),
+      child: Text(
+        label,
+        style: TextStyle(
+          fontSize: 13,
+          fontWeight: FontWeight.w600,
+          color: Colors.grey.shade500,
+        ),
+      ),
+    );
+  }
+}
+
+class _CallTile extends StatelessWidget {
+  final CallHistoryEntity call;
+  final Color primaryColor;
+
+  const _CallTile({required this.call, required this.primaryColor});
+
+  @override
+  Widget build(BuildContext context) {
+    final date = DateTime.fromMillisecondsSinceEpoch(call.occurredAt);
+    final timeStr =
+        '${date.hour.toString().padLeft(2, '0')}:${date.minute.toString().padLeft(2, '0')}';
+
+    final displayName = call.name ?? call.phone;
+    final subtitle = call.name != null ? call.phone : null;
+
+    final durationMin = call.duration ~/ 60;
+    final durationSec = call.duration % 60;
+    final durationStr = durationMin > 0
+        ? '${durationMin}m ${durationSec}s'
+        : '${durationSec}s';
+
+    final isAccepted = call.isAccepted;
+    final isIncoming = call.isIncoming;
+
+    final IconData icon;
+    final Color iconColor;
+    if (!isAccepted) {
+      icon = isIncoming ? Icons.phone_missed : Icons.phone_disabled;
+      iconColor = Colors.red;
+    } else {
+      icon = isIncoming ? Icons.call_received : Icons.call_made;
+      iconColor = primaryColor;
+    }
+
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 2),
+      child: ListTile(
+        contentPadding: const EdgeInsets.symmetric(horizontal: 4),
+        leading: Container(
+          width: 44,
+          height: 44,
+          decoration: BoxDecoration(
+            color: iconColor.withValues(alpha: 0.08),
+            shape: BoxShape.circle,
+          ),
+          child: Icon(icon, color: iconColor, size: 22),
+        ),
+        title: Text(
+          displayName,
+          style: TextStyle(
+            fontSize: 15,
+            fontWeight: FontWeight.w500,
+            color: isAccepted ? Colors.black87 : Colors.red.shade700,
+          ),
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
+        ),
+        subtitle: Row(
+          children: [
+            Icon(
+              isIncoming ? Icons.south_west : Icons.north_east,
+              size: 12,
+              color: iconColor.withValues(alpha: 0.7),
+            ),
+            const SizedBox(width: 4),
+            if (subtitle != null) ...[
+              Text(subtitle,
+                  style:
+                      TextStyle(fontSize: 12, color: Colors.grey.shade600)),
+              const SizedBox(width: 8),
+            ],
+            if (isAccepted)
+              Text(durationStr,
+                  style:
+                      TextStyle(fontSize: 12, color: Colors.grey.shade500)),
+          ],
+        ),
+        trailing: Text(
+          timeStr,
+          style: TextStyle(fontSize: 13, color: Colors.grey.shade500),
+        ),
+      ),
+    );
+  }
+}

modules/legacy/modules/device_management/lib/src/features/call_history/presentation/state/call_history_view_model.dart

@@ -0,0 +1,71 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:legacy_shared/legacy_shared.dart';
+
+import '../../data/call_history_datasource.dart';
+import '../../data/call_history_datasource_provider.dart';
+import '../../data/call_history_entity.dart';
+import 'call_history_view_state.dart';
+
+final callHistoryViewModelProvider =
+    NotifierProvider.autoDispose<CallHistoryViewModel, CallHistoryViewState>(
+  CallHistoryViewModel.new,
+);
+
+class CallHistoryViewModel extends Notifier<CallHistoryViewState> {
+  late final CallHistoryDatasource _datasource;
+
+  @override
+  CallHistoryViewState build() {
+    _datasource = ref.read(callHistoryDatasourceProvider);
+    Future.microtask(() => _load());
+    return const CallHistoryViewState();
+  }
+
+  Future<void> _load() async {
+    final device = ref.read(selectedDeviceProvider);
+    if (device == null) {
+      state = state.copyWith(isLoading: false);
+      return;
+    }
+
+    try {
+      final calls = await _datasource.getCallHistory(
+        deviceIdentificator: device.identificator,
+      );
+      if (!ref.mounted) return;
+
+      state = state.copyWith(
+        calls: calls,
+        filteredCalls: calls,
+        isLoading: false,
+      );
+    } catch (e) {
+      if (!ref.mounted) return;
+      state = state.copyWith(
+        isLoading: false,
+        errorMessage: e.toString(),
+      );
+    }
+  }
+
+  void setFilter(CallFilter filter) {
+    state = state.copyWith(
+      filter: filter,
+      filteredCalls: _applyFilter(state.calls, filter),
+    );
+  }
+
+  List<CallHistoryEntity> _applyFilter(
+      List<CallHistoryEntity> calls, CallFilter filter) {
+    switch (filter) {
+      case CallFilter.all:
+        return calls;
+      case CallFilter.incoming:
+        return calls.where((c) => c.isIncoming).toList();
+      case CallFilter.outgoing:
+        return calls.where((c) => !c.isIncoming).toList();
+      case CallFilter.missed:
+        return calls.where((c) => !c.isAccepted).toList();
+    }
+  }
+}

modules/legacy/modules/device_management/lib/src/features/call_history/presentation/state/call_history_view_state.dart

@@ -0,0 +1,18 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+import '../../data/call_history_entity.dart';
+
+part 'call_history_view_state.freezed.dart';
+
+enum CallFilter { all, incoming, outgoing, missed }
+
+@freezed
+abstract class CallHistoryViewState with _$CallHistoryViewState {
+  const factory CallHistoryViewState({
+    @Default(true) bool isLoading,
+    @Default([]) List<CallHistoryEntity> calls,
+    @Default([]) List<CallHistoryEntity> filteredCalls,
+    @Default(CallFilter.all) CallFilter filter,
+    @Default('') String errorMessage,
+  }) = _CallHistoryViewState;
+}

modules/legacy/modules/device_management/lib/src/features/call_history/presentation/state/call_history_view_state.freezed.dart

@@ -0,0 +1,295 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'call_history_view_state.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+/// @nodoc
+mixin _$CallHistoryViewState {
+
+ bool get isLoading; List<CallHistoryEntity> get calls; List<CallHistoryEntity> get filteredCalls; CallFilter get filter; String get errorMessage;
+/// Create a copy of CallHistoryViewState
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$CallHistoryViewStateCopyWith<CallHistoryViewState> get copyWith => _$CallHistoryViewStateCopyWithImpl<CallHistoryViewState>(this as CallHistoryViewState, _$identity);
+
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is CallHistoryViewState&&(identical(other.isLoading, isLoading) || other.isLoading == isLoading)&&const DeepCollectionEquality().equals(other.calls, calls)&&const DeepCollectionEquality().equals(other.filteredCalls, filteredCalls)&&(identical(other.filter, filter) || other.filter == filter)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage));
+}
+
+
+@override
+int get hashCode => Object.hash(runtimeType,isLoading,const DeepCollectionEquality().hash(calls),const DeepCollectionEquality().hash(filteredCalls),filter,errorMessage);
+
+@override
+String toString() {
+  return 'CallHistoryViewState(isLoading: $isLoading, calls: $calls, filteredCalls: $filteredCalls, filter: $filter, errorMessage: $errorMessage)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $CallHistoryViewStateCopyWith<$Res>  {
+  factory $CallHistoryViewStateCopyWith(CallHistoryViewState value, $Res Function(CallHistoryViewState) _then) = _$CallHistoryViewStateCopyWithImpl;
+@useResult
+$Res call({
+ bool isLoading, List<CallHistoryEntity> calls, List<CallHistoryEntity> filteredCalls, CallFilter filter, String errorMessage
+});
+
+
+
+
+}
+/// @nodoc
+class _$CallHistoryViewStateCopyWithImpl<$Res>
+    implements $CallHistoryViewStateCopyWith<$Res> {
+  _$CallHistoryViewStateCopyWithImpl(this._self, this._then);
+
+  final CallHistoryViewState _self;
+  final $Res Function(CallHistoryViewState) _then;
+
+/// Create a copy of CallHistoryViewState
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? isLoading = null,Object? calls = null,Object? filteredCalls = null,Object? filter = null,Object? errorMessage = null,}) {
+  return _then(_self.copyWith(
+isLoading: null == isLoading ? _self.isLoading : isLoading // ignore: cast_nullable_to_non_nullable
+as bool,calls: null == calls ? _self.calls : calls // ignore: cast_nullable_to_non_nullable
+as List<CallHistoryEntity>,filteredCalls: null == filteredCalls ? _self.filteredCalls : filteredCalls // ignore: cast_nullable_to_non_nullable
+as List<CallHistoryEntity>,filter: null == filter ? _self.filter : filter // ignore: cast_nullable_to_non_nullable
+as CallFilter,errorMessage: null == errorMessage ? _self.errorMessage : errorMessage // ignore: cast_nullable_to_non_nullable
+as String,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [CallHistoryViewState].
+extension CallHistoryViewStatePatterns on CallHistoryViewState {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _CallHistoryViewState value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _CallHistoryViewState() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _CallHistoryViewState value)  $default,){
+final _that = this;
+switch (_that) {
+case _CallHistoryViewState():
+return $default(_that);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _CallHistoryViewState value)?  $default,){
+final _that = this;
+switch (_that) {
+case _CallHistoryViewState() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( bool isLoading,  List<CallHistoryEntity> calls,  List<CallHistoryEntity> filteredCalls,  CallFilter filter,  String errorMessage)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _CallHistoryViewState() when $default != null:
+return $default(_that.isLoading,_that.calls,_that.filteredCalls,_that.filter,_that.errorMessage);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( bool isLoading,  List<CallHistoryEntity> calls,  List<CallHistoryEntity> filteredCalls,  CallFilter filter,  String errorMessage)  $default,) {final _that = this;
+switch (_that) {
+case _CallHistoryViewState():
+return $default(_that.isLoading,_that.calls,_that.filteredCalls,_that.filter,_that.errorMessage);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( bool isLoading,  List<CallHistoryEntity> calls,  List<CallHistoryEntity> filteredCalls,  CallFilter filter,  String errorMessage)?  $default,) {final _that = this;
+switch (_that) {
+case _CallHistoryViewState() when $default != null:
+return $default(_that.isLoading,_that.calls,_that.filteredCalls,_that.filter,_that.errorMessage);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+
+
+class _CallHistoryViewState implements CallHistoryViewState {
+  const _CallHistoryViewState({this.isLoading = true, final  List<CallHistoryEntity> calls = const [], final  List<CallHistoryEntity> filteredCalls = const [], this.filter = CallFilter.all, this.errorMessage = ''}): _calls = calls,_filteredCalls = filteredCalls;
+  
+
+@override@JsonKey() final  bool isLoading;
+ final  List<CallHistoryEntity> _calls;
+@override@JsonKey() List<CallHistoryEntity> get calls {
+  if (_calls is EqualUnmodifiableListView) return _calls;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableListView(_calls);
+}
+
+ final  List<CallHistoryEntity> _filteredCalls;
+@override@JsonKey() List<CallHistoryEntity> get filteredCalls {
+  if (_filteredCalls is EqualUnmodifiableListView) return _filteredCalls;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableListView(_filteredCalls);
+}
+
+@override@JsonKey() final  CallFilter filter;
+@override@JsonKey() final  String errorMessage;
+
+/// Create a copy of CallHistoryViewState
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$CallHistoryViewStateCopyWith<_CallHistoryViewState> get copyWith => __$CallHistoryViewStateCopyWithImpl<_CallHistoryViewState>(this, _$identity);
+
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _CallHistoryViewState&&(identical(other.isLoading, isLoading) || other.isLoading == isLoading)&&const DeepCollectionEquality().equals(other._calls, _calls)&&const DeepCollectionEquality().equals(other._filteredCalls, _filteredCalls)&&(identical(other.filter, filter) || other.filter == filter)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage));
+}
+
+
+@override
+int get hashCode => Object.hash(runtimeType,isLoading,const DeepCollectionEquality().hash(_calls),const DeepCollectionEquality().hash(_filteredCalls),filter,errorMessage);
+
+@override
+String toString() {
+  return 'CallHistoryViewState(isLoading: $isLoading, calls: $calls, filteredCalls: $filteredCalls, filter: $filter, errorMessage: $errorMessage)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$CallHistoryViewStateCopyWith<$Res> implements $CallHistoryViewStateCopyWith<$Res> {
+  factory _$CallHistoryViewStateCopyWith(_CallHistoryViewState value, $Res Function(_CallHistoryViewState) _then) = __$CallHistoryViewStateCopyWithImpl;
+@override @useResult
+$Res call({
+ bool isLoading, List<CallHistoryEntity> calls, List<CallHistoryEntity> filteredCalls, CallFilter filter, String errorMessage
+});
+
+
+
+
+}
+/// @nodoc
+class __$CallHistoryViewStateCopyWithImpl<$Res>
+    implements _$CallHistoryViewStateCopyWith<$Res> {
+  __$CallHistoryViewStateCopyWithImpl(this._self, this._then);
+
+  final _CallHistoryViewState _self;
+  final $Res Function(_CallHistoryViewState) _then;
+
+/// Create a copy of CallHistoryViewState
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? isLoading = null,Object? calls = null,Object? filteredCalls = null,Object? filter = null,Object? errorMessage = null,}) {
+  return _then(_CallHistoryViewState(
+isLoading: null == isLoading ? _self.isLoading : isLoading // ignore: cast_nullable_to_non_nullable
+as bool,calls: null == calls ? _self._calls : calls // ignore: cast_nullable_to_non_nullable
+as List<CallHistoryEntity>,filteredCalls: null == filteredCalls ? _self._filteredCalls : filteredCalls // ignore: cast_nullable_to_non_nullable
+as List<CallHistoryEntity>,filter: null == filter ? _self.filter : filter // ignore: cast_nullable_to_non_nullable
+as CallFilter,errorMessage: null == errorMessage ? _self.errorMessage : errorMessage // ignore: cast_nullable_to_non_nullable
+as String,
+  ));
+}
+
+
+}
+
+// dart format on

modules/legacy/modules/device_management/lib/src/features/device_management/device_management_screen.dart

@@ -27,14 +27,14 @@ class DeviceManagementScreen extends ConsumerWidget {
           ),
           child: Column(
             children: [
-              // AppMenuButton(
-              //   color: theme.getColorFor(ThemeCode.legacyPrimary),
-              //   onPressed: () =>
-              //       navigationContract.pushTo(AppRoutes.remoteConnection),
-              //   icon: SFIcons.connection,
-              //   text: context.translate(I18n.remoteConnection),
-              // ),
-              // SizedBox(height: SizeUtils.getByScreen(small: 16, big: 15)),
+              AppMenuButton(
+                color: theme.getColorFor(ThemeCode.legacyPrimary),
+                onPressed: () =>
+                    navigationContract.pushTo(AppRoutes.remoteConnection),
+                icon: SFIcons.connection,
+                text: context.translate(I18n.remoteConnection),
+              ),
+              SizedBox(height: SizeUtils.getByScreen(small: 16, big: 15)),
               AppMenuButton(
                 color: theme.getColorFor(ThemeCode.legacyPrimary),
                 onPressed: () =>
@@ -68,6 +68,15 @@ class DeviceManagementScreen extends ConsumerWidget {
               //   text: context.translate(I18n.videoCall),
               // ),
               SizedBox(height: SizeUtils.getByScreen(small: 16, big: 15)),
+              AppMenuButton(
+                color: theme.getColorFor(ThemeCode.legacyPrimary),
+                onPressed: () =>
+                    navigationContract.pushTo(AppRoutes.volumeControl),
+                icon: Icons.volume_up_outlined,
+                iconSize: SizeUtils.getByScreen(small: 42, big: 40),
+                text: context.translate(I18n.volumeControl),
+              ),
+              SizedBox(height: SizeUtils.getByScreen(small: 16, big: 15)),
               AppMenuButton(
                 color: theme.getColorFor(ThemeCode.legacyPrimary),
                 onPressed: () => navigationContract.pushTo(AppRoutes.health),
@@ -104,6 +113,15 @@ class DeviceManagementScreen extends ConsumerWidget {
                 text: context.translate(I18n.callWatch),
               ),
               SizedBox(height: SizeUtils.getByScreen(small: 16, big: 15)),
+              AppMenuButton(
+                color: theme.getColorFor(ThemeCode.legacyPrimary),
+                onPressed: () =>
+                    navigationContract.pushTo(AppRoutes.callHistory),
+                icon: Icons.history_outlined,
+                iconSize: SizeUtils.getByScreen(small: 42, big: 40),
+                text: context.translate(I18n.callHistory),
+              ),
+              SizedBox(height: SizeUtils.getByScreen(small: 16, big: 15)),
               AppMenuButton(
                 color: theme.getColorFor(ThemeCode.legacyPrimary),
                 onPressed: () => navigationContract.pushTo(AppRoutes.appsUse),

modules/legacy/modules/device_management/lib/src/features/health/presentation/health_screen.dart

@@ -56,14 +56,14 @@ class _HealthScreenState extends ConsumerState<HealthScreen>
     final state = ref.watch(healthViewModelProvider);
     final vm = ref.read(healthViewModelProvider.notifier);
 
-    ref.listen(
-      healthViewModelProvider.select((s) => s.errorMessage),
-      (previous, next) {
-        if (next.isNotEmpty) {
-          showTopSnackbar(context, message: next, type: MessageType.error);
-        }
-      },
-    );
+    ref.listen(healthViewModelProvider.select((s) => s.errorMessage), (
+      previous,
+      next,
+    ) {
+      if (next.isNotEmpty) {
+        showTopSnackbar(context, message: next, type: MessageType.error);
+      }
+    });
 
     return LegacyPageLayout(
       theme: theme,
@@ -130,6 +130,29 @@ class _HealthScreenState extends ConsumerState<HealthScreen>
                 ),
               ],
             ),
+      footer: _SaveSection(),
+    );
+  }
+}
+
+class _SaveSection extends ConsumerWidget {
+  const _SaveSection();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final theme = ref.read(themePortProvider);
+
+    final vm = ref.read(healthViewModelProvider.notifier);
+
+    return Padding(
+      padding: EdgeInsets.symmetric(horizontal: 24, vertical: 10),
+      child: PrimaryButton(
+        onPressed: () async {
+          await vm.measure();
+        },
+        text: context.translate(I18n.measure),
+        color: theme.getColorFor(ThemeCode.legacyPrimary),
+      ),
     );
   }
 }

modules/legacy/modules/device_management/lib/src/features/health/presentation/state/health_view_model.dart

@@ -14,12 +14,14 @@ final healthViewModelProvider =
 
 class HealthViewModel extends Notifier<HealthViewState> {
   late final HealthRepository _repository;
+  late final CommandsRepository _commandsRepository;
 
   static const int _historyPageSize = 20;
 
   @override
   HealthViewState build() {
     _repository = ref.read(healthRepositoryProvider);
+    _commandsRepository = ref.read(commandsRepositoryProvider);
     _init();
     return const HealthViewState();
   }
@@ -149,6 +151,8 @@ class HealthViewModel extends Notifier<HealthViewState> {
           identificator: identificator,
           queryParameters: HealthQueryBuilder.build(
             orderDirection: OrderDirection.asc,
+            page: 1,
+            pageSize: 1000,
             filters: filters,
           ),
         ),
@@ -156,6 +160,8 @@ class HealthViewModel extends Notifier<HealthViewState> {
           identificator: identificator,
           queryParameters: HealthQueryBuilder.build(
             orderDirection: OrderDirection.asc,
+            page: 1,
+            pageSize: 1000,
             filters: filters,
           ),
         ),
@@ -243,4 +249,29 @@ class HealthViewModel extends Notifier<HealthViewState> {
     final msg = e.toString();
     return msg.startsWith('Exception: ') ? msg.substring(11) : msg;
   }
+
+  Future<void> measure() async {
+    final device = ref.read(selectedDeviceProvider);
+    if (device == null) return;
+
+    try {
+      state = state.copyWith(isLoading: true);
+
+      final request = SendCommandRequestModel(
+        device: device.identificator,
+        command: DeviceCommand.requestHeartRate,
+      );
+
+      await _commandsRepository.send(request: request);
+      if (!ref.mounted) return;
+
+      state = state.copyWith(isLoading: false);
+    } catch (e) {
+      if (!ref.mounted) return;
+      state = state.copyWith(
+        isLoading: false,
+        errorMessage: _formatError(e),
+      );
+    }
+  }
 }

modules/legacy/modules/device_management/lib/src/features/remote_connection/domain/entities/picture_entity.dart

@@ -6,9 +6,12 @@ part 'picture_entity.freezed.dart';
 abstract class PictureEntity with _$PictureEntity {
   const factory PictureEntity({
     required String id,
-    required String? deviceId,
-    required DateTime createdAt,
-    required DateTime takenAt,
-    required String asset,
+    required String deviceIdentificator,
+    String? imgType,
+    String? timestamp,
+    required String fileId,
+    String? fileName,
+    String? contentType,
+    required int createdAt,
   }) = _PictureEntity;
 }

modules/legacy/modules/device_management/lib/src/features/remote_connection/domain/entities/picture_entity.freezed.dart

@@ -14,7 +14,7 @@ T _$identity<T>(T value) => value;
 /// @nodoc
 mixin _$PictureEntity {
 
- String get id; String? get deviceId; DateTime get createdAt; DateTime get takenAt; String get asset;
+ String get id; String get deviceIdentificator; String? get imgType; String? get timestamp; String get fileId; String? get fileName; String? get contentType; int get createdAt;
 /// Create a copy of PictureEntity
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -25,16 +25,16 @@ $PictureEntityCopyWith<PictureEntity> get copyWith => _$PictureEntityCopyWithImp
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is PictureEntity&&(identical(other.id, id) || other.id == id)&&(identical(other.deviceId, deviceId) || other.deviceId == deviceId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.takenAt, takenAt) || other.takenAt == takenAt)&&(identical(other.asset, asset) || other.asset == asset));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is PictureEntity&&(identical(other.id, id) || other.id == id)&&(identical(other.deviceIdentificator, deviceIdentificator) || other.deviceIdentificator == deviceIdentificator)&&(identical(other.imgType, imgType) || other.imgType == imgType)&&(identical(other.timestamp, timestamp) || other.timestamp == timestamp)&&(identical(other.fileId, fileId) || other.fileId == fileId)&&(identical(other.fileName, fileName) || other.fileName == fileName)&&(identical(other.contentType, contentType) || other.contentType == contentType)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt));
 }
 
 
 @override
-int get hashCode => Object.hash(runtimeType,id,deviceId,createdAt,takenAt,asset);
+int get hashCode => Object.hash(runtimeType,id,deviceIdentificator,imgType,timestamp,fileId,fileName,contentType,createdAt);
 
 @override
 String toString() {
-  return 'PictureEntity(id: $id, deviceId: $deviceId, createdAt: $createdAt, takenAt: $takenAt, asset: $asset)';
+  return 'PictureEntity(id: $id, deviceIdentificator: $deviceIdentificator, imgType: $imgType, timestamp: $timestamp, fileId: $fileId, fileName: $fileName, contentType: $contentType, createdAt: $createdAt)';
 }
 
 
@@ -45,7 +45,7 @@ abstract mixin class $PictureEntityCopyWith<$Res>  {
   factory $PictureEntityCopyWith(PictureEntity value, $Res Function(PictureEntity) _then) = _$PictureEntityCopyWithImpl;
 @useResult
 $Res call({
- String id, String? deviceId, DateTime createdAt, DateTime takenAt, String asset
+ String id, String deviceIdentificator, String? imgType, String? timestamp, String fileId, String? fileName, String? contentType, int createdAt
 });
 
 
@@ -62,14 +62,17 @@ class _$PictureEntityCopyWithImpl<$Res>
 
 /// Create a copy of PictureEntity
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? deviceId = freezed,Object? createdAt = null,Object? takenAt = null,Object? asset = null,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? deviceIdentificator = null,Object? imgType = freezed,Object? timestamp = freezed,Object? fileId = null,Object? fileName = freezed,Object? contentType = freezed,Object? createdAt = null,}) {
   return _then(_self.copyWith(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
-as String,deviceId: freezed == deviceId ? _self.deviceId : deviceId // ignore: cast_nullable_to_non_nullable
+as String,deviceIdentificator: null == deviceIdentificator ? _self.deviceIdentificator : deviceIdentificator // ignore: cast_nullable_to_non_nullable
+as String,imgType: freezed == imgType ? _self.imgType : imgType // ignore: cast_nullable_to_non_nullable
+as String?,timestamp: freezed == timestamp ? _self.timestamp : timestamp // ignore: cast_nullable_to_non_nullable
+as String?,fileId: null == fileId ? _self.fileId : fileId // ignore: cast_nullable_to_non_nullable
+as String,fileName: freezed == fileName ? _self.fileName : fileName // ignore: cast_nullable_to_non_nullable
+as String?,contentType: freezed == contentType ? _self.contentType : contentType // ignore: cast_nullable_to_non_nullable
 as String?,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
-as DateTime,takenAt: null == takenAt ? _self.takenAt : takenAt // ignore: cast_nullable_to_non_nullable
-as DateTime,asset: null == asset ? _self.asset : asset // ignore: cast_nullable_to_non_nullable
-as String,
+as int,
   ));
 }
 
@@ -154,10 +157,10 @@ return $default(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String? deviceId,  DateTime createdAt,  DateTime takenAt,  String asset)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String deviceIdentificator,  String? imgType,  String? timestamp,  String fileId,  String? fileName,  String? contentType,  int createdAt)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _PictureEntity() when $default != null:
-return $default(_that.id,_that.deviceId,_that.createdAt,_that.takenAt,_that.asset);case _:
+return $default(_that.id,_that.deviceIdentificator,_that.imgType,_that.timestamp,_that.fileId,_that.fileName,_that.contentType,_that.createdAt);case _:
   return orElse();
 
 }
@@ -175,10 +178,10 @@ return $default(_that.id,_that.deviceId,_that.createdAt,_that.takenAt,_that.asse
 /// }
 /// ```
 
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String? deviceId,  DateTime createdAt,  DateTime takenAt,  String asset)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String deviceIdentificator,  String? imgType,  String? timestamp,  String fileId,  String? fileName,  String? contentType,  int createdAt)  $default,) {final _that = this;
 switch (_that) {
 case _PictureEntity():
-return $default(_that.id,_that.deviceId,_that.createdAt,_that.takenAt,_that.asset);case _:
+return $default(_that.id,_that.deviceIdentificator,_that.imgType,_that.timestamp,_that.fileId,_that.fileName,_that.contentType,_that.createdAt);case _:
   throw StateError('Unexpected subclass');
 
 }
@@ -195,10 +198,10 @@ return $default(_that.id,_that.deviceId,_that.createdAt,_that.takenAt,_that.asse
 /// }
 /// ```
 
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String? deviceId,  DateTime createdAt,  DateTime takenAt,  String asset)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String deviceIdentificator,  String? imgType,  String? timestamp,  String fileId,  String? fileName,  String? contentType,  int createdAt)?  $default,) {final _that = this;
 switch (_that) {
 case _PictureEntity() when $default != null:
-return $default(_that.id,_that.deviceId,_that.createdAt,_that.takenAt,_that.asset);case _:
+return $default(_that.id,_that.deviceIdentificator,_that.imgType,_that.timestamp,_that.fileId,_that.fileName,_that.contentType,_that.createdAt);case _:
   return null;
 
 }
@@ -210,14 +213,17 @@ return $default(_that.id,_that.deviceId,_that.createdAt,_that.takenAt,_that.asse
 
 
 class _PictureEntity implements PictureEntity {
-  const _PictureEntity({required this.id, required this.deviceId, required this.createdAt, required this.takenAt, required this.asset});
+  const _PictureEntity({required this.id, required this.deviceIdentificator, this.imgType, this.timestamp, required this.fileId, this.fileName, this.contentType, required this.createdAt});
   
 
 @override final  String id;
-@override final  String? deviceId;
-@override final  DateTime createdAt;
-@override final  DateTime takenAt;
-@override final  String asset;
+@override final  String deviceIdentificator;
+@override final  String? imgType;
+@override final  String? timestamp;
+@override final  String fileId;
+@override final  String? fileName;
+@override final  String? contentType;
+@override final  int createdAt;
 
 /// Create a copy of PictureEntity
 /// with the given fields replaced by the non-null parameter values.
@@ -229,16 +235,16 @@ _$PictureEntityCopyWith<_PictureEntity> get copyWith => __$PictureEntityCopyWith
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _PictureEntity&&(identical(other.id, id) || other.id == id)&&(identical(other.deviceId, deviceId) || other.deviceId == deviceId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.takenAt, takenAt) || other.takenAt == takenAt)&&(identical(other.asset, asset) || other.asset == asset));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _PictureEntity&&(identical(other.id, id) || other.id == id)&&(identical(other.deviceIdentificator, deviceIdentificator) || other.deviceIdentificator == deviceIdentificator)&&(identical(other.imgType, imgType) || other.imgType == imgType)&&(identical(other.timestamp, timestamp) || other.timestamp == timestamp)&&(identical(other.fileId, fileId) || other.fileId == fileId)&&(identical(other.fileName, fileName) || other.fileName == fileName)&&(identical(other.contentType, contentType) || other.contentType == contentType)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt));
 }
 
 
 @override
-int get hashCode => Object.hash(runtimeType,id,deviceId,createdAt,takenAt,asset);
+int get hashCode => Object.hash(runtimeType,id,deviceIdentificator,imgType,timestamp,fileId,fileName,contentType,createdAt);
 
 @override
 String toString() {
-  return 'PictureEntity(id: $id, deviceId: $deviceId, createdAt: $createdAt, takenAt: $takenAt, asset: $asset)';
+  return 'PictureEntity(id: $id, deviceIdentificator: $deviceIdentificator, imgType: $imgType, timestamp: $timestamp, fileId: $fileId, fileName: $fileName, contentType: $contentType, createdAt: $createdAt)';
 }
 
 
@@ -249,7 +255,7 @@ abstract mixin class _$PictureEntityCopyWith<$Res> implements $PictureEntityCopy
   factory _$PictureEntityCopyWith(_PictureEntity value, $Res Function(_PictureEntity) _then) = __$PictureEntityCopyWithImpl;
 @override @useResult
 $Res call({
- String id, String? deviceId, DateTime createdAt, DateTime takenAt, String asset
+ String id, String deviceIdentificator, String? imgType, String? timestamp, String fileId, String? fileName, String? contentType, int createdAt
 });
 
 
@@ -266,14 +272,17 @@ class __$PictureEntityCopyWithImpl<$Res>
 
 /// Create a copy of PictureEntity
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? deviceId = freezed,Object? createdAt = null,Object? takenAt = null,Object? asset = null,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? deviceIdentificator = null,Object? imgType = freezed,Object? timestamp = freezed,Object? fileId = null,Object? fileName = freezed,Object? contentType = freezed,Object? createdAt = null,}) {
   return _then(_PictureEntity(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
-as String,deviceId: freezed == deviceId ? _self.deviceId : deviceId // ignore: cast_nullable_to_non_nullable
+as String,deviceIdentificator: null == deviceIdentificator ? _self.deviceIdentificator : deviceIdentificator // ignore: cast_nullable_to_non_nullable
+as String,imgType: freezed == imgType ? _self.imgType : imgType // ignore: cast_nullable_to_non_nullable
+as String?,timestamp: freezed == timestamp ? _self.timestamp : timestamp // ignore: cast_nullable_to_non_nullable
+as String?,fileId: null == fileId ? _self.fileId : fileId // ignore: cast_nullable_to_non_nullable
+as String,fileName: freezed == fileName ? _self.fileName : fileName // ignore: cast_nullable_to_non_nullable
+as String?,contentType: freezed == contentType ? _self.contentType : contentType // ignore: cast_nullable_to_non_nullable
 as String?,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
-as DateTime,takenAt: null == takenAt ? _self.takenAt : takenAt // ignore: cast_nullable_to_non_nullable
-as DateTime,asset: null == asset ? _self.asset : asset // ignore: cast_nullable_to_non_nullable
-as String,
+as int,
   ));
 }
 

modules/legacy/modules/device_management/lib/src/features/remote_connection/domain/get_pictures_use_case.dart

@@ -1,5 +0,0 @@
-import 'package:device_management/src/features/remote_connection/domain/entities/picture_entity.dart';
-
-abstract class GetPicturesUseCase {
-  Future<List<PictureEntity>> getPictures({required String userId});
-}

modules/legacy/modules/device_management/lib/src/features/remote_connection/domain/get_pictures_use_case_impl.dart

@@ -1,44 +0,0 @@
-import 'package:device_management/src/core/domain/repositories/functions_repository.dart';
-import 'package:device_management/src/features/remote_connection/domain/entities/picture_entity.dart';
-import 'package:device_management/src/features/remote_connection/domain/get_pictures_use_case.dart';
-
-class GetPicturesUseCaseImpl implements GetPicturesUseCase {
-  GetPicturesUseCaseImpl(this._repository);
-
-  final FunctionsRepository _repository;
-
-  @override
-  Future<List<PictureEntity>> getPictures({required String userId}) async {
-    // return _repository.getPictures(userId: userId);
-    return [
-      PictureEntity(
-        id: '1',
-        deviceId: '1111',
-        createdAt: DateTime.now(),
-        asset: 'assets/shared/images/iso_sf.png',
-        takenAt: DateTime.now(),
-      ),
-      PictureEntity(
-        id: '2',
-        deviceId: '1111',
-        createdAt: DateTime.now(),
-        asset: 'assets/shared/images/iso_sf.png',
-        takenAt: DateTime.now(),
-      ),
-      PictureEntity(
-        id: '3',
-        deviceId: '1111',
-        createdAt: DateTime.now(),
-        asset: 'assets/shared/images/iso_sf.png',
-        takenAt: DateTime.now(),
-      ),
-      PictureEntity(
-        id: '4',
-        deviceId: '1111',
-        createdAt: DateTime.now(),
-        asset: 'assets/shared/images/iso_sf.png',
-        takenAt: DateTime.now(),
-      ),
-    ];
-  }
-}

modules/legacy/modules/device_management/lib/src/features/remote_connection/domain/take_picture_use_case.dart

@@ -1,5 +0,0 @@
-import 'package:device_management/src/features/remote_connection/domain/entities/picture_entity.dart';
-
-abstract class TakePictureUseCase {
-  Future<PictureEntity> takePicture({required String userId});
-}

modules/legacy/modules/device_management/lib/src/features/remote_connection/domain/take_picture_use_case_impl.dart

@@ -1,14 +0,0 @@
-import 'package:device_management/src/core/domain/repositories/functions_repository.dart';
-import 'package:device_management/src/features/remote_connection/domain/entities/picture_entity.dart';
-import 'package:device_management/src/features/remote_connection/domain/take_picture_use_case.dart';
-
-class TakePictureUseCaseImpl implements TakePictureUseCase {
-  TakePictureUseCaseImpl(this._repository);
-
-  final FunctionsRepository _repository;
-
-  @override
-  Future<PictureEntity> takePicture({required String userId}) {
-    return _repository.takePicture(userId: userId);
-  }
-}

modules/legacy/modules/device_management/lib/src/features/remote_connection/presentation/providers/get_pictures_use_case_provider.dart

@@ -1,9 +0,0 @@
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:device_management/src/core/providers/functions_repository_provider.dart';
-import 'package:device_management/src/features/remote_connection/domain/get_pictures_use_case.dart';
-import 'package:device_management/src/features/remote_connection/domain/get_pictures_use_case_impl.dart';
-
-final getPicturesUseCaseProvider = Provider.autoDispose<GetPicturesUseCase>((ref) {
-  final functionsRepository = ref.read(functionsRepositoryProvider);
-  return GetPicturesUseCaseImpl(functionsRepository);
-});

modules/legacy/modules/device_management/lib/src/features/remote_connection/presentation/providers/take_picture_use_case_provider.dart

@@ -1,9 +0,0 @@
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:device_management/src/core/providers/functions_repository_provider.dart';
-import 'package:device_management/src/features/remote_connection/domain/take_picture_use_case.dart';
-import 'package:device_management/src/features/remote_connection/domain/take_picture_use_case_impl.dart';
-
-final takePictureUseCaseProvider = Provider.autoDispose<TakePictureUseCase>((ref) {
-  final functionsRepository = ref.read(functionsRepositoryProvider);
-  return TakePictureUseCaseImpl(functionsRepository);
-});

modules/legacy/modules/device_management/lib/src/features/remote_connection/presentation/remote_camera_screen.dart

@@ -15,19 +15,32 @@ class RemoteCameraScreen extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+
+    ref.listen(
+      remoteConnectionViewModelProvider.select((s) => s.successMessage),
+          (_, successMessage) {
+        if (successMessage.isNotEmpty) {
+          showTopSnackbar(context, message: context.translate(successMessage), type: MessageType.success);
+          ref.read(remoteConnectionViewModelProvider.notifier).clearSuccess();
+        }
+      },
+    );
+
     final theme = ref.watch(themePortProvider);
 
     final isLoadingPictures = ref.watch(
-      remoteConnectionViewModelProvider.select((s)=>s.isLoadingPictures)
+        remoteConnectionViewModelProvider.select((s)=>s.isLoadingPictures)
+    );
+    final isTakingPicture = ref.watch(
+        remoteConnectionViewModelProvider.select((s)=>s.isTakingPicture)
     );
 
     return LegacyPageLayout(
       theme: theme,
       title: context.translate(I18n.remoteCamera),
-      body: Expanded(child: isLoadingPictures
+      body: isLoadingPictures || isTakingPicture
         ? const Center(child: CircularProgressIndicator())
-        : const _GallerySection()
-      ),
+        : const _GallerySection(),
       footer: _TakePictureSection(),
     );
   }
@@ -74,10 +87,11 @@ class _GallerySection extends ConsumerWidget {
                 color: theme.getColorFor(ThemeCode.textTertiary)
               ))
             ),
-            child: Column(
-              children: [
-                Image.asset(pictures[index].asset),
-              ],
+            child: Image.network(
+              pictures[index].fileId,
+              fit: BoxFit.cover,
+              errorBuilder: (_, __, ___) =>
+                  const Icon(Icons.broken_image, color: Colors.grey),
             )
           )
         )
@@ -103,24 +117,7 @@ class _TakePictureSection extends ConsumerWidget {
           big: EdgeInsets.symmetric(vertical: 10, horizontal: 25)
       ),
       child: PrimaryButton(
-        onPressed: () async {
-          showDialog(context: context, builder: (context)=>Dialog(
-            child: Container(
-              padding: SizeUtils.getByScreen(
-                small: EdgeInsets.symmetric(horizontal: 32, vertical: 30),
-                big: EdgeInsets.symmetric(horizontal: 30, vertical: 28)
-              ),
-              width: SizeUtils.getByScreen(small: 360, big: 350),
-              height: SizeUtils.getByScreen(small: 195, big: 185),
-              child: Center(child: Text(context.translate(I18n.loadingPhoto),
-                textAlign: TextAlign.center,
-                style: TextStyle(fontSize: SizeUtils.getByScreen(small: 26, big: 25)),
-              )),
-            ),
-          ));
-          await vm.takePicture();
-          Navigator.pop(context);
-        },
+        onPressed: vm.takePicture,
         text: context.translate(I18n.takePicture),
         color: theme.getColorFor(ThemeCode.legacyPrimary),
         height: SizeUtils.getByScreen(small: 36, big: 35),

modules/legacy/modules/device_management/lib/src/features/remote_connection/presentation/state/remote_connection_view_model.dart

@@ -1,13 +1,12 @@
+import 'package:device_management/src/core/providers/pictures_repository_provider.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:device_management/src/features/remote_connection/domain/entities/picture_entity.dart';
-import 'package:device_management/src/features/remote_connection/domain/get_pictures_use_case.dart';
-import 'package:device_management/src/features/remote_connection/domain/take_picture_use_case.dart';
-import 'package:device_management/src/features/remote_connection/presentation/providers/get_pictures_use_case_provider.dart';
-import 'package:device_management/src/features/remote_connection/presentation/providers/take_picture_use_case_provider.dart';
 import 'package:device_management/src/features/remote_connection/presentation/state/remote_connection_view_state.dart';
 import 'package:legacy_shared/legacy_shared.dart';
-import 'package:sf_shared/sf_shared.dart';
+import 'package:sf_localizations/sf_localizations.dart';
+
+import '../../../../core/domain/repositories/pictures_repository.dart';
 
 final remoteConnectionViewModelProvider =
 NotifierProvider.autoDispose<RemoteConnectionViewModel, RemoteConnectionViewState>(
@@ -15,17 +14,17 @@ NotifierProvider.autoDispose<RemoteConnectionViewModel, RemoteConnectionViewStat
 );
 
 class RemoteConnectionViewModel extends Notifier<RemoteConnectionViewState> {
-  late final GetPicturesUseCase _getPicturesUseCase;
-  late final TakePictureUseCase _takePictureUseCase;
 
   late final TextEditingController phoneController;
+  late final CommandsRepository _commandsRepository;
+  late final PicturesRepository _picturesRepository;
 
   static final RegExp _phoneRegex = RegExp(r'^\+?\d{6,15}$');
 
   @override
   RemoteConnectionViewState build() {
-    _getPicturesUseCase = ref.read(getPicturesUseCaseProvider);
-    _takePictureUseCase = ref.read(takePictureUseCaseProvider);
+    _commandsRepository = ref.read(commandsRepositoryProvider);
+    _picturesRepository = ref.read(picturesRepositoryProvider);
 
     phoneController = TextEditingController();
     phoneController.addListener(_onPhoneChanged);
@@ -38,17 +37,23 @@ class RemoteConnectionViewModel extends Notifier<RemoteConnectionViewState> {
   }
 
   Future<void> load() async {
-    final user = await ref.read(userInfoProvider.future);
+    final device = ref.read(selectedDeviceProvider);
+    if (device == null) return;
 
-    final pictures = await _getPicturesUseCase.getPictures(userId: user.id);
-    setImages(pictures);
-  }
+    state = state.copyWith(deviceId: device.identificator);
 
-  void setImages(List<PictureEntity> pictures) {
-    state = state.copyWith(
-      pictures: pictures,
-      isLoadingPictures: false,
-    );
+    try {
+      final pictures = await _picturesRepository.getPictures(deviceId: device.identificator);
+      if (!ref.mounted) return;
+
+      state = state.copyWith(
+        pictures: pictures,
+        isLoadingPictures: false,
+      );
+    } catch (_) {
+      if (!ref.mounted) return;
+      state = state.copyWith(isLoadingPictures: false);
+    }
   }
 
   void _onPhoneChanged() {
@@ -58,6 +63,11 @@ class RemoteConnectionViewModel extends Notifier<RemoteConnectionViewState> {
     state = state.copyWith(phone: text, errorMessage: '');
   }
 
+  void updateDialCode(String value) {
+    if (value == state.dialCode) return;
+    state = state.copyWith(dialCode: value, errorMessage: '');
+  }
+
   void prevPicture() {
     int pictureIndex = state.pictureIndex - 1;
 
@@ -84,19 +94,39 @@ class RemoteConnectionViewModel extends Notifier<RemoteConnectionViewState> {
     );
   }
 
+  void clearSuccess() {
+    state = state.copyWith(
+      successMessage: '',
+    );
+  }
+
   Future<void> takePicture() async {
     try {
-      state = state.copyWith(isTakingPicture: true);
+      state = state.copyWith(
+        isTakingPicture: true,
+        successMessage: '',
+      );
+      
+      final request = SendCommandRequestModel(
+        device: state.deviceId,
+        command: DeviceCommand.requestPhoto,
+      );
 
-      await _takePictureUseCase.takePicture(userId: '')
-        .then((picture) {
-          List<PictureEntity> pictures = state.pictures;
-          pictures.add(picture);
-          state = state.copyWith(
-            isTakingPicture: true,
-          );
-        });
-    } catch (e){
+      await _commandsRepository.send(request: request);
+      if (!ref.mounted) return;
+
+      final pictures = await _picturesRepository.getPictures(
+        deviceId: state.deviceId,
+      );
+      if (!ref.mounted) return;
+
+      state = state.copyWith(
+        isTakingPicture: false,
+        pictures: pictures,
+        successMessage: I18n.photoTaken,
+      );
+    } catch (e) {
+      if (!ref.mounted) return;
       state = state.copyWith(
         isTakingPicture: false,
         errorMessage: e.toString(),
@@ -106,14 +136,36 @@ class RemoteConnectionViewModel extends Notifier<RemoteConnectionViewState> {
 
   Future<void> call() async {
     final phone = phoneController.text;
+    final dialCode = state.dialCode;
     if (phone.isEmpty){
-      state = state.copyWith(errorMessage: 'errorMessagePhoneIsEmpty');
+      state = state.copyWith(errorMessage: I18n.errorMessagePhoneIsInvalid);
       return;
     }
     if (!_phoneRegex.hasMatch(phone)) {
-      state = state.copyWith(errorMessage: 'errorMessagePhoneIsInvalid');
+      state = state.copyWith(errorMessage: I18n.errorMessagePhoneIsInvalid);
       return;
     }
+
+    try {
+      state = state.copyWith(isCalling: true);
+
+      final fullPhone = dialCode + phone;
+      final request = SendCommandRequestModel(
+        device: state.deviceId,
+        command: DeviceCommand.callCenter,
+        data: {'phone_number': fullPhone},
+      );
+      await _commandsRepository.send(request: request);
+
+      if (!ref.mounted) return;
+      state = state.copyWith(isCalling: false);
+    } catch (e) {
+      if (!ref.mounted) return;
+      state = state.copyWith(
+        isCalling: false,
+        errorMessage: e.toString(),
+      );
+    }
   }
 
   void disposeControllers() {