remote photo command

remote call command
Merge branch 'feature/linked-devices' into fusion-app
2026-03-20 15:14:40 +01:00 · 2026-03-18 17:09:03 +01:00 · 2026-03-18 15:09:35 +01:00 · 2026-03-18 15:09:13 +01:00 · 2026-03-18 14:56:51 +01:00 · 2026-03-18 13:52:07 +01:00
106 changed files with 2726 additions and 1057 deletions
--- a/.dart_tool/package_config.json
+++ b/.dart_tool/package_config.json
@@ -3,349 +3,349 @@
  "packages": [
    {
      "name": "ansi_styles",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/ansi_styles-0.3.2+1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/ansi_styles-0.3.2+1",
      "packageUri": "lib/",
      "languageVersion": "2.12"
    },
    {
      "name": "args",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/args-2.7.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/args-2.7.0",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "async",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/async-2.13.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.13.0",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "characters",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/characters-1.4.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.4.0",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "charcode",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/charcode-1.4.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/charcode-1.4.0",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "checked_yaml",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/checked_yaml-2.0.4",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/checked_yaml-2.0.4",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "cli_launcher",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/cli_launcher-0.3.2+1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/cli_launcher-0.3.2+1",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "cli_util",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/cli_util-0.4.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/cli_util-0.4.2",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "collection",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/collection-1.19.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.19.1",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "conventional_commit",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/conventional_commit-0.6.1+1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/conventional_commit-0.6.1+1",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "ffi",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/ffi-2.1.4",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/ffi-2.1.4",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "file",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/file-7.0.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/file-7.0.1",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "flutter",
-      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/packages/flutter",
+      "rootUri": "file:///C:/Program%20Files/Flutter/packages/flutter",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "flutter_secure_storage",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/flutter_secure_storage-9.2.4",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_secure_storage-9.2.4",
      "packageUri": "lib/",
      "languageVersion": "2.12"
    },
    {
      "name": "flutter_secure_storage_linux",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/flutter_secure_storage_linux-1.2.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_secure_storage_linux-1.2.3",
      "packageUri": "lib/",
      "languageVersion": "2.12"
    },
    {
      "name": "flutter_secure_storage_macos",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/flutter_secure_storage_macos-3.1.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/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:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/flutter_secure_storage_platform_interface-1.1.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/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:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/flutter_secure_storage_web-1.2.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_secure_storage_web-1.2.1",
      "packageUri": "lib/",
      "languageVersion": "2.12"
    },
    {
      "name": "flutter_secure_storage_windows",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/flutter_secure_storage_windows-3.1.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_secure_storage_windows-3.1.2",
      "packageUri": "lib/",
      "languageVersion": "2.12"
    },
    {
      "name": "flutter_web_plugins",
-      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/packages/flutter_web_plugins",
+      "rootUri": "file:///C:/Program%20Files/Flutter/packages/flutter_web_plugins",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "glob",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/glob-2.1.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/glob-2.1.3",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "graphs",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/graphs-2.3.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/graphs-2.3.2",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "http",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/http-1.5.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/http-1.5.0",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "http_parser",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/http_parser-4.1.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/http_parser-4.1.2",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "io",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/io-1.0.5",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/io-1.0.5",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "js",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/js-0.6.7",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/js-0.6.7",
      "packageUri": "lib/",
      "languageVersion": "2.19"
    },
    {
      "name": "json_annotation",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/json_annotation-4.9.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/json_annotation-4.9.0",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "material_color_utilities",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/material_color_utilities-0.11.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.11.1",
      "packageUri": "lib/",
      "languageVersion": "2.17"
    },
    {
      "name": "melos",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/melos-6.3.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/melos-6.3.3",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "meta",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/meta-1.16.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.16.0",
      "packageUri": "lib/",
      "languageVersion": "2.12"
    },
    {
      "name": "mustache_template",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/mustache_template-2.0.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/mustache_template-2.0.2",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "path",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path-1.9.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.9.1",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "path_provider",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider-2.1.5",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider-2.1.5",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "path_provider_android",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_android-2.2.20",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_android-2.2.20",
      "packageUri": "lib/",
      "languageVersion": "3.9"
    },
    {
      "name": "path_provider_foundation",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_foundation-2.4.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_foundation-2.4.3",
      "packageUri": "lib/",
      "languageVersion": "3.9"
    },
    {
      "name": "path_provider_linux",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_linux-2.2.1",
      "packageUri": "lib/",
      "languageVersion": "2.19"
    },
    {
      "name": "path_provider_platform_interface",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_platform_interface-2.1.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_platform_interface-2.1.2",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "path_provider_windows",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_windows-2.3.0",
      "packageUri": "lib/",
      "languageVersion": "3.2"
    },
    {
      "name": "platform",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/platform-3.1.6",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/platform-3.1.6",
      "packageUri": "lib/",
      "languageVersion": "3.2"
    },
    {
      "name": "plugin_platform_interface",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/plugin_platform_interface-2.1.8",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/plugin_platform_interface-2.1.8",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "pool",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/pool-1.5.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/pool-1.5.2",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "process",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/process-5.0.5",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/process-5.0.5",
      "packageUri": "lib/",
      "languageVersion": "3.5"
    },
    {
      "name": "prompts",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/prompts-2.0.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/prompts-2.0.0",
      "packageUri": "lib/",
      "languageVersion": "2.12"
    },
    {
      "name": "pub_semver",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/pub_semver-2.2.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/pub_semver-2.2.0",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "pub_updater",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/pub_updater-0.5.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/pub_updater-0.5.0",
      "packageUri": "lib/",
      "languageVersion": "3.5"
    },
    {
      "name": "pubspec_parse",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/pubspec_parse-1.5.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/pubspec_parse-1.5.0",
      "packageUri": "lib/",
      "languageVersion": "3.6"
    },
    {
      "name": "sky_engine",
-      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/bin/cache/pkg/sky_engine",
+      "rootUri": "file:///C:/Program%20Files/Flutter/bin/cache/pkg/sky_engine",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "source_span",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/source_span-1.10.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.1",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "stack_trace",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/stack_trace-1.12.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.12.1",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "string_scanner",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/string_scanner-1.4.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.4.1",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "term_glyph",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/term_glyph-1.2.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.2",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "typed_data",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/typed_data-1.4.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/typed_data-1.4.0",
      "packageUri": "lib/",
      "languageVersion": "3.5"
    },
    {
      "name": "vector_math",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/vector_math-2.2.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.2.0",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "web",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/web-1.1.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/web-1.1.1",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "win32",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/win32-5.15.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/win32-5.15.0",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "xdg_directories",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/xdg_directories-1.1.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/xdg_directories-1.1.0",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "yaml",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/yaml-3.1.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/yaml-3.1.3",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "yaml_edit",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/yaml_edit-2.2.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/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:///Users/juliandalcalaf/Development/flutter",
-  "flutterVersion": "3.35.7",
-  "pubCache": "file:///Users/juliandalcalaf/.pub-cache"
+  "flutterRoot": "file:///C:/Program%20Files/Flutter",
+  "flutterVersion": "3.35.6",
+  "pubCache": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache"
 }
--- a/.dart_tool/pub/bin/melos/melos.dart-3.9.2.snapshot
+++ b/.dart_tool/pub/bin/melos/melos.dart-3.9.2.snapshot
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -17,6 +17,7 @@
      <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" />
--- a/.idea/runConfigurations/melos_flutter_run_flutter_treezor_entrust_sdk_bridge_example.xml
+++ b/.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>
--- a/.idea/runConfigurations/melos_flutter_run_sf_app_platform.xml
+++ b/.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>
--- a/.idea/runConfigurations/melos_flutter_test_design_system.xml
+++ b/.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>
--- a/.idea/runConfigurations/melos_flutter_test_flutter_treezor_entrust_sdk_bridge.xml
+++ b/.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>
--- a/apps/mobile_app/config/development.json
+++ b/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"
+}
--- a/apps/mobile_app/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux
+++ b/apps/mobile_app/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux
@@ -1 +1 @@
-/Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/
+C:/Users/Aitor Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_linux-2.2.1/
--- a/apps/mobile_app/linux/flutter/ephemeral/.plugin_symlinks/shared_preferences_linux
+++ b/apps/mobile_app/linux/flutter/ephemeral/.plugin_symlinks/shared_preferences_linux
@@ -1 +1 @@
-/Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.4.1/
+C:/Users/Aitor Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shared_preferences_linux-2.4.1/
--- a/apps/mobile_app/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux
+++ b/apps/mobile_app/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux
@@ -1 +1 @@
-/Users/juliandalcalaf/.pub-cache/hosted/pub.dev/url_launcher_linux-3.2.2/
+C:/Users/Aitor Arana/AppData/Local/Pub/Cache/hosted/pub.dev/url_launcher_linux-3.2.2/
--- a/modules/activity/.dart_tool/package_config.json
+++ b/modules/activity/.dart_tool/package_config.json
@@ -3,163 +3,163 @@
  "packages": [
    {
      "name": "_fe_analyzer_shared",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/_fe_analyzer_shared-85.0.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/_fe_analyzer_shared-85.0.0",
      "packageUri": "lib/",
      "languageVersion": "3.5"
    },
    {
      "name": "analyzer",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/analyzer-7.7.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/analyzer-7.7.1",
      "packageUri": "lib/",
      "languageVersion": "3.5"
    },
    {
      "name": "archive",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/archive-4.0.9",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/archive-4.0.9",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "args",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/args-2.7.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/args-2.7.0",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "async",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/async-2.13.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.13.0",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "boolean_selector",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/boolean_selector-2.1.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.2",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "build",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/build-3.1.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/build-3.1.0",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "build_config",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/build_config-1.2.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/build_config-1.2.0",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "build_daemon",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/build_daemon-4.1.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/build_daemon-4.1.1",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "build_resolvers",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/build_resolvers-3.0.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/build_resolvers-3.0.3",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "build_runner",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/build_runner-2.7.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/build_runner-2.7.1",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "build_runner_core",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/build_runner_core-9.3.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/build_runner_core-9.3.1",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "built_collection",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/built_collection-5.1.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/built_collection-5.1.1",
      "packageUri": "lib/",
      "languageVersion": "2.12"
    },
    {
      "name": "built_value",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/built_value-8.12.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/built_value-8.12.3",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "characters",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/characters-1.4.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.4.0",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "checked_yaml",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/checked_yaml-2.0.4",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/checked_yaml-2.0.4",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "cli_config",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/cli_config-0.2.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/cli_config-0.2.0",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "clock",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/clock-1.1.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.2",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "code_builder",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/code_builder-4.11.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/code_builder-4.11.1",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "collection",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/collection-1.19.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.19.1",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "confetti",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/confetti-0.7.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/confetti-0.7.0",
      "packageUri": "lib/",
      "languageVersion": "2.17"
    },
    {
      "name": "convert",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/convert-3.1.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/convert-3.1.2",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "cookie_jar",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/cookie_jar-4.0.8",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/cookie_jar-4.0.8",
      "packageUri": "lib/",
      "languageVersion": "2.15"
    },
    {
      "name": "country_code_picker",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/country_code_picker-3.4.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/country_code_picker-3.4.1",
      "packageUri": "lib/",
      "languageVersion": "2.17"
    },
    {
      "name": "coverage",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/coverage-1.15.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/coverage-1.15.0",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "crypto",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/crypto-3.0.7",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/crypto-3.0.7",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "dart_style",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/dart_style-3.1.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/dart_style-3.1.1",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
@@ -171,91 +171,91 @@
    },
    {
      "name": "diacritic",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/diacritic-0.1.6",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/diacritic-0.1.6",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "dio",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/dio-5.9.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/dio-5.9.1",
      "packageUri": "lib/",
      "languageVersion": "2.18"
    },
    {
      "name": "dio_cookie_manager",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/dio_cookie_manager-3.3.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/dio_cookie_manager-3.3.0",
      "packageUri": "lib/",
      "languageVersion": "2.18"
    },
    {
      "name": "dio_web_adapter",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/dio_web_adapter-2.1.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/dio_web_adapter-2.1.1",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "equatable",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/equatable-2.0.8",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/equatable-2.0.8",
      "packageUri": "lib/",
      "languageVersion": "2.12"
    },
    {
      "name": "fake_async",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/fake_async-1.3.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.3",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "ffi",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/ffi-2.2.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/ffi-2.2.0",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "file",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/file-7.0.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/file-7.0.1",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "fixnum",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/fixnum-1.1.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/fixnum-1.1.1",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "fl_chart",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/fl_chart-1.1.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/fl_chart-1.1.1",
      "packageUri": "lib/",
      "languageVersion": "3.6"
    },
    {
      "name": "flutter",
-      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/packages/flutter",
+      "rootUri": "file:///C:/Program%20Files/Flutter/packages/flutter",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "flutter_lints",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/flutter_lints-5.0.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_lints-5.0.0",
      "packageUri": "lib/",
      "languageVersion": "3.5"
    },
    {
      "name": "flutter_riverpod",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/flutter_riverpod-3.2.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_riverpod-3.2.1",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "flutter_svg",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/flutter_svg-2.2.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_svg-2.2.3",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "flutter_test",
-      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/packages/flutter_test",
+      "rootUri": "file:///C:/Program%20Files/Flutter/packages/flutter_test",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
@@ -267,7 +267,7 @@
    },
    {
      "name": "flutter_web_plugins",
-      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/packages/flutter_web_plugins",
+      "rootUri": "file:///C:/Program%20Files/Flutter/packages/flutter_web_plugins",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
@@ -279,259 +279,259 @@
    },
    {
      "name": "freezed",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/freezed-3.2.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/freezed-3.2.3",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "freezed_annotation",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/freezed_annotation-3.1.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/freezed_annotation-3.1.0",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "frontend_server_client",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/frontend_server_client-4.0.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/frontend_server_client-4.0.0",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "get_it",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/get_it-9.2.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/get_it-9.2.0",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "glob",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/glob-2.1.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/glob-2.1.3",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "go_router",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/go_router-17.1.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/go_router-17.1.0",
      "packageUri": "lib/",
      "languageVersion": "3.9"
    },
    {
      "name": "graphs",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/graphs-2.3.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/graphs-2.3.2",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "http",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/http-1.6.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/http-1.6.0",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "http_multi_server",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/http_multi_server-3.2.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/http_multi_server-3.2.2",
      "packageUri": "lib/",
      "languageVersion": "3.2"
    },
    {
      "name": "http_parser",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/http_parser-4.1.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/http_parser-4.1.2",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "intl",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/intl-0.20.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/intl-0.20.2",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "io",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/io-1.0.5",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/io-1.0.5",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "js",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/js-0.7.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/js-0.7.2",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "json_annotation",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/json_annotation-4.9.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/json_annotation-4.9.0",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "json_serializable",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/json_serializable-6.11.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/json_serializable-6.11.2",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "leak_tracker",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/leak_tracker-11.0.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/leak_tracker-11.0.2",
      "packageUri": "lib/",
      "languageVersion": "3.2"
    },
    {
      "name": "leak_tracker_flutter_testing",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.10",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.10",
      "packageUri": "lib/",
      "languageVersion": "3.2"
    },
    {
      "name": "leak_tracker_testing",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/leak_tracker_testing-3.0.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/leak_tracker_testing-3.0.2",
      "packageUri": "lib/",
      "languageVersion": "3.2"
    },
    {
      "name": "lints",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/lints-5.1.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/lints-5.1.1",
      "packageUri": "lib/",
      "languageVersion": "3.6"
    },
    {
      "name": "logging",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/logging-1.3.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/logging-1.3.0",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "lottie",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/lottie-3.3.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/lottie-3.3.2",
      "packageUri": "lib/",
      "languageVersion": "3.9"
    },
    {
      "name": "matcher",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/matcher-0.12.17",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.17",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "material_color_utilities",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/material_color_utilities-0.11.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.11.1",
      "packageUri": "lib/",
      "languageVersion": "2.17"
    },
    {
      "name": "meta",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/meta-1.16.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.16.0",
      "packageUri": "lib/",
      "languageVersion": "2.12"
    },
    {
      "name": "mime",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/mime-2.0.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/mime-2.0.0",
      "packageUri": "lib/",
      "languageVersion": "3.2"
    },
    {
      "name": "node_preamble",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/node_preamble-2.0.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/node_preamble-2.0.2",
      "packageUri": "lib/",
      "languageVersion": "2.12"
    },
    {
      "name": "package_config",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/package_config-2.2.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/package_config-2.2.0",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "path",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path-1.9.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.9.1",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "path_parsing",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_parsing-1.1.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_parsing-1.1.0",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "path_provider",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider-2.1.5",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider-2.1.5",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "path_provider_android",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_android-2.2.22",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_android-2.2.22",
      "packageUri": "lib/",
      "languageVersion": "3.9"
    },
    {
      "name": "path_provider_foundation",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_foundation-2.5.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_foundation-2.5.1",
      "packageUri": "lib/",
      "languageVersion": "3.9"
    },
    {
      "name": "path_provider_linux",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_linux-2.2.1",
      "packageUri": "lib/",
      "languageVersion": "2.19"
    },
    {
      "name": "path_provider_platform_interface",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_platform_interface-2.1.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_platform_interface-2.1.2",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "path_provider_windows",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_windows-2.3.0",
      "packageUri": "lib/",
      "languageVersion": "3.2"
    },
    {
      "name": "petitparser",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/petitparser-7.0.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/petitparser-7.0.2",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "platform",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/platform-3.1.6",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/platform-3.1.6",
      "packageUri": "lib/",
      "languageVersion": "3.2"
    },
    {
      "name": "plugin_platform_interface",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/plugin_platform_interface-2.1.8",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/plugin_platform_interface-2.1.8",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "pool",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/pool-1.5.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/pool-1.5.2",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "posix",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/posix-6.5.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/posix-6.5.0",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "pub_semver",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/pub_semver-2.2.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/pub_semver-2.2.0",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "pubspec_parse",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/pubspec_parse-1.5.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/pubspec_parse-1.5.0",
      "packageUri": "lib/",
      "languageVersion": "3.6"
    },
    {
      "name": "riverpod",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/riverpod-3.2.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/riverpod-3.2.1",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
@@ -561,181 +561,181 @@
    },
    {
      "name": "shared_preferences",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences-2.5.4",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shared_preferences-2.5.4",
      "packageUri": "lib/",
      "languageVersion": "3.9"
    },
    {
      "name": "shared_preferences_android",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences_android-2.4.20",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shared_preferences_android-2.4.20",
      "packageUri": "lib/",
      "languageVersion": "3.9"
    },
    {
      "name": "shared_preferences_foundation",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.6",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shared_preferences_foundation-2.5.6",
      "packageUri": "lib/",
      "languageVersion": "3.9"
    },
    {
      "name": "shared_preferences_linux",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.4.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shared_preferences_linux-2.4.1",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "shared_preferences_platform_interface",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences_platform_interface-2.4.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shared_preferences_platform_interface-2.4.1",
      "packageUri": "lib/",
      "languageVersion": "3.2"
    },
    {
      "name": "shared_preferences_web",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences_web-2.4.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shared_preferences_web-2.4.3",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "shared_preferences_windows",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.4.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shared_preferences_windows-2.4.1",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "shelf",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shelf-1.4.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shelf-1.4.2",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "shelf_packages_handler",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shelf_packages_handler-3.0.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shelf_packages_handler-3.0.2",
      "packageUri": "lib/",
      "languageVersion": "2.17"
    },
    {
      "name": "shelf_static",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shelf_static-1.1.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shelf_static-1.1.3",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "shelf_web_socket",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shelf_web_socket-3.0.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shelf_web_socket-3.0.0",
      "packageUri": "lib/",
      "languageVersion": "3.5"
    },
    {
      "name": "sky_engine",
-      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/bin/cache/pkg/sky_engine",
+      "rootUri": "file:///C:/Program%20Files/Flutter/bin/cache/pkg/sky_engine",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "source_gen",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/source_gen-4.0.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/source_gen-4.0.0",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "source_helper",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/source_helper-1.3.8",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/source_helper-1.3.8",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "source_map_stack_trace",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/source_map_stack_trace-2.1.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/source_map_stack_trace-2.1.2",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "source_maps",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/source_maps-0.10.13",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/source_maps-0.10.13",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "source_span",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/source_span-1.10.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.2",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "stack_trace",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/stack_trace-1.12.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.12.1",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "state_notifier",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/state_notifier-1.0.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/state_notifier-1.0.0",
      "packageUri": "lib/",
      "languageVersion": "2.12"
    },
    {
      "name": "stream_channel",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/stream_channel-2.1.4",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.4",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "stream_transform",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/stream_transform-2.1.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/stream_transform-2.1.1",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "string_scanner",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/string_scanner-1.4.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.4.1",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "term_glyph",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/term_glyph-1.2.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.2",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "test",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/test-1.26.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/test-1.26.2",
      "packageUri": "lib/",
      "languageVersion": "3.5"
    },
    {
      "name": "test_api",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/test_api-0.7.6",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.7.6",
      "packageUri": "lib/",
      "languageVersion": "3.5"
    },
    {
      "name": "test_core",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/test_core-0.6.11",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/test_core-0.6.11",
      "packageUri": "lib/",
      "languageVersion": "3.5"
    },
    {
      "name": "timing",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/timing-1.0.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/timing-1.0.2",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "top_snackbar_flutter",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/top_snackbar_flutter-3.3.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/top_snackbar_flutter-3.3.0",
      "packageUri": "lib/",
      "languageVersion": "2.15"
    },
    {
      "name": "typed_data",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/typed_data-1.4.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/typed_data-1.4.0",
      "packageUri": "lib/",
      "languageVersion": "3.5"
    },
    {
      "name": "universal_io",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/universal_io-2.3.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/universal_io-2.3.1",
      "packageUri": "lib/",
      "languageVersion": "3.6"
    },
@@ -747,79 +747,79 @@
    },
    {
      "name": "vector_graphics",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/vector_graphics-1.1.19",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/vector_graphics-1.1.19",
      "packageUri": "lib/",
      "languageVersion": "3.6"
    },
    {
      "name": "vector_graphics_codec",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/vector_graphics_codec-1.1.13",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/vector_graphics_codec-1.1.13",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "vector_graphics_compiler",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/vector_graphics_compiler-1.1.20",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/vector_graphics_compiler-1.1.20",
      "packageUri": "lib/",
      "languageVersion": "3.9"
    },
    {
      "name": "vector_math",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/vector_math-2.2.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.2.0",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "vm_service",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/vm_service-15.0.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/vm_service-15.0.2",
      "packageUri": "lib/",
      "languageVersion": "3.5"
    },
    {
      "name": "watcher",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/watcher-1.2.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/watcher-1.2.1",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "web",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/web-1.1.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/web-1.1.1",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "web_socket",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/web_socket-1.0.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/web_socket-1.0.1",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "web_socket_channel",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/web_socket_channel-3.0.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/web_socket_channel-3.0.3",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "webkit_inspection_protocol",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/webkit_inspection_protocol-1.2.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/webkit_inspection_protocol-1.2.1",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "xdg_directories",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/xdg_directories-1.1.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/xdg_directories-1.1.0",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "xml",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/xml-6.6.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/xml-6.6.1",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "yaml",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/yaml-3.1.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/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:///Users/juliandalcalaf/Development/flutter",
-  "flutterVersion": "3.35.7",
-  "pubCache": "file:///Users/juliandalcalaf/.pub-cache"
+  "flutterRoot": "file:///C:/Program%20Files/Flutter",
+  "flutterVersion": "3.35.6",
+  "pubCache": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache"
 }
--- a/modules/activity/.dart_tool/version
+++ b/modules/activity/.dart_tool/version
@@ -1 +1 @@
-3.35.7
+3.35.6
--- a/modules/activity/.flutter-plugins-dependencies
+++ b/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":"/Users/juliandalcalaf/Desktop/apps/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/apps/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-13 09:49:15.619720","version":"3.35.7","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":"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}}
--- a/modules/legacy/modules/account/lib/src/core/data/datasource/devices_remote_datasource.dart
+++ b/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});
 }
--- a/modules/legacy/modules/account/lib/src/core/data/datasource/devices_remote_datasource_impl.dart
+++ b/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>(
--- a/modules/legacy/modules/account/lib/src/core/data/repositories/devices_repository_impl.dart
+++ b/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);
  }
 }
--- a/modules/legacy/modules/account/lib/src/core/domain/repositories/devices_repository.dart
+++ b/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
  });
 }
--- a/modules/legacy/modules/account/lib/src/features/change_password/presentation/change_password_screen.dart
+++ b/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();
+    }
  }
 }

--- a/modules/legacy/modules/account/lib/src/features/change_password/presentation/state/change_password_view_model.dart
+++ b/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();

--- a/modules/legacy/modules/account/lib/src/features/change_password/presentation/state/change_password_view_state.dart
+++ b/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
--- a/modules/legacy/modules/account/lib/src/features/linked_devices/presentation/linked_devices_screen.dart
+++ b/modules/legacy/modules/account/lib/src/features/linked_devices/presentation/linked_devices_screen.dart
@@ -27,16 +27,20 @@ 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]),
+      body: 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
        ),
-        separatorBuilder: (BuildContext context, int index)=>SizedBox(
-          height: SizeUtils.getByScreen(small: 18, big: 17)
-        ),
-        itemCount: state.linkedDevices.length
      ),
    );
  }
@@ -44,11 +48,13 @@ class LinkedDevicesScreen extends ConsumerWidget {

 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 +82,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 +116,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,
--- a/modules/legacy/modules/account/lib/src/features/linked_devices/presentation/state/linked_devices_view_model.dart
+++ b/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() {
--- a/modules/legacy/modules/account/lib/src/features/linked_devices/presentation/widgets/delete_device_dialog.dart
+++ b/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),
--- a/modules/legacy/modules/account/lib/src/features/personal_data/presentation/personal_data_screen.dart
+++ b/modules/legacy/modules/account/lib/src/features/personal_data/presentation/personal_data_screen.dart
@@ -77,7 +77,7 @@ class PersonalDataScreen extends ConsumerWidget {
        child: Column(
          children: [
            Text(context.translate(I18n.personalDataMessage)),
-            const SizedBox(height: 14),
+            const SizedBox(height: 4),
            const _SaveButton(),
          ],
        ),
@@ -169,12 +169,33 @@ class _PhoneField extends ConsumerWidget {
    final hint = ref.watch(
      personalDataViewModelProvider.select((s) => s.user?.phone ?? ''),
    );
+    final dialCode = ref.read(
+      personalDataViewModelProvider.select((s)=>s.dialCode)
+    );

-    return CustomTextField(
-      controller: vm.phoneController,
-      hint: hint,
-      label: context.translate(I18n.phoneLabel),
-      keyboardType: TextInputType.phone,
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.end,
+      children: [
+        CountryPrefixPicker(
+          headerText: context.translate(I18n.selectYourCountry),
+          initialSelection: dialCode,
+          onChanged: (country) {
+            vm.updateDialCode(
+              country.dialCode ?? dialCode,
+            );
+          },
+          width: 80,
+        ),
+        SizedBox(width: 8),
+        Expanded(
+          child: CustomTextField(
+            controller: vm.phoneController,
+            hint: hint,
+            label: context.translate(I18n.phoneLabel),
+            keyboardType: TextInputType.phone,
+          )
+        ),
+      ],
    );
  }
 }
--- a/modules/legacy/modules/account/lib/src/features/personal_data/presentation/state/personal_data_view_model.dart
+++ b/modules/legacy/modules/account/lib/src/features/personal_data/presentation/state/personal_data_view_model.dart
@@ -39,12 +39,26 @@ class PersonalDataViewModel extends Notifier<PersonalDataViewState> {
    state = state.copyWith(user: user, isLoading: false);
  }

+  void updateDialCode(String value) {
+    if (value == state.dialCode) return;
+
+    state = state.copyWith(
+      dialCode: value,
+      errorMessage: '',
+    );
+  }
+
  bool get _hasChanges =>
      firstNameController.text.trim().isNotEmpty ||
      lastNameController.text.trim().isNotEmpty ||
      phoneController.text.trim().isNotEmpty;

  UpdateUserRequestEntity _toRequest() {
+    final dialCode = state.dialCode;
+    final fullPhone = phoneController.text.trim().isNotEmpty
+        ? dialCode+phoneController.text.trim()
+        : null;
+
    return UpdateUserRequestEntity(
      firstName: firstNameController.text.trim().isNotEmpty
          ? firstNameController.text.trim()
@@ -52,9 +66,7 @@ class PersonalDataViewModel extends Notifier<PersonalDataViewState> {
      lastName: lastNameController.text.trim().isNotEmpty
          ? lastNameController.text.trim()
          : null,
-      phone: phoneController.text.trim().isNotEmpty
-          ? phoneController.text.trim()
-          : null,
+      phone: fullPhone,
    );
  }

--- a/modules/legacy/modules/account/lib/src/features/personal_data/presentation/state/personal_data_view_state.dart
+++ b/modules/legacy/modules/account/lib/src/features/personal_data/presentation/state/personal_data_view_state.dart
@@ -8,6 +8,7 @@ abstract class PersonalDataViewState with _$PersonalDataViewState {
  const factory PersonalDataViewState({
    @Default(true) bool isLoading,
    @Default(false) bool isComplete,
+    @Default('+34') String dialCode,
    UserEntity? user,
    @Default('') String errorMessage,
  }) = _PersonalDataViewState;
--- a/modules/legacy/modules/account/lib/src/features/personal_data/presentation/state/personal_data_view_state.freezed.dart
+++ b/modules/legacy/modules/account/lib/src/features/personal_data/presentation/state/personal_data_view_state.freezed.dart
@@ -14,7 +14,7 @@ T _$identity<T>(T value) => value;
 /// @nodoc
 mixin _$PersonalDataViewState {

- bool get isLoading; bool get isComplete; UserEntity? get user; String get errorMessage;
+ bool get isLoading; bool get isComplete; String get dialCode; UserEntity? get user; String get errorMessage;
 /// Create a copy of PersonalDataViewState
 /// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@@ -25,16 +25,16 @@ $PersonalDataViewStateCopyWith<PersonalDataViewState> get copyWith => _$Personal

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is PersonalDataViewState&&(identical(other.isLoading, isLoading) || other.isLoading == isLoading)&&(identical(other.isComplete, isComplete) || other.isComplete == isComplete)&&(identical(other.user, user) || other.user == user)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is PersonalDataViewState&&(identical(other.isLoading, isLoading) || other.isLoading == isLoading)&&(identical(other.isComplete, isComplete) || other.isComplete == isComplete)&&(identical(other.dialCode, dialCode) || other.dialCode == dialCode)&&(identical(other.user, user) || other.user == user)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage));
 }


@override
-int get hashCode => Object.hash(runtimeType,isLoading,isComplete,user,errorMessage);
+int get hashCode => Object.hash(runtimeType,isLoading,isComplete,dialCode,user,errorMessage);

@override
 String toString() {
-  return 'PersonalDataViewState(isLoading: $isLoading, isComplete: $isComplete, user: $user, errorMessage: $errorMessage)';
+  return 'PersonalDataViewState(isLoading: $isLoading, isComplete: $isComplete, dialCode: $dialCode, user: $user, errorMessage: $errorMessage)';
 }


@@ -45,7 +45,7 @@ abstract mixin class $PersonalDataViewStateCopyWith<$Res>  {
  factory $PersonalDataViewStateCopyWith(PersonalDataViewState value, $Res Function(PersonalDataViewState) _then) = _$PersonalDataViewStateCopyWithImpl;
@useResult
 $Res call({
- bool isLoading, bool isComplete, UserEntity? user, String errorMessage
+ bool isLoading, bool isComplete, String dialCode, UserEntity? user, String errorMessage
 });


@@ -62,11 +62,12 @@ class _$PersonalDataViewStateCopyWithImpl<$Res>

 /// Create a copy of PersonalDataViewState
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? isLoading = null,Object? isComplete = null,Object? user = freezed,Object? errorMessage = null,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? isLoading = null,Object? isComplete = null,Object? dialCode = null,Object? user = freezed,Object? errorMessage = null,}) {
  return _then(_self.copyWith(
 isLoading: null == isLoading ? _self.isLoading : isLoading // ignore: cast_nullable_to_non_nullable
 as bool,isComplete: null == isComplete ? _self.isComplete : isComplete // ignore: cast_nullable_to_non_nullable
-as bool,user: freezed == user ? _self.user : user // ignore: cast_nullable_to_non_nullable
+as bool,dialCode: null == dialCode ? _self.dialCode : dialCode // ignore: cast_nullable_to_non_nullable
+as String,user: freezed == user ? _self.user : user // ignore: cast_nullable_to_non_nullable
 as UserEntity?,errorMessage: null == errorMessage ? _self.errorMessage : errorMessage // ignore: cast_nullable_to_non_nullable
 as String,
  ));
@@ -165,10 +166,10 @@ return $default(_that);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( bool isLoading,  bool isComplete,  UserEntity? user,  String errorMessage)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( bool isLoading,  bool isComplete,  String dialCode,  UserEntity? user,  String errorMessage)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _PersonalDataViewState() when $default != null:
-return $default(_that.isLoading,_that.isComplete,_that.user,_that.errorMessage);case _:
+return $default(_that.isLoading,_that.isComplete,_that.dialCode,_that.user,_that.errorMessage);case _:
  return orElse();

 }
@@ -186,10 +187,10 @@ return $default(_that.isLoading,_that.isComplete,_that.user,_that.errorMessage);
 /// }
 /// ```

-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( bool isLoading,  bool isComplete,  UserEntity? user,  String errorMessage)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( bool isLoading,  bool isComplete,  String dialCode,  UserEntity? user,  String errorMessage)  $default,) {final _that = this;
 switch (_that) {
 case _PersonalDataViewState():
-return $default(_that.isLoading,_that.isComplete,_that.user,_that.errorMessage);case _:
+return $default(_that.isLoading,_that.isComplete,_that.dialCode,_that.user,_that.errorMessage);case _:
  throw StateError('Unexpected subclass');

 }
@@ -206,10 +207,10 @@ return $default(_that.isLoading,_that.isComplete,_that.user,_that.errorMessage);
 /// }
 /// ```

-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( bool isLoading,  bool isComplete,  UserEntity? user,  String errorMessage)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( bool isLoading,  bool isComplete,  String dialCode,  UserEntity? user,  String errorMessage)?  $default,) {final _that = this;
 switch (_that) {
 case _PersonalDataViewState() when $default != null:
-return $default(_that.isLoading,_that.isComplete,_that.user,_that.errorMessage);case _:
+return $default(_that.isLoading,_that.isComplete,_that.dialCode,_that.user,_that.errorMessage);case _:
  return null;

 }
@@ -221,11 +222,12 @@ return $default(_that.isLoading,_that.isComplete,_that.user,_that.errorMessage);


 class _PersonalDataViewState implements PersonalDataViewState {
-  const _PersonalDataViewState({this.isLoading = true, this.isComplete = false, this.user, this.errorMessage = ''});
+  const _PersonalDataViewState({this.isLoading = true, this.isComplete = false, this.dialCode = '+34', this.user, this.errorMessage = ''});
  

@override@JsonKey() final  bool isLoading;
@override@JsonKey() final  bool isComplete;
+@override@JsonKey() final  String dialCode;
@override final  UserEntity? user;
@override@JsonKey() final  String errorMessage;

@@ -239,16 +241,16 @@ _$PersonalDataViewStateCopyWith<_PersonalDataViewState> get copyWith => __$Perso

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _PersonalDataViewState&&(identical(other.isLoading, isLoading) || other.isLoading == isLoading)&&(identical(other.isComplete, isComplete) || other.isComplete == isComplete)&&(identical(other.user, user) || other.user == user)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _PersonalDataViewState&&(identical(other.isLoading, isLoading) || other.isLoading == isLoading)&&(identical(other.isComplete, isComplete) || other.isComplete == isComplete)&&(identical(other.dialCode, dialCode) || other.dialCode == dialCode)&&(identical(other.user, user) || other.user == user)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage));
 }


@override
-int get hashCode => Object.hash(runtimeType,isLoading,isComplete,user,errorMessage);
+int get hashCode => Object.hash(runtimeType,isLoading,isComplete,dialCode,user,errorMessage);

@override
 String toString() {
-  return 'PersonalDataViewState(isLoading: $isLoading, isComplete: $isComplete, user: $user, errorMessage: $errorMessage)';
+  return 'PersonalDataViewState(isLoading: $isLoading, isComplete: $isComplete, dialCode: $dialCode, user: $user, errorMessage: $errorMessage)';
 }


@@ -259,7 +261,7 @@ abstract mixin class _$PersonalDataViewStateCopyWith<$Res> implements $PersonalD
  factory _$PersonalDataViewStateCopyWith(_PersonalDataViewState value, $Res Function(_PersonalDataViewState) _then) = __$PersonalDataViewStateCopyWithImpl;
@override @useResult
 $Res call({
- bool isLoading, bool isComplete, UserEntity? user, String errorMessage
+ bool isLoading, bool isComplete, String dialCode, UserEntity? user, String errorMessage
 });


@@ -276,11 +278,12 @@ class __$PersonalDataViewStateCopyWithImpl<$Res>

 /// Create a copy of PersonalDataViewState
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? isLoading = null,Object? isComplete = null,Object? user = freezed,Object? errorMessage = null,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? isLoading = null,Object? isComplete = null,Object? dialCode = null,Object? user = freezed,Object? errorMessage = null,}) {
  return _then(_PersonalDataViewState(
 isLoading: null == isLoading ? _self.isLoading : isLoading // ignore: cast_nullable_to_non_nullable
 as bool,isComplete: null == isComplete ? _self.isComplete : isComplete // ignore: cast_nullable_to_non_nullable
-as bool,user: freezed == user ? _self.user : user // ignore: cast_nullable_to_non_nullable
+as bool,dialCode: null == dialCode ? _self.dialCode : dialCode // ignore: cast_nullable_to_non_nullable
+as String,user: freezed == user ? _self.user : user // ignore: cast_nullable_to_non_nullable
 as UserEntity?,errorMessage: null == errorMessage ? _self.errorMessage : errorMessage // ignore: cast_nullable_to_non_nullable
 as String,
  ));
--- a/modules/legacy/modules/account/pubspec.lock
+++ b/modules/legacy/modules/account/pubspec.lock
@@ -96,7 +96,7 @@ packages:
    source: hosted
    version: "3.0.3"
  build_runner:
-    dependency: transitive
+    dependency: "direct main"
    description:
      name: build_runner
      sha256: b24597fceb695969d47025c958f3837f9f0122e237c6a22cb082a5ac66c3ca30
@@ -338,10 +338,10 @@ packages:
    dependency: transitive
    description:
      name: fl_chart
-      sha256: "7ca9a40f4eb85949190e54087be8b4d6ac09dc4c54238d782a34cf1f7c011de9"
+      sha256: b938f77d042cbcd822936a7a359a7235bad8bd72070de1f827efc2cc297ac888
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.1"
+    version: "1.2.0"
  flutter:
    dependency: "direct main"
    description: flutter
@@ -367,18 +367,18 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_riverpod
-      sha256: e2026c72738a925a60db30258ff1f29974e40716749f3c9850aabf34ffc1a14c
+      sha256: "4e166be88e1dbbaa34a280bdb744aeae73b7ef25fdf8db7a3bb776760a3648e2"
      url: "https://pub.dev"
    source: hosted
-    version: "3.2.1"
+    version: "3.3.1"
  flutter_svg:
    dependency: "direct main"
    description:
      name: flutter_svg
-      sha256: "87fbd7c534435b6c5d9d98b01e1fd527812b82e68ddd8bd35fc45ed0fa8f0a95"
+      sha256: "1ded017b39c8e15c8948ea855070a5ff8ff8b3d5e83f3446e02d6bb12add7ad9"
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.3"
+    version: "2.2.4"
  flutter_test:
    dependency: "direct dev"
    description: flutter
@@ -620,10 +620,10 @@ packages:
    dependency: transitive
    description:
      name: logger
-      sha256: a7967e31b703831a893bbc3c3dd11db08126fe5f369b5c648a36f821979f5be3
+      sha256: "25aee487596a6257655a1e091ec2ae66bc30e7af663592cc3a27e6591e05035c"
      url: "https://pub.dev"
    source: hosted
-    version: "2.6.2"
+    version: "2.7.0"
  logging:
    dependency: transitive
    description:
@@ -1257,10 +1257,10 @@ packages:
    dependency: transitive
    description:
      name: vector_graphics
-      sha256: a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6
+      sha256: "7076216a10d5c390315fbe536a30f1254c341e7543e6c4c8a815e591307772b1"
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.19"
+    version: "1.1.20"
  vector_graphics_codec:
    dependency: transitive
    description:
@@ -1361,10 +1361,10 @@ packages:
    dependency: transitive
    description:
      name: webview_flutter_wkwebview
-      sha256: fc0af89d403e1c053f03d023d97550412fa79f35332e2939514c82e6fe633198
+      sha256: "2df8fd9ada04d699b9db8e79aa783a16e5d89b69e5b74009b87e16b59912cf98"
      url: "https://pub.dev"
    source: hosted
-    version: "3.23.8"
+    version: "3.24.0"
  wkt_parser:
    dependency: transitive
    description:
--- a/modules/legacy/modules/account/pubspec.yaml
+++ b/modules/legacy/modules/account/pubspec.yaml
@@ -56,6 +56,7 @@ dependencies:
  uuid: ^4.5.2
  qr_flutter: ^4.1.0
  url_launcher: ^6.3.2
+  build_runner: ^2.7.1

  # The following adds the Cupertino Icons font to your application.
  # Use with the CupertinoIcons class for iOS style icons.
--- a/modules/legacy/modules/device_management/lib/src/core/data/datasources/functions_remote_datasource.dart
+++ b/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});
-}
--- a/modules/legacy/modules/device_management/lib/src/core/data/datasources/pictures_remote_datasource.dart
+++ b/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});
+}
--- a/modules/legacy/modules/device_management/lib/src/core/data/datasources/functions_remote_datasource_impl.dart
+++ b/modules/legacy/modules/device_management/lib/src/core/data/datasources/functions_remote_datasource_impl.dart
@@ -1,17 +1,19 @@
-import 'package:device_management/src/core/data/datasources/functions_remote_datasource.dart';
+import 'package:device_management/src/core/data/datasources/pictures_remote_datasource.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 FunctionsRemoteDatasourceImpl implements FunctionsRemoteDatasource {
-  FunctionsRemoteDatasourceImpl(this._repository);
+class PicturesRemoteDatasourceImpl implements PicturesRemoteDatasource {
+  PicturesRemoteDatasourceImpl(this._repository);

  final QuestiaRepository _repository;

  @override
-  Future<List<PictureEntity>> getPictures({required String userId}) async {
+  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;
@@ -28,7 +30,7 @@ class FunctionsRemoteDatasourceImpl implements FunctionsRemoteDatasource {
  }

  @override
-  Future<PictureEntity> takePicture({required String userId}) async {
+  Future<PictureEntity> takePicture({required String deviceId}) async {
    /*try {
      final response = await _repository.get<Map<String, dynamic>>(
        '',
--- a/modules/legacy/modules/device_management/lib/src/core/data/repositories/functions_repository_impl.dart
+++ b/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);
-  }
-}
--- a/modules/legacy/modules/device_management/lib/src/core/data/repositories/pictures_repository_impl.dart
+++ b/modules/legacy/modules/device_management/lib/src/core/data/repositories/pictures_repository_impl.dart
@@ -0,0 +1,22 @@
+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}) async {
+    await Future<void>.delayed(const Duration(milliseconds: 2000));
+    return _remote.getPictures(deviceId: deviceId);
+  }
+
+  @override
+  Future<PictureEntity> takePicture({required String deviceId}) async {
+    await Future<void>.delayed(const Duration(milliseconds: 2000));
+    return _remote.takePicture(deviceId: deviceId);
+  }
+}
--- a/modules/legacy/modules/device_management/lib/src/core/domain/repositories/functions_repository.dart
+++ b/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});
-}
--- a/modules/legacy/modules/device_management/lib/src/core/domain/repositories/pictures_repository.dart
+++ b/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});
+}
--- a/modules/legacy/modules/device_management/lib/src/core/providers/functions_remote_datasource_provider.dart
+++ b/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);
-});
--- a/modules/legacy/modules/device_management/lib/src/core/providers/functions_repository_provider.dart
+++ b/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);
-});
--- a/modules/legacy/modules/device_management/lib/src/core/providers/pictures_remote_datasource_provider.dart
+++ b/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);
+});
--- a/modules/legacy/modules/device_management/lib/src/core/providers/pictures_repository_provider.dart
+++ b/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);
+});
--- a/modules/legacy/modules/device_management/lib/src/features/contacts/presentation/edit_contact_screen.dart
+++ b/modules/legacy/modules/device_management/lib/src/features/contacts/presentation/edit_contact_screen.dart
@@ -46,6 +46,8 @@ class _EditContactScreenState extends ConsumerState<EditContactScreen> {
  Widget build(BuildContext context) {
    final theme = ref.watch(themePortProvider);

+    final state = ref.watch(contactsViewModelProvider);
+
    return Scaffold(
      backgroundColor: theme.getColorFor(ThemeCode.backgroundPrimary),
      body: SafeArea(
@@ -101,10 +103,31 @@ class _EditContactScreenState extends ConsumerState<EditContactScreen> {
                        SizedBox(
                          height: SizeUtils.getByScreen(small: 28, big: 26),
                        ),
-                        CustomTextField(
-                          controller: _phoneController,
-                          keyboardType: TextInputType.number,
-                          label: context.translate(I18n.phoneNumber),
+                        Row(
+                          children: [
+                            CountryPrefixPicker(
+                              headerText: context.translate(I18n.selectYourCountry),
+                              initialSelection: state.dialCode,
+                              onChanged: (country) {
+                                final vm =
+                                ref.read(contactsViewModelProvider.notifier);
+                                vm.updateDialCode(
+                                  country.dialCode ?? state.dialCode,
+                                );
+                              },
+                              width: 80,
+                            ),
+                            SizedBox(
+                              width: SizeUtils.getByScreen(small: 10, big: 10, xl: 6),
+                            ),
+                            Expanded(
+                              child: CustomTextField(
+                                controller: _phoneController,
+                                keyboardType: TextInputType.number,
+                                label: context.translate(I18n.phoneNumber),
+                              ),
+                            ),
+                          ],
                        ),
                      ],
                    ),
--- a/modules/legacy/modules/device_management/lib/src/features/contacts/presentation/state/contacts_view_model.dart
+++ b/modules/legacy/modules/device_management/lib/src/features/contacts/presentation/state/contacts_view_model.dart
@@ -48,6 +48,15 @@ class ContactsViewModel extends Notifier<ContactsViewState> {
    state = state.copyWith(isEditing: !state.isEditing);
  }

+  void updateDialCode(String value) {
+    if (value == state.dialCode) return;
+
+    state = state.copyWith(
+      dialCode: value,
+      errorMessage: '',
+    );
+  }
+
  Future<bool> createContact({
    required String name,
    required String phone,
@@ -64,13 +73,16 @@ class ContactsViewModel extends Notifier<ContactsViewState> {
    try {
      state = state.copyWith(isLoading: true, errorMessage: '');

+      final dialCode = state.dialCode;
+      final fullPhone = dialCode+phone;
+
      final user = await ref.read(userInfoProvider.future);
      if (!ref.mounted) return false;

      final request = CreateContactRequestModel(
        id: _uuid.v4(),
        name: name,
-        phone: phone,
+        phone: fullPhone,
        userId: user.id,
      );

@@ -98,10 +110,13 @@ class ContactsViewModel extends Notifier<ContactsViewState> {
    try {
      state = state.copyWith(isLoading: true, errorMessage: '');

+      final dialCode = state.dialCode;
+      final fullPhone = phone.isEmpty ? contact.phone : dialCode + phone;
+
      final request = UpdateContactRequestModel(
        id: contact.id,
        name: name.isEmpty ? contact.name : name,
-        phone: phone.isEmpty ? contact.phone : phone,
+        phone: fullPhone,
      );

      await _contactsRepository.updateContact(request: request);
--- a/modules/legacy/modules/device_management/lib/src/features/contacts/presentation/state/contacts_view_state.dart
+++ b/modules/legacy/modules/device_management/lib/src/features/contacts/presentation/state/contacts_view_state.dart
@@ -8,6 +8,7 @@ part 'contacts_view_state.freezed.dart';
 abstract class ContactsViewState with _$ContactsViewState {
  const factory ContactsViewState({
    @Default([]) List<ContactEntity> contacts,
+    @Default('+34') String dialCode,
    @Default(true) bool isLoading,
    @Default(false) bool isEditing,
    @Default('') String errorMessage,
--- a/modules/legacy/modules/device_management/lib/src/features/contacts/presentation/state/contacts_view_state.freezed.dart
+++ b/modules/legacy/modules/device_management/lib/src/features/contacts/presentation/state/contacts_view_state.freezed.dart
@@ -14,7 +14,7 @@ T _$identity<T>(T value) => value;
 /// @nodoc
 mixin _$ContactsViewState {

- List<ContactEntity> get contacts; bool get isLoading; bool get isEditing; String get errorMessage;
+ List<ContactEntity> get contacts; String get dialCode; bool get isLoading; bool get isEditing; String get errorMessage;
 /// Create a copy of ContactsViewState
 /// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@@ -25,16 +25,16 @@ $ContactsViewStateCopyWith<ContactsViewState> get copyWith => _$ContactsViewStat

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is ContactsViewState&&const DeepCollectionEquality().equals(other.contacts, contacts)&&(identical(other.isLoading, isLoading) || other.isLoading == isLoading)&&(identical(other.isEditing, isEditing) || other.isEditing == isEditing)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is ContactsViewState&&const DeepCollectionEquality().equals(other.contacts, contacts)&&(identical(other.dialCode, dialCode) || other.dialCode == dialCode)&&(identical(other.isLoading, isLoading) || other.isLoading == isLoading)&&(identical(other.isEditing, isEditing) || other.isEditing == isEditing)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage));
 }


@override
-int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(contacts),isLoading,isEditing,errorMessage);
+int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(contacts),dialCode,isLoading,isEditing,errorMessage);

@override
 String toString() {
-  return 'ContactsViewState(contacts: $contacts, isLoading: $isLoading, isEditing: $isEditing, errorMessage: $errorMessage)';
+  return 'ContactsViewState(contacts: $contacts, dialCode: $dialCode, isLoading: $isLoading, isEditing: $isEditing, errorMessage: $errorMessage)';
 }


@@ -45,7 +45,7 @@ abstract mixin class $ContactsViewStateCopyWith<$Res>  {
  factory $ContactsViewStateCopyWith(ContactsViewState value, $Res Function(ContactsViewState) _then) = _$ContactsViewStateCopyWithImpl;
@useResult
 $Res call({
- List<ContactEntity> contacts, bool isLoading, bool isEditing, String errorMessage
+ List<ContactEntity> contacts, String dialCode, bool isLoading, bool isEditing, String errorMessage
 });


@@ -62,10 +62,11 @@ class _$ContactsViewStateCopyWithImpl<$Res>

 /// Create a copy of ContactsViewState
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? contacts = null,Object? isLoading = null,Object? isEditing = null,Object? errorMessage = null,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? contacts = null,Object? dialCode = null,Object? isLoading = null,Object? isEditing = null,Object? errorMessage = null,}) {
  return _then(_self.copyWith(
 contacts: null == contacts ? _self.contacts : contacts // ignore: cast_nullable_to_non_nullable
-as List<ContactEntity>,isLoading: null == isLoading ? _self.isLoading : isLoading // ignore: cast_nullable_to_non_nullable
+as List<ContactEntity>,dialCode: null == dialCode ? _self.dialCode : dialCode // ignore: cast_nullable_to_non_nullable
+as String,isLoading: null == isLoading ? _self.isLoading : isLoading // ignore: cast_nullable_to_non_nullable
 as bool,isEditing: null == isEditing ? _self.isEditing : isEditing // ignore: cast_nullable_to_non_nullable
 as bool,errorMessage: null == errorMessage ? _self.errorMessage : errorMessage // ignore: cast_nullable_to_non_nullable
 as String,
@@ -153,10 +154,10 @@ return $default(_that);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( List<ContactEntity> contacts,  bool isLoading,  bool isEditing,  String errorMessage)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( List<ContactEntity> contacts,  String dialCode,  bool isLoading,  bool isEditing,  String errorMessage)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _ContactsViewState() when $default != null:
-return $default(_that.contacts,_that.isLoading,_that.isEditing,_that.errorMessage);case _:
+return $default(_that.contacts,_that.dialCode,_that.isLoading,_that.isEditing,_that.errorMessage);case _:
  return orElse();

 }
@@ -174,10 +175,10 @@ return $default(_that.contacts,_that.isLoading,_that.isEditing,_that.errorMessag
 /// }
 /// ```

-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( List<ContactEntity> contacts,  bool isLoading,  bool isEditing,  String errorMessage)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( List<ContactEntity> contacts,  String dialCode,  bool isLoading,  bool isEditing,  String errorMessage)  $default,) {final _that = this;
 switch (_that) {
 case _ContactsViewState():
-return $default(_that.contacts,_that.isLoading,_that.isEditing,_that.errorMessage);case _:
+return $default(_that.contacts,_that.dialCode,_that.isLoading,_that.isEditing,_that.errorMessage);case _:
  throw StateError('Unexpected subclass');

 }
@@ -194,10 +195,10 @@ return $default(_that.contacts,_that.isLoading,_that.isEditing,_that.errorMessag
 /// }
 /// ```

-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( List<ContactEntity> contacts,  bool isLoading,  bool isEditing,  String errorMessage)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( List<ContactEntity> contacts,  String dialCode,  bool isLoading,  bool isEditing,  String errorMessage)?  $default,) {final _that = this;
 switch (_that) {
 case _ContactsViewState() when $default != null:
-return $default(_that.contacts,_that.isLoading,_that.isEditing,_that.errorMessage);case _:
+return $default(_that.contacts,_that.dialCode,_that.isLoading,_that.isEditing,_that.errorMessage);case _:
  return null;

 }
@@ -209,7 +210,7 @@ return $default(_that.contacts,_that.isLoading,_that.isEditing,_that.errorMessag


 class _ContactsViewState implements ContactsViewState {
-  const _ContactsViewState({final  List<ContactEntity> contacts = const [], this.isLoading = true, this.isEditing = false, this.errorMessage = ''}): _contacts = contacts;
+  const _ContactsViewState({final  List<ContactEntity> contacts = const [], this.dialCode = '+34', this.isLoading = true, this.isEditing = false, this.errorMessage = ''}): _contacts = contacts;
  

 final  List<ContactEntity> _contacts;
@@ -219,6 +220,7 @@ class _ContactsViewState implements ContactsViewState {
  return EqualUnmodifiableListView(_contacts);
 }

+@override@JsonKey() final  String dialCode;
@override@JsonKey() final  bool isLoading;
@override@JsonKey() final  bool isEditing;
@override@JsonKey() final  String errorMessage;
@@ -233,16 +235,16 @@ _$ContactsViewStateCopyWith<_ContactsViewState> get copyWith => __$ContactsViewS

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _ContactsViewState&&const DeepCollectionEquality().equals(other._contacts, _contacts)&&(identical(other.isLoading, isLoading) || other.isLoading == isLoading)&&(identical(other.isEditing, isEditing) || other.isEditing == isEditing)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _ContactsViewState&&const DeepCollectionEquality().equals(other._contacts, _contacts)&&(identical(other.dialCode, dialCode) || other.dialCode == dialCode)&&(identical(other.isLoading, isLoading) || other.isLoading == isLoading)&&(identical(other.isEditing, isEditing) || other.isEditing == isEditing)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage));
 }


@override
-int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(_contacts),isLoading,isEditing,errorMessage);
+int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(_contacts),dialCode,isLoading,isEditing,errorMessage);

@override
 String toString() {
-  return 'ContactsViewState(contacts: $contacts, isLoading: $isLoading, isEditing: $isEditing, errorMessage: $errorMessage)';
+  return 'ContactsViewState(contacts: $contacts, dialCode: $dialCode, isLoading: $isLoading, isEditing: $isEditing, errorMessage: $errorMessage)';
 }


@@ -253,7 +255,7 @@ abstract mixin class _$ContactsViewStateCopyWith<$Res> implements $ContactsViewS
  factory _$ContactsViewStateCopyWith(_ContactsViewState value, $Res Function(_ContactsViewState) _then) = __$ContactsViewStateCopyWithImpl;
@override @useResult
 $Res call({
- List<ContactEntity> contacts, bool isLoading, bool isEditing, String errorMessage
+ List<ContactEntity> contacts, String dialCode, bool isLoading, bool isEditing, String errorMessage
 });


@@ -270,10 +272,11 @@ class __$ContactsViewStateCopyWithImpl<$Res>

 /// Create a copy of ContactsViewState
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? contacts = null,Object? isLoading = null,Object? isEditing = null,Object? errorMessage = null,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? contacts = null,Object? dialCode = null,Object? isLoading = null,Object? isEditing = null,Object? errorMessage = null,}) {
  return _then(_ContactsViewState(
 contacts: null == contacts ? _self._contacts : contacts // ignore: cast_nullable_to_non_nullable
-as List<ContactEntity>,isLoading: null == isLoading ? _self.isLoading : isLoading // ignore: cast_nullable_to_non_nullable
+as List<ContactEntity>,dialCode: null == dialCode ? _self.dialCode : dialCode // ignore: cast_nullable_to_non_nullable
+as String,isLoading: null == isLoading ? _self.isLoading : isLoading // ignore: cast_nullable_to_non_nullable
 as bool,isEditing: null == isEditing ? _self.isEditing : isEditing // ignore: cast_nullable_to_non_nullable
 as bool,errorMessage: null == errorMessage ? _self.errorMessage : errorMessage // ignore: cast_nullable_to_non_nullable
 as String,
--- a/modules/legacy/modules/device_management/lib/src/features/contacts/presentation/widgets/contact_card.dart
+++ b/modules/legacy/modules/device_management/lib/src/features/contacts/presentation/widgets/contact_card.dart
@@ -25,7 +25,7 @@ class ContactCard extends ConsumerWidget {
    return Container(
      padding: EdgeInsets.symmetric(
        horizontal: SizeUtils.getByScreen(small: 22, big: 21),
-        vertical: SizeUtils.getByScreen(small: 10, big: 8),
+        vertical: SizeUtils.getByScreen(small: 12, big: 8),
      ),
      decoration: BoxDecoration(
        borderRadius: BorderRadius.all(
@@ -41,7 +41,7 @@ class ContactCard extends ConsumerWidget {
              color: theme.getColorFor(ThemeCode.backgroundPrimary),
            ),
            padding:
-                EdgeInsets.all(SizeUtils.getByScreen(small: 4, big: 12)),
+                EdgeInsets.all(SizeUtils.getByScreen(small: 10, big: 12)),
            child: Icon(
              SFIcons.account,
              size: SizeUtils.getByScreen(small: 40, big: 44),
--- a/modules/legacy/modules/device_management/lib/src/features/contacts/presentation/widgets/new_contact_dialog.dart
+++ b/modules/legacy/modules/device_management/lib/src/features/contacts/presentation/widgets/new_contact_dialog.dart
@@ -29,6 +29,10 @@ class _NewContactDialogState extends ConsumerState<NewContactDialog> {
  @override
  Widget build(BuildContext context) {
    final theme = ref.watch(themePortProvider);
+    
+    final dialCode = ref.read(
+      contactsViewModelProvider.select((s)=>s.dialCode)
+    );

    return Container(
      padding: EdgeInsets.symmetric(
@@ -82,12 +86,23 @@ class _NewContactDialogState extends ConsumerState<NewContactDialog> {
            Row(
              spacing: SizeUtils.getByScreen(small: 10, big: 8),
              children: [
+
+                CountryPrefixPicker(
+                  headerText: context.translate(I18n.selectYourCountry),
+                  initialSelection: dialCode,
+                  onChanged: (country) {
+                    final vm = ref.read(contactsViewModelProvider.notifier);
+                    vm.updateDialCode(
+                      country.dialCode ?? dialCode,
+                    );
+                  },
+                  width: 80,
+                ),
                Expanded(
                  child: CustomTextField(
                    controller: _phoneController,
                    hint: context.translate(I18n.phoneNumber),
                    keyboardType: TextInputType.phone,
-                    readOnly: true,
                  ),
                ),
                DecoratedBox(
--- a/modules/legacy/modules/device_management/lib/src/features/device_management/device_management_screen.dart
+++ b/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: () =>
--- a/modules/legacy/modules/device_management/lib/src/features/remote_connection/domain/get_pictures_use_case.dart
+++ b/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});
-}
--- a/modules/legacy/modules/device_management/lib/src/features/remote_connection/domain/get_pictures_use_case_impl.dart
+++ b/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(),
-      ),
-    ];
-  }
-}
--- a/modules/legacy/modules/device_management/lib/src/features/remote_connection/domain/take_picture_use_case.dart
+++ b/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});
-}
--- a/modules/legacy/modules/device_management/lib/src/features/remote_connection/domain/take_picture_use_case_impl.dart
+++ b/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);
-  }
-}
--- a/modules/legacy/modules/device_management/lib/src/features/remote_connection/presentation/providers/get_pictures_use_case_provider.dart
+++ b/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);
-});
--- a/modules/legacy/modules/device_management/lib/src/features/remote_connection/presentation/providers/take_picture_use_case_provider.dart
+++ b/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);
-});
--- a/modules/legacy/modules/device_management/lib/src/features/remote_connection/presentation/remote_camera_screen.dart
+++ b/modules/legacy/modules/device_management/lib/src/features/remote_connection/presentation/remote_camera_screen.dart
@@ -15,16 +15,30 @@ 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: Expanded(child: isLoadingPictures || isTakingPicture
        ? const Center(child: CircularProgressIndicator())
        : const _GallerySection()
      ),
@@ -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),
--- a/modules/legacy/modules/device_management/lib/src/features/remote_connection/presentation/state/remote_connection_view_model.dart
+++ b/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,13 +37,11 @@ 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);
-  }
+    final pictures = await _picturesRepository.getPictures(deviceId: device.identificator);

-  void setImages(List<PictureEntity> pictures) {
    state = state.copyWith(
      pictures: pictures,
      isLoadingPictures: false,
@@ -84,18 +81,30 @@ 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,
-          );
-        });
+      await _commandsRepository.send(request: request);
+
+      state = state.copyWith(
+        isTakingPicture: false,
+        successMessage: I18n.photoTaken
+      );
    } catch (e){
      state = state.copyWith(
        isTakingPicture: false,
@@ -106,6 +115,7 @@ 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');
      return;
@@ -114,6 +124,29 @@ class RemoteConnectionViewModel extends Notifier<RemoteConnectionViewState> {
      state = state.copyWith(errorMessage: '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,
+        }
+      );
+      _commandsRepository.send(request: request);
+
+    } catch (e) {
+      state = state.copyWith(
+        isCalling: false,
+        errorMessage: e.toString(),
+      );
+    }
+
  }

  void disposeControllers() {
--- a/modules/legacy/modules/device_management/lib/src/features/remote_connection/presentation/state/remote_connection_view_state.dart
+++ b/modules/legacy/modules/device_management/lib/src/features/remote_connection/presentation/state/remote_connection_view_state.dart
@@ -6,12 +6,15 @@ part 'remote_connection_view_state.freezed.dart';
@freezed
 abstract class RemoteConnectionViewState with _$RemoteConnectionViewState {
  const factory RemoteConnectionViewState({
+    @Default('') String deviceId,
+    @Default('+34') String dialCode,
    @Default('') String phone,
    @Default([]) List<PictureEntity> pictures,
    @Default(0) int pictureIndex,
    @Default(true) bool isLoadingPictures,
    @Default(false) bool isTakingPicture,
    @Default(false) bool isCalling,
-    @Default('') String errorMessage
+    @Default('') String errorMessage,
+    @Default('') String successMessage
  }) = _RemoteConnectionViewState;
 }
--- a/modules/legacy/modules/device_management/lib/src/features/remote_connection/presentation/state/remote_connection_view_state.freezed.dart
+++ b/modules/legacy/modules/device_management/lib/src/features/remote_connection/presentation/state/remote_connection_view_state.freezed.dart
@@ -14,7 +14,7 @@ T _$identity<T>(T value) => value;
 /// @nodoc
 mixin _$RemoteConnectionViewState {

- String get phone; List<PictureEntity> get pictures; int get pictureIndex; bool get isLoadingPictures; bool get isTakingPicture; bool get isCalling; String get errorMessage;
+ String get deviceId; String get dialCode; String get phone; List<PictureEntity> get pictures; int get pictureIndex; bool get isLoadingPictures; bool get isTakingPicture; bool get isCalling; String get errorMessage; String get successMessage;
 /// Create a copy of RemoteConnectionViewState
 /// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@@ -25,16 +25,16 @@ $RemoteConnectionViewStateCopyWith<RemoteConnectionViewState> get copyWith => _$

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is RemoteConnectionViewState&&(identical(other.phone, phone) || other.phone == phone)&&const DeepCollectionEquality().equals(other.pictures, pictures)&&(identical(other.pictureIndex, pictureIndex) || other.pictureIndex == pictureIndex)&&(identical(other.isLoadingPictures, isLoadingPictures) || other.isLoadingPictures == isLoadingPictures)&&(identical(other.isTakingPicture, isTakingPicture) || other.isTakingPicture == isTakingPicture)&&(identical(other.isCalling, isCalling) || other.isCalling == isCalling)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is RemoteConnectionViewState&&(identical(other.deviceId, deviceId) || other.deviceId == deviceId)&&(identical(other.dialCode, dialCode) || other.dialCode == dialCode)&&(identical(other.phone, phone) || other.phone == phone)&&const DeepCollectionEquality().equals(other.pictures, pictures)&&(identical(other.pictureIndex, pictureIndex) || other.pictureIndex == pictureIndex)&&(identical(other.isLoadingPictures, isLoadingPictures) || other.isLoadingPictures == isLoadingPictures)&&(identical(other.isTakingPicture, isTakingPicture) || other.isTakingPicture == isTakingPicture)&&(identical(other.isCalling, isCalling) || other.isCalling == isCalling)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage)&&(identical(other.successMessage, successMessage) || other.successMessage == successMessage));
 }


@override
-int get hashCode => Object.hash(runtimeType,phone,const DeepCollectionEquality().hash(pictures),pictureIndex,isLoadingPictures,isTakingPicture,isCalling,errorMessage);
+int get hashCode => Object.hash(runtimeType,deviceId,dialCode,phone,const DeepCollectionEquality().hash(pictures),pictureIndex,isLoadingPictures,isTakingPicture,isCalling,errorMessage,successMessage);

@override
 String toString() {
-  return 'RemoteConnectionViewState(phone: $phone, pictures: $pictures, pictureIndex: $pictureIndex, isLoadingPictures: $isLoadingPictures, isTakingPicture: $isTakingPicture, isCalling: $isCalling, errorMessage: $errorMessage)';
+  return 'RemoteConnectionViewState(deviceId: $deviceId, dialCode: $dialCode, phone: $phone, pictures: $pictures, pictureIndex: $pictureIndex, isLoadingPictures: $isLoadingPictures, isTakingPicture: $isTakingPicture, isCalling: $isCalling, errorMessage: $errorMessage, successMessage: $successMessage)';
 }


@@ -45,7 +45,7 @@ abstract mixin class $RemoteConnectionViewStateCopyWith<$Res>  {
  factory $RemoteConnectionViewStateCopyWith(RemoteConnectionViewState value, $Res Function(RemoteConnectionViewState) _then) = _$RemoteConnectionViewStateCopyWithImpl;
@useResult
 $Res call({
- String phone, List<PictureEntity> pictures, int pictureIndex, bool isLoadingPictures, bool isTakingPicture, bool isCalling, String errorMessage
+ String deviceId, String dialCode, String phone, List<PictureEntity> pictures, int pictureIndex, bool isLoadingPictures, bool isTakingPicture, bool isCalling, String errorMessage, String successMessage
 });


@@ -62,15 +62,18 @@ class _$RemoteConnectionViewStateCopyWithImpl<$Res>

 /// Create a copy of RemoteConnectionViewState
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? phone = null,Object? pictures = null,Object? pictureIndex = null,Object? isLoadingPictures = null,Object? isTakingPicture = null,Object? isCalling = null,Object? errorMessage = null,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? deviceId = null,Object? dialCode = null,Object? phone = null,Object? pictures = null,Object? pictureIndex = null,Object? isLoadingPictures = null,Object? isTakingPicture = null,Object? isCalling = null,Object? errorMessage = null,Object? successMessage = null,}) {
  return _then(_self.copyWith(
-phone: null == phone ? _self.phone : phone // ignore: cast_nullable_to_non_nullable
+deviceId: null == deviceId ? _self.deviceId : deviceId // ignore: cast_nullable_to_non_nullable
+as String,dialCode: null == dialCode ? _self.dialCode : dialCode // ignore: cast_nullable_to_non_nullable
+as String,phone: null == phone ? _self.phone : phone // ignore: cast_nullable_to_non_nullable
 as String,pictures: null == pictures ? _self.pictures : pictures // ignore: cast_nullable_to_non_nullable
 as List<PictureEntity>,pictureIndex: null == pictureIndex ? _self.pictureIndex : pictureIndex // ignore: cast_nullable_to_non_nullable
 as int,isLoadingPictures: null == isLoadingPictures ? _self.isLoadingPictures : isLoadingPictures // ignore: cast_nullable_to_non_nullable
 as bool,isTakingPicture: null == isTakingPicture ? _self.isTakingPicture : isTakingPicture // ignore: cast_nullable_to_non_nullable
 as bool,isCalling: null == isCalling ? _self.isCalling : isCalling // ignore: cast_nullable_to_non_nullable
 as bool,errorMessage: null == errorMessage ? _self.errorMessage : errorMessage // ignore: cast_nullable_to_non_nullable
+as String,successMessage: null == successMessage ? _self.successMessage : successMessage // ignore: cast_nullable_to_non_nullable
 as String,
  ));
 }
@@ -156,10 +159,10 @@ return $default(_that);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String phone,  List<PictureEntity> pictures,  int pictureIndex,  bool isLoadingPictures,  bool isTakingPicture,  bool isCalling,  String errorMessage)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String deviceId,  String dialCode,  String phone,  List<PictureEntity> pictures,  int pictureIndex,  bool isLoadingPictures,  bool isTakingPicture,  bool isCalling,  String errorMessage,  String successMessage)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _RemoteConnectionViewState() when $default != null:
-return $default(_that.phone,_that.pictures,_that.pictureIndex,_that.isLoadingPictures,_that.isTakingPicture,_that.isCalling,_that.errorMessage);case _:
+return $default(_that.deviceId,_that.dialCode,_that.phone,_that.pictures,_that.pictureIndex,_that.isLoadingPictures,_that.isTakingPicture,_that.isCalling,_that.errorMessage,_that.successMessage);case _:
  return orElse();

 }
@@ -177,10 +180,10 @@ return $default(_that.phone,_that.pictures,_that.pictureIndex,_that.isLoadingPic
 /// }
 /// ```

-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String phone,  List<PictureEntity> pictures,  int pictureIndex,  bool isLoadingPictures,  bool isTakingPicture,  bool isCalling,  String errorMessage)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String deviceId,  String dialCode,  String phone,  List<PictureEntity> pictures,  int pictureIndex,  bool isLoadingPictures,  bool isTakingPicture,  bool isCalling,  String errorMessage,  String successMessage)  $default,) {final _that = this;
 switch (_that) {
 case _RemoteConnectionViewState():
-return $default(_that.phone,_that.pictures,_that.pictureIndex,_that.isLoadingPictures,_that.isTakingPicture,_that.isCalling,_that.errorMessage);case _:
+return $default(_that.deviceId,_that.dialCode,_that.phone,_that.pictures,_that.pictureIndex,_that.isLoadingPictures,_that.isTakingPicture,_that.isCalling,_that.errorMessage,_that.successMessage);case _:
  throw StateError('Unexpected subclass');

 }
@@ -197,10 +200,10 @@ return $default(_that.phone,_that.pictures,_that.pictureIndex,_that.isLoadingPic
 /// }
 /// ```

-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String phone,  List<PictureEntity> pictures,  int pictureIndex,  bool isLoadingPictures,  bool isTakingPicture,  bool isCalling,  String errorMessage)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String deviceId,  String dialCode,  String phone,  List<PictureEntity> pictures,  int pictureIndex,  bool isLoadingPictures,  bool isTakingPicture,  bool isCalling,  String errorMessage,  String successMessage)?  $default,) {final _that = this;
 switch (_that) {
 case _RemoteConnectionViewState() when $default != null:
-return $default(_that.phone,_that.pictures,_that.pictureIndex,_that.isLoadingPictures,_that.isTakingPicture,_that.isCalling,_that.errorMessage);case _:
+return $default(_that.deviceId,_that.dialCode,_that.phone,_that.pictures,_that.pictureIndex,_that.isLoadingPictures,_that.isTakingPicture,_that.isCalling,_that.errorMessage,_that.successMessage);case _:
  return null;

 }
@@ -212,9 +215,11 @@ return $default(_that.phone,_that.pictures,_that.pictureIndex,_that.isLoadingPic


 class _RemoteConnectionViewState implements RemoteConnectionViewState {
-  const _RemoteConnectionViewState({this.phone = '', final  List<PictureEntity> pictures = const [], this.pictureIndex = 0, this.isLoadingPictures = true, this.isTakingPicture = false, this.isCalling = false, this.errorMessage = ''}): _pictures = pictures;
+  const _RemoteConnectionViewState({this.deviceId = '', this.dialCode = '+34', this.phone = '', final  List<PictureEntity> pictures = const [], this.pictureIndex = 0, this.isLoadingPictures = true, this.isTakingPicture = false, this.isCalling = false, this.errorMessage = '', this.successMessage = ''}): _pictures = pictures;
  

+@override@JsonKey() final  String deviceId;
+@override@JsonKey() final  String dialCode;
@override@JsonKey() final  String phone;
 final  List<PictureEntity> _pictures;
@override@JsonKey() List<PictureEntity> get pictures {
@@ -228,6 +233,7 @@ class _RemoteConnectionViewState implements RemoteConnectionViewState {
@override@JsonKey() final  bool isTakingPicture;
@override@JsonKey() final  bool isCalling;
@override@JsonKey() final  String errorMessage;
+@override@JsonKey() final  String successMessage;

 /// Create a copy of RemoteConnectionViewState
 /// with the given fields replaced by the non-null parameter values.
@@ -239,16 +245,16 @@ _$RemoteConnectionViewStateCopyWith<_RemoteConnectionViewState> get copyWith =>

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _RemoteConnectionViewState&&(identical(other.phone, phone) || other.phone == phone)&&const DeepCollectionEquality().equals(other._pictures, _pictures)&&(identical(other.pictureIndex, pictureIndex) || other.pictureIndex == pictureIndex)&&(identical(other.isLoadingPictures, isLoadingPictures) || other.isLoadingPictures == isLoadingPictures)&&(identical(other.isTakingPicture, isTakingPicture) || other.isTakingPicture == isTakingPicture)&&(identical(other.isCalling, isCalling) || other.isCalling == isCalling)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _RemoteConnectionViewState&&(identical(other.deviceId, deviceId) || other.deviceId == deviceId)&&(identical(other.dialCode, dialCode) || other.dialCode == dialCode)&&(identical(other.phone, phone) || other.phone == phone)&&const DeepCollectionEquality().equals(other._pictures, _pictures)&&(identical(other.pictureIndex, pictureIndex) || other.pictureIndex == pictureIndex)&&(identical(other.isLoadingPictures, isLoadingPictures) || other.isLoadingPictures == isLoadingPictures)&&(identical(other.isTakingPicture, isTakingPicture) || other.isTakingPicture == isTakingPicture)&&(identical(other.isCalling, isCalling) || other.isCalling == isCalling)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage)&&(identical(other.successMessage, successMessage) || other.successMessage == successMessage));
 }


@override
-int get hashCode => Object.hash(runtimeType,phone,const DeepCollectionEquality().hash(_pictures),pictureIndex,isLoadingPictures,isTakingPicture,isCalling,errorMessage);
+int get hashCode => Object.hash(runtimeType,deviceId,dialCode,phone,const DeepCollectionEquality().hash(_pictures),pictureIndex,isLoadingPictures,isTakingPicture,isCalling,errorMessage,successMessage);

@override
 String toString() {
-  return 'RemoteConnectionViewState(phone: $phone, pictures: $pictures, pictureIndex: $pictureIndex, isLoadingPictures: $isLoadingPictures, isTakingPicture: $isTakingPicture, isCalling: $isCalling, errorMessage: $errorMessage)';
+  return 'RemoteConnectionViewState(deviceId: $deviceId, dialCode: $dialCode, phone: $phone, pictures: $pictures, pictureIndex: $pictureIndex, isLoadingPictures: $isLoadingPictures, isTakingPicture: $isTakingPicture, isCalling: $isCalling, errorMessage: $errorMessage, successMessage: $successMessage)';
 }


@@ -259,7 +265,7 @@ abstract mixin class _$RemoteConnectionViewStateCopyWith<$Res> implements $Remot
  factory _$RemoteConnectionViewStateCopyWith(_RemoteConnectionViewState value, $Res Function(_RemoteConnectionViewState) _then) = __$RemoteConnectionViewStateCopyWithImpl;
@override @useResult
 $Res call({
- String phone, List<PictureEntity> pictures, int pictureIndex, bool isLoadingPictures, bool isTakingPicture, bool isCalling, String errorMessage
+ String deviceId, String dialCode, String phone, List<PictureEntity> pictures, int pictureIndex, bool isLoadingPictures, bool isTakingPicture, bool isCalling, String errorMessage, String successMessage
 });


@@ -276,15 +282,18 @@ class __$RemoteConnectionViewStateCopyWithImpl<$Res>

 /// Create a copy of RemoteConnectionViewState
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? phone = null,Object? pictures = null,Object? pictureIndex = null,Object? isLoadingPictures = null,Object? isTakingPicture = null,Object? isCalling = null,Object? errorMessage = null,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? deviceId = null,Object? dialCode = null,Object? phone = null,Object? pictures = null,Object? pictureIndex = null,Object? isLoadingPictures = null,Object? isTakingPicture = null,Object? isCalling = null,Object? errorMessage = null,Object? successMessage = null,}) {
  return _then(_RemoteConnectionViewState(
-phone: null == phone ? _self.phone : phone // ignore: cast_nullable_to_non_nullable
+deviceId: null == deviceId ? _self.deviceId : deviceId // ignore: cast_nullable_to_non_nullable
+as String,dialCode: null == dialCode ? _self.dialCode : dialCode // ignore: cast_nullable_to_non_nullable
+as String,phone: null == phone ? _self.phone : phone // ignore: cast_nullable_to_non_nullable
 as String,pictures: null == pictures ? _self._pictures : pictures // ignore: cast_nullable_to_non_nullable
 as List<PictureEntity>,pictureIndex: null == pictureIndex ? _self.pictureIndex : pictureIndex // ignore: cast_nullable_to_non_nullable
 as int,isLoadingPictures: null == isLoadingPictures ? _self.isLoadingPictures : isLoadingPictures // ignore: cast_nullable_to_non_nullable
 as bool,isTakingPicture: null == isTakingPicture ? _self.isTakingPicture : isTakingPicture // ignore: cast_nullable_to_non_nullable
 as bool,isCalling: null == isCalling ? _self.isCalling : isCalling // ignore: cast_nullable_to_non_nullable
 as bool,errorMessage: null == errorMessage ? _self.errorMessage : errorMessage // ignore: cast_nullable_to_non_nullable
+as String,successMessage: null == successMessage ? _self.successMessage : successMessage // ignore: cast_nullable_to_non_nullable
 as String,
  ));
 }
--- a/modules/legacy/modules/legacy_auth/lib/src/features/device_setup/presentation/device_setup_screen.dart
+++ b/modules/legacy/modules/legacy_auth/lib/src/features/device_setup/presentation/device_setup_screen.dart
@@ -8,6 +8,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:navigation/navigation_contract.dart';
 import 'package:sf_localizations/sf_localizations.dart';
+import 'package:utils/utils.dart';
+
+import 'widgets/activation_code_dialog.dart';

 class LegacyDeviceSetupScreen extends ConsumerWidget {
  final NavigationContract navigationContract;
@@ -54,7 +57,7 @@ class LegacyDeviceSetupScreen extends ConsumerWidget {
          child: Column(
            children: [
              Padding(
-                padding: const EdgeInsets.only(top: 12, left: 8, right: 8),
+                padding: EdgeInsets.only(top: SizeUtils.getByScreen(small: 4, big: 12), left: 8, right: 8),
                child: Row(
                  children: [
                    if (isIntro)
@@ -114,6 +117,9 @@ class LegacyDeviceSetupScreen extends ConsumerWidget {
                    }
                    return;
                  }
+                  if (state.step == LegacyAddKidStep.scanWatch) {
+                    showActivationCodeDialog(context);
+                  }
                  await vm.next();
                },
                theme: theme,
--- a/modules/legacy/modules/legacy_auth/lib/src/features/device_setup/presentation/steps/intro_step.dart
+++ b/modules/legacy/modules/legacy_auth/lib/src/features/device_setup/presentation/steps/intro_step.dart
@@ -3,6 +3,7 @@ import 'package:design_system/design_system.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:sf_localizations/sf_localizations.dart';
+import 'package:utils/utils.dart';

 class LegacyIntroStepScreen extends ConsumerWidget {
  const LegacyIntroStepScreen({super.key});
@@ -11,29 +12,34 @@ class LegacyIntroStepScreen extends ConsumerWidget {
  Widget build(BuildContext context, WidgetRef ref) {
    final theme = ref.watch(themePortProvider);

-    return Column(
-      mainAxisAlignment: MainAxisAlignment.center,
-      crossAxisAlignment: CrossAxisAlignment.center,
-      children: [
-        Text(
-          context.translate(I18n.deviceSetup_intro_title),
-          style: TextStyle(fontSize: 30, fontWeight: FontWeight.bold),
-        ),
-        const SizedBox(height: 30),
-        Text(
-          context.translate(I18n.deviceSetup_intro_subtitle),
-          style: TextStyle(fontSize: 18),
-          textAlign: TextAlign.center,
-        ),
-        SizedBox(height: 40),
-        LegacyNumberedSteps(
-          steps: [
-            context.translate(I18n.deviceSetup_intro_step_1),
-            context.translate(I18n.deviceSetup_intro_step_2),
-          ],
-          color: theme.getColorFor(ThemeCode.legacyPrimary),
-        ),
-      ],
+    return Padding(
+      padding: EdgeInsets.symmetric(
+        horizontal: SizeUtils.getByScreen(small: 8, big: 2)
+      ),
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: [
+          Text(
+            context.translate(I18n.deviceSetup_intro_title),
+            style: TextStyle(fontSize: 30, fontWeight: FontWeight.bold),
+          ),
+          const SizedBox(height: 30),
+          Text(
+            context.translate(I18n.deviceSetup_intro_subtitle),
+            style: TextStyle(fontSize: 18),
+            textAlign: TextAlign.center,
+          ),
+          SizedBox(height: 40),
+          LegacyNumberedSteps(
+            steps: [
+              context.translate(I18n.deviceSetup_intro_step_1),
+              context.translate(I18n.deviceSetup_intro_step_2),
+            ],
+            color: theme.getColorFor(ThemeCode.legacyPrimary),
+          ),
+        ],
+      ),
    );
  }
 }
--- a/modules/legacy/modules/legacy_auth/lib/src/features/device_setup/presentation/steps/link_info_step.dart
+++ b/modules/legacy/modules/legacy_auth/lib/src/features/device_setup/presentation/steps/link_info_step.dart
@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:sf_localizations/sf_localizations.dart';
+import 'package:utils/utils.dart';

 class LegacyLinkInfoStepScreen extends ConsumerWidget {
  const LegacyLinkInfoStepScreen({super.key});
@@ -13,7 +14,7 @@ class LegacyLinkInfoStepScreen extends ConsumerWidget {
      mainAxisSize: MainAxisSize.max,
      crossAxisAlignment: CrossAxisAlignment.center,
      children: [
-        const SizedBox(height: 30),
+        SizedBox(height: SizeUtils.getByScreen(small: 8, big: 30)),
        Padding(
          padding: const EdgeInsets.symmetric(horizontal: 65),
          child: Text(
--- a/modules/legacy/modules/legacy_auth/lib/src/features/device_setup/presentation/steps/profile_step.dart
+++ b/modules/legacy/modules/legacy_auth/lib/src/features/device_setup/presentation/steps/profile_step.dart
@@ -147,7 +147,7 @@ class LegacyProfileStepScreen extends ConsumerWidget {

                CustomTextField(
                  label: context.translate(I18n.activationKeyLabel),
-                  hint: 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX',
+                  hint: 'XXXXXXXX',
                  controller: vm.activationKeyController,
                ),

--- a/modules/legacy/modules/legacy_auth/lib/src/features/device_setup/presentation/widgets/activation_code_dialog.dart
+++ b/modules/legacy/modules/legacy_auth/lib/src/features/device_setup/presentation/widgets/activation_code_dialog.dart
@@ -0,0 +1,33 @@
+import 'package:flutter/material.dart';
+import 'package:sf_localizations/sf_localizations.dart';
+import 'package:utils/utils.dart';
+
+void showActivationCodeDialog(BuildContext context) {
+  showDialog(context: context, builder: (context) =>
+    Dialog(
+      backgroundColor: Colors.transparent,
+      child: _ActivationCodeDialog(),
+    )
+  );
+}
+
+class _ActivationCodeDialog extends StatelessWidget {
+
+  const _ActivationCodeDialog();
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: SizeUtils.getByScreen(
+        small: EdgeInsets.symmetric(horizontal: 14, vertical: 24),
+        big: EdgeInsets.symmetric(horizontal: 12, vertical: 20),
+      ),
+      color: Colors.white,
+      child: Text(context.translate(I18n.activationCodeMessage),
+        textAlign: TextAlign.center,
+        style: TextStyle(fontSize: SizeUtils.getByScreen(small: 16, big: 15)),
+      ),
+    );
+  }
+
+}
--- a/modules/legacy/modules/legacy_auth/lib/src/features/login/presentation/widgets/two_factor_bottom_sheet.dart
+++ b/modules/legacy/modules/legacy_auth/lib/src/features/login/presentation/widgets/two_factor_bottom_sheet.dart
@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:legacy_auth/src/features/login/presentation/widgets/otp_code_fields.dart';
 import 'package:design_system/design_system.dart';
 import 'package:flutter/material.dart';
+import 'package:utils/utils.dart';

 class LegacyTwoFactorBottomSheetView extends StatelessWidget {
  const LegacyTwoFactorBottomSheetView({
@@ -88,6 +89,7 @@ class LegacyTwoFactorBottomSheetView extends StatelessWidget {
              if (isOtpLoading || !_isValidOtp) return;
              unawaited(onVerify());
            },
+            gap: SizeUtils.getByScreen(small: 10, big: 8),
          ),
          const SizedBox(height: 20),

--- a/modules/legacy/modules/settings/lib/src/features/remote_management/presentation/remote_management_screen.dart
+++ b/modules/legacy/modules/settings/lib/src/features/remote_management/presentation/remote_management_screen.dart
@@ -46,6 +46,8 @@ class _OptionsSection extends ConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
+
+    final state = ref.watch(remoteManagementViewModelProvider);
    final vm = ref.read(remoteManagementViewModelProvider.notifier);

    return SingleChildScrollView(
@@ -59,9 +61,26 @@ class _OptionsSection extends ConsumerWidget {
              child: ConfirmDialog(
                title: context.translate(I18n.remoteTurnOff),
                message: context.translate(I18n.remoteTurnOffConfirm),
-                onConfirm: () {
-                  vm.turnOff();
-                  Navigator.pop(context);
+                onConfirm: () async {
+                  await vm.shutdown();
+
+                  final errorMessage = ref.read(
+                      remoteManagementViewModelProvider.select((s)=>s.errorMessage)
+                  );
+                  if (errorMessage.isNotEmpty) {
+                    showTopSnackbar(
+                        context,
+                        message: errorMessage,
+                        type: MessageType.error
+                    );
+                  }
+
+                  final isComplete = ref.read(
+                      remoteManagementViewModelProvider.select((s)=>s.isComplete)
+                  );
+                  if (isComplete) {
+                    Navigator.pop(context);
+                  }
                }
              ),
            ));},
@@ -120,6 +139,7 @@ class _SectionButton extends ConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
+
    final theme = ref.read(themePortProvider);

    return SectionButton(
@@ -129,11 +149,13 @@ class _SectionButton extends ConsumerWidget {
        size: 48,
      ),
      body: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        mainAxisAlignment: MainAxisAlignment.start,
        children: [
          Text(title,
            style: TextStyle(
              fontWeight: FontWeight.w500,
-              fontSize: 14
+              fontSize: 16
            )
          ),
          Text(subtitle,
--- a/modules/legacy/modules/settings/lib/src/features/remote_management/presentation/state/remote_management_view_model.dart
+++ b/modules/legacy/modules/settings/lib/src/features/remote_management/presentation/state/remote_management_view_model.dart
@@ -1,7 +1,5 @@
-import 'package:design_system/design_system.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:legacy_shared/legacy_shared.dart';
-import 'package:sf_shared/sf_shared.dart';
 import 'remote_management_view_state.dart';

 final remoteManagementViewModelProvider =
@@ -10,40 +8,48 @@ NotifierProvider.autoDispose<RemoteManagementViewModel, RemoteManagementViewStat
 );

 class RemoteManagementViewModel extends Notifier<RemoteManagementViewState> {
-  // late final TurnOffUsecase _turnOffUseCase;
-  // late final RestartUsecase _restartUseCase;
-  // late final FactoryResetUseCase _factoryResetUseCase;
+
+  late final CommandsRepository _commandsRepository;

  @override
  RemoteManagementViewState build() {
-    // _turnOffUseCase = ref.read(turnOffUseCaseProvider);
-    // _restartUseCase = ref.read(restartUseCaseProvider);
-    // _factoryResetUseCase = ref.read(factoryResetUseCaseProvider);

-    Future.microtask(() => load());
+    _commandsRepository = ref.read(commandsRepositoryProvider);

-    return const RemoteManagementViewState();
+    state = const RemoteManagementViewState();
+
+    _init();
+
+    return state;
  }

-  Future<void> load() async {
+  Future<void> _init() async {
    final device = ref.read(selectedDeviceProvider);

-    setDevice(device!);
-  }
-
-  void setDevice(DeviceEntity device) {
    state = state.copyWith(
-      deviceId: device.identificator,
+      deviceId: device!.identificator,
      isLoading: false,
    );
  }

-  Future<void> turnOff() async {
+  Future<void> tryCommand(DeviceCommand command) async {
    try {
      state = state.copyWith(
        isLoading: true,
+        isComplete: false,
+      );
+
+      final request = SendCommandRequestModel(
+        device: state.deviceId,
+        command: command,
+      );
+
+      _commandsRepository.send(request: request);
+
+      state = state.copyWith(
+        isLoading: false,
+        isComplete: true,
      );
-      // _turnOffUseCase.turnOff();
    } catch (e) {
      state = state.copyWith(
        isLoading: false,
@@ -52,31 +58,15 @@ class RemoteManagementViewModel extends Notifier<RemoteManagementViewState> {
    }
  }

+  Future<void> shutdown() async {
+    await tryCommand(DeviceCommand.shutdown);
+  }
+
  Future<void> restart() async {
-    try {
-      state = state.copyWith(
-        isLoading: true,
-      );
-      // _restartUseCase.restart();
-    } catch (e) {
-      state = state.copyWith(
-        isLoading: false,
-        errorMessage: e.toString()
-      );
-    }
+    await tryCommand(DeviceCommand.restart);
  }

  Future<void> factoryReset() async {
-    try {
-      state = state.copyWith(
-        isLoading: true,
-      );
-      // _factoryResetUseCase.fatoryReset();
-    } catch (e) {
-      state = state.copyWith(
-        isLoading: false,
-        errorMessage: e.toString()
-      );
-    }
+    await tryCommand(DeviceCommand.factory);
  }
 }
--- a/modules/legacy/modules/settings/lib/src/features/remote_management/presentation/state/remote_management_view_state.dart
+++ b/modules/legacy/modules/settings/lib/src/features/remote_management/presentation/state/remote_management_view_state.dart
@@ -7,6 +7,7 @@ abstract class RemoteManagementViewState with _$RemoteManagementViewState {
  const factory RemoteManagementViewState({
    @Default('') String deviceId,
    @Default(true) bool isLoading,
+    @Default(true) bool isComplete,
    @Default('') String errorMessage,
  }) = _RemoteManagementViewState;
 }
--- a/modules/legacy/modules/settings/lib/src/features/remote_management/presentation/state/remote_management_view_state.freezed.dart
+++ b/modules/legacy/modules/settings/lib/src/features/remote_management/presentation/state/remote_management_view_state.freezed.dart
@@ -14,7 +14,7 @@ T _$identity<T>(T value) => value;
 /// @nodoc
 mixin _$RemoteManagementViewState {

- String get deviceId; bool get isLoading; String get errorMessage;
+ String get deviceId; bool get isLoading; bool get isComplete; String get errorMessage;
 /// Create a copy of RemoteManagementViewState
 /// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@@ -25,16 +25,16 @@ $RemoteManagementViewStateCopyWith<RemoteManagementViewState> get copyWith => _$

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is RemoteManagementViewState&&(identical(other.deviceId, deviceId) || other.deviceId == deviceId)&&(identical(other.isLoading, isLoading) || other.isLoading == isLoading)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is RemoteManagementViewState&&(identical(other.deviceId, deviceId) || other.deviceId == deviceId)&&(identical(other.isLoading, isLoading) || other.isLoading == isLoading)&&(identical(other.isComplete, isComplete) || other.isComplete == isComplete)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage));
 }


@override
-int get hashCode => Object.hash(runtimeType,deviceId,isLoading,errorMessage);
+int get hashCode => Object.hash(runtimeType,deviceId,isLoading,isComplete,errorMessage);

@override
 String toString() {
-  return 'RemoteManagementViewState(deviceId: $deviceId, isLoading: $isLoading, errorMessage: $errorMessage)';
+  return 'RemoteManagementViewState(deviceId: $deviceId, isLoading: $isLoading, isComplete: $isComplete, errorMessage: $errorMessage)';
 }


@@ -45,7 +45,7 @@ abstract mixin class $RemoteManagementViewStateCopyWith<$Res>  {
  factory $RemoteManagementViewStateCopyWith(RemoteManagementViewState value, $Res Function(RemoteManagementViewState) _then) = _$RemoteManagementViewStateCopyWithImpl;
@useResult
 $Res call({
- String deviceId, bool isLoading, String errorMessage
+ String deviceId, bool isLoading, bool isComplete, String errorMessage
 });


@@ -62,10 +62,11 @@ class _$RemoteManagementViewStateCopyWithImpl<$Res>

 /// Create a copy of RemoteManagementViewState
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? deviceId = null,Object? isLoading = null,Object? errorMessage = null,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? deviceId = null,Object? isLoading = null,Object? isComplete = null,Object? errorMessage = null,}) {
  return _then(_self.copyWith(
 deviceId: null == deviceId ? _self.deviceId : deviceId // ignore: cast_nullable_to_non_nullable
 as String,isLoading: null == isLoading ? _self.isLoading : isLoading // ignore: cast_nullable_to_non_nullable
+as bool,isComplete: null == isComplete ? _self.isComplete : isComplete // ignore: cast_nullable_to_non_nullable
 as bool,errorMessage: null == errorMessage ? _self.errorMessage : errorMessage // ignore: cast_nullable_to_non_nullable
 as String,
  ));
@@ -152,10 +153,10 @@ return $default(_that);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String deviceId,  bool isLoading,  String errorMessage)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String deviceId,  bool isLoading,  bool isComplete,  String errorMessage)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _RemoteManagementViewState() when $default != null:
-return $default(_that.deviceId,_that.isLoading,_that.errorMessage);case _:
+return $default(_that.deviceId,_that.isLoading,_that.isComplete,_that.errorMessage);case _:
  return orElse();

 }
@@ -173,10 +174,10 @@ return $default(_that.deviceId,_that.isLoading,_that.errorMessage);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String deviceId,  bool isLoading,  String errorMessage)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String deviceId,  bool isLoading,  bool isComplete,  String errorMessage)  $default,) {final _that = this;
 switch (_that) {
 case _RemoteManagementViewState():
-return $default(_that.deviceId,_that.isLoading,_that.errorMessage);case _:
+return $default(_that.deviceId,_that.isLoading,_that.isComplete,_that.errorMessage);case _:
  throw StateError('Unexpected subclass');

 }
@@ -193,10 +194,10 @@ return $default(_that.deviceId,_that.isLoading,_that.errorMessage);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String deviceId,  bool isLoading,  String errorMessage)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String deviceId,  bool isLoading,  bool isComplete,  String errorMessage)?  $default,) {final _that = this;
 switch (_that) {
 case _RemoteManagementViewState() when $default != null:
-return $default(_that.deviceId,_that.isLoading,_that.errorMessage);case _:
+return $default(_that.deviceId,_that.isLoading,_that.isComplete,_that.errorMessage);case _:
  return null;

 }
@@ -208,11 +209,12 @@ return $default(_that.deviceId,_that.isLoading,_that.errorMessage);case _:


 class _RemoteManagementViewState implements RemoteManagementViewState {
-  const _RemoteManagementViewState({this.deviceId = '', this.isLoading = true, this.errorMessage = ''});
+  const _RemoteManagementViewState({this.deviceId = '', this.isLoading = true, this.isComplete = true, this.errorMessage = ''});
  

@override@JsonKey() final  String deviceId;
@override@JsonKey() final  bool isLoading;
+@override@JsonKey() final  bool isComplete;
@override@JsonKey() final  String errorMessage;

 /// Create a copy of RemoteManagementViewState
@@ -225,16 +227,16 @@ _$RemoteManagementViewStateCopyWith<_RemoteManagementViewState> get copyWith =>

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _RemoteManagementViewState&&(identical(other.deviceId, deviceId) || other.deviceId == deviceId)&&(identical(other.isLoading, isLoading) || other.isLoading == isLoading)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _RemoteManagementViewState&&(identical(other.deviceId, deviceId) || other.deviceId == deviceId)&&(identical(other.isLoading, isLoading) || other.isLoading == isLoading)&&(identical(other.isComplete, isComplete) || other.isComplete == isComplete)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage));
 }


@override
-int get hashCode => Object.hash(runtimeType,deviceId,isLoading,errorMessage);
+int get hashCode => Object.hash(runtimeType,deviceId,isLoading,isComplete,errorMessage);

@override
 String toString() {
-  return 'RemoteManagementViewState(deviceId: $deviceId, isLoading: $isLoading, errorMessage: $errorMessage)';
+  return 'RemoteManagementViewState(deviceId: $deviceId, isLoading: $isLoading, isComplete: $isComplete, errorMessage: $errorMessage)';
 }


@@ -245,7 +247,7 @@ abstract mixin class _$RemoteManagementViewStateCopyWith<$Res> implements $Remot
  factory _$RemoteManagementViewStateCopyWith(_RemoteManagementViewState value, $Res Function(_RemoteManagementViewState) _then) = __$RemoteManagementViewStateCopyWithImpl;
@override @useResult
 $Res call({
- String deviceId, bool isLoading, String errorMessage
+ String deviceId, bool isLoading, bool isComplete, String errorMessage
 });


@@ -262,10 +264,11 @@ class __$RemoteManagementViewStateCopyWithImpl<$Res>

 /// Create a copy of RemoteManagementViewState
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? deviceId = null,Object? isLoading = null,Object? errorMessage = null,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? deviceId = null,Object? isLoading = null,Object? isComplete = null,Object? errorMessage = null,}) {
  return _then(_RemoteManagementViewState(
 deviceId: null == deviceId ? _self.deviceId : deviceId // ignore: cast_nullable_to_non_nullable
 as String,isLoading: null == isLoading ? _self.isLoading : isLoading // ignore: cast_nullable_to_non_nullable
+as bool,isComplete: null == isComplete ? _self.isComplete : isComplete // ignore: cast_nullable_to_non_nullable
 as bool,errorMessage: null == errorMessage ? _self.errorMessage : errorMessage // ignore: cast_nullable_to_non_nullable
 as String,
  ));
--- a/modules/legacy/modules/settings/lib/src/features/remote_management/presentation/widgets/confirm_dialog.dart
+++ b/modules/legacy/modules/settings/lib/src/features/remote_management/presentation/widgets/confirm_dialog.dart
@@ -31,12 +31,15 @@ class ConfirmDialog extends ConsumerWidget {
        mainAxisAlignment: MainAxisAlignment.spaceBetween,
        children: [
          Text(title,
+            textAlign: TextAlign.center,
            style: TextStyle(
              fontWeight: FontWeight.w500,
              fontSize: 16
            ),
          ),
-          Text(message),
+          Text(message,
+            textAlign: TextAlign.center,
+          ),
          Row(
            children: [
              Expanded(child: PrimaryButton(
--- a/modules/legacy/modules/settings/pubspec.lock
+++ b/modules/legacy/modules/settings/pubspec.lock
@@ -96,7 +96,7 @@ packages:
    source: hosted
    version: "3.0.3"
  build_runner:
-    dependency: "direct dev"
+    dependency: transitive
    description:
      name: build_runner
      sha256: b24597fceb695969d47025c958f3837f9f0122e237c6a22cb082a5ac66c3ca30
@@ -380,7 +380,7 @@ packages:
    source: hosted
    version: "3.3.1"
  flutter_svg:
-    dependency: transitive
+    dependency: "direct main"
    description:
      name: flutter_svg
      sha256: "1ded017b39c8e15c8948ea855070a5ff8ff8b3d5e83f3446e02d6bb12add7ad9"
@@ -1159,6 +1159,70 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.3.1"
+  url_launcher:
+    dependency: "direct main"
+    description:
+      name: url_launcher
+      sha256: f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.3.2"
+  url_launcher_android:
+    dependency: transitive
+    description:
+      name: url_launcher_android
+      sha256: "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.3.28"
+  url_launcher_ios:
+    dependency: transitive
+    description:
+      name: url_launcher_ios
+      sha256: cfde38aa257dae62ffe79c87fab20165dfdf6988c1d31b58ebf59b9106062aad
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.3.6"
+  url_launcher_linux:
+    dependency: transitive
+    description:
+      name: url_launcher_linux
+      sha256: d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.2.2"
+  url_launcher_macos:
+    dependency: transitive
+    description:
+      name: url_launcher_macos
+      sha256: "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.2.5"
+  url_launcher_platform_interface:
+    dependency: transitive
+    description:
+      name: url_launcher_platform_interface
+      sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.2"
+  url_launcher_web:
+    dependency: transitive
+    description:
+      name: url_launcher_web
+      sha256: "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
+  url_launcher_windows:
+    dependency: transitive
+    description:
+      name: url_launcher_windows
+      sha256: "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.5"
  utils:
    dependency: "direct main"
    description:
@@ -1167,7 +1231,7 @@ packages:
    source: path
    version: "0.0.1"
  uuid:
-    dependency: "direct main"
+    dependency: transitive
    description:
      name: uuid
      sha256: "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489"
--- a/modules/legacy/modules/settings/pubspec.yaml
+++ b/modules/legacy/modules/settings/pubspec.yaml
@@ -1,6 +1,20 @@
 name: settings
-description: "Settings module for legacy device management features."
+description: "A new Flutter project."

+# The following defines the version and build number for your application.
+# A version number is three numbers separated by dots, like 1.2.43
+# followed by an optional build number separated by a +.
+# Both the version and the builder number may be overridden in flutter
+# build by specifying --build-name and --build-number, respectively.
+# In Android, build-name is used as versionName while build-number used as versionCode.
+# Read more about Android versioning at https://developer.android.com/studio/publish/versioning
+# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
+# Read more about iOS versioning at
+# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
+#
+# This version is used _only_ for the Runner app, which is used if you just do
+# a `flutter run`. It has no impact on any other native host app that you embed
+# your Flutter project into.
 version: 1.0.0+1

 environment:
@@ -9,6 +23,8 @@ environment:
 dependencies:
  flutter:
    sdk: flutter
+  #modules dependencies go here
+
  #packages dependencies go here
  design_system:
    path: ../../../../packages/design_system
@@ -27,27 +43,75 @@ dependencies:
  sf_shared:
    path: ../../../../packages/sf_shared
  #dependencies go here
+  flutter_svg: ^2.2.1
  get_it: ^9.0.5
  go_router: ^17.0.0
  flutter_riverpod: ^3.0.3
  freezed_annotation: ^3.1.0
  freezed: ^3.2.3
+  dio: ^5.9.0
  json_annotation: ^4.9.0
  json_serializable: ^6.11.2
-  cupertino_icons: ^1.0.8
-  dio: ^5.8.0+1
-  uuid: ^4.5.1
+  url_launcher: ^6.3.2
  flutter_contacts: ^1.1.9+2

+  # The following adds the Cupertino Icons font to your application.
+  # Use with the CupertinoIcons class for iOS style icons.
+  cupertino_icons: ^1.0.8
+
 dev_dependencies:
  flutter_test:
    sdk: flutter
  flutter_lints: ^5.0.0
-  build_runner: ^2.4.15
+
+# For information on the generic Dart part of this file, see the
+# following page: https://dart.dev/tools/pub/pubspec

 flutter:
+  # The following line ensures that the Material Icons font is
+  # included with your application, so that you can use the icons in
+  # the material Icons class.
  uses-material-design: true

+  # To add Flutter specific assets to your application, add an assets section,
+  # like this:
+  # assets:
+  #   - images/a_dot_burr.jpeg
+  #   - images/a_dot_ham.jpeg
+
+  # An image asset can refer to one or more resolution-specific "variants", see
+  # https://flutter.dev/to/resolution-aware-images
+
+  # For details regarding adding assets from package dependencies, see
+  # https://flutter.dev/to/asset-from-package
+
+  # To add Flutter specific custom fonts to your application, add a fonts
+  # section here, in this "flutter" section. Each entry in this list should
+  # have a "family" key with the font family name, and a "fonts" key with a
+  # list giving the asset and other descriptors for the font. For
+  # example:
+  # fonts:
+  #   - family: Schyler
+  #     fonts:
+  #       - asset: fonts/Schyler-Regular.ttf
+  #       - asset: fonts/Schyler-Italic.ttf
+  #         style: italic
+  #   - family: Trajan Pro
+  #     fonts:
+  #       - asset: fonts/TrajanPro.ttf
+  #       - asset: fonts/TrajanPro_Bold.ttf
+  #         weight: 700
+  #
+  # For details regarding fonts from package dependencies,
+  # see https://flutter.dev/to/font-from-package
+
+
+  # This section identifies your Flutter project as a module meant for
+  # embedding in a native host app.  These identifiers should _not_ ordinarily
+  # be changed after generation - they are used to ensure that the tooling can
+  # maintain consistency when adding or modifying assets and plugins.
+  # They also do not have any bearing on your native host application's
+  # identifiers, which may be completely independent or the same as these.
  module:
    androidX: true
    androidPackage: com.example.settings
--- a/modules/legacy/packages/legacy_shared/lib/src/data/models/send_command_request_model.dart
+++ b/modules/legacy/packages/legacy_shared/lib/src/data/models/send_command_request_model.dart
@@ -4,10 +4,20 @@ part 'send_command_request_model.freezed.dart';
 part 'send_command_request_model.g.dart';

 enum DeviceCommand {
+  @JsonValue('CALL_CENTER')
+  callCenter,
+  @JsonValue('FACTORY')
+  factory,
  @JsonValue('FIND_DEVICE')
  findDevice,
+  @JsonValue('REQUEST_PHOTO')
+  requestPhoto,
+  @JsonValue('RESTART')
+  restart,
  @JsonValue('REWARDS')
  rewards,
+  @JsonValue('SHUTDOWN')
+  shutdown,
  @JsonValue('SOUND')
  sound,
 }
--- a/modules/legacy/packages/legacy_shared/lib/src/data/models/send_command_request_model.g.dart
+++ b/modules/legacy/packages/legacy_shared/lib/src/data/models/send_command_request_model.g.dart
@@ -23,7 +23,12 @@ Map<String, dynamic> _$SendCommandRequestModelToJson(
 };

 const _$DeviceCommandEnumMap = {
+  DeviceCommand.callCenter: 'CALL_CENTER',
+  DeviceCommand.factory: 'FACTORY',
  DeviceCommand.findDevice: 'FIND_DEVICE',
+  DeviceCommand.requestPhoto: 'REQUEST_PHOTO',
+  DeviceCommand.restart: 'RESTART',
  DeviceCommand.rewards: 'REWARDS',
+  DeviceCommand.shutdown: 'SHUTDOWN',
  DeviceCommand.sound: 'SOUND',
 };
--- a/modules/profile/lib/src/features/payout/presentation/payout_view_model.dart
+++ b/modules/profile/lib/src/features/payout/presentation/payout_view_model.dart
@@ -298,11 +298,13 @@ class PayoutViewModel extends Notifier<PayoutViewState> {
    try {
      final treezorRepo = ref.read(treezorRepositoryProvider);

-      final beneficiaryValidationId = await treezorRepo
+      final validation = await treezorRepo
          .validateTransactionBeneficiary(beneficiaryId: beneficiary.id);

      if (!ref.mounted) return;

+      final beneficiaryValidationId = validation.beneficiaryValidationId;
+
      final url = 'https://savefamily.sandbox.treezor.co/v1/payouts';
      final scaInput = {
        'url': url,
--- a/modules/splash/lib/src/presentation/splash_screen.dart
+++ b/modules/splash/lib/src/presentation/splash_screen.dart
@@ -70,7 +70,7 @@ class _SplashScreenState extends State<SplashScreen>
          controller: _controller,
          onLoaded: (composition) {
            _controller
-              ..duration = composition.duration
+              ..duration = composition.duration * 0.8
              ..forward();
          },
        ),
--- a/packages/flutter_treezor_entrust_sdk_bridge/.dart_tool/package_config.json
+++ b/packages/flutter_treezor_entrust_sdk_bridge/.dart_tool/package_config.json
@@ -3,163 +3,163 @@
  "packages": [
    {
      "name": "async",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/async-2.11.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.11.0",
      "packageUri": "lib/",
      "languageVersion": "2.18"
    },
    {
      "name": "boolean_selector",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/boolean_selector-2.1.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1",
      "packageUri": "lib/",
      "languageVersion": "2.17"
    },
    {
      "name": "characters",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/characters-1.4.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.4.0",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "clock",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/clock-1.1.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.2",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "collection",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/collection-1.19.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.19.1",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "fake_async",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/fake_async-1.3.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.3",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "flutter",
-      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/packages/flutter",
+      "rootUri": "file:///C:/Program%20Files/Flutter/packages/flutter",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "flutter_lints",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/flutter_lints-4.0.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_lints-4.0.0",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "flutter_test",
-      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/packages/flutter_test",
+      "rootUri": "file:///C:/Program%20Files/Flutter/packages/flutter_test",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "leak_tracker",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/leak_tracker-11.0.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/leak_tracker-11.0.2",
      "packageUri": "lib/",
      "languageVersion": "3.2"
    },
    {
      "name": "leak_tracker_flutter_testing",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.10",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.10",
      "packageUri": "lib/",
      "languageVersion": "3.2"
    },
    {
      "name": "leak_tracker_testing",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/leak_tracker_testing-3.0.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/leak_tracker_testing-3.0.2",
      "packageUri": "lib/",
      "languageVersion": "3.2"
    },
    {
      "name": "lints",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/lints-4.0.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/lints-4.0.0",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "matcher",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/matcher-0.12.17",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.17",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "material_color_utilities",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/material_color_utilities-0.11.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.11.1",
      "packageUri": "lib/",
      "languageVersion": "2.17"
    },
    {
      "name": "meta",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/meta-1.16.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.16.0",
      "packageUri": "lib/",
      "languageVersion": "2.12"
    },
    {
      "name": "path",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path-1.9.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.9.1",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "plugin_platform_interface",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/plugin_platform_interface-2.1.8",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/plugin_platform_interface-2.1.8",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "sky_engine",
-      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/bin/cache/pkg/sky_engine",
+      "rootUri": "file:///C:/Program%20Files/Flutter/bin/cache/pkg/sky_engine",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "source_span",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/source_span-1.10.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0",
      "packageUri": "lib/",
      "languageVersion": "2.18"
    },
    {
      "name": "stack_trace",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/stack_trace-1.12.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.12.1",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "stream_channel",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/stream_channel-2.1.4",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.4",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "string_scanner",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/string_scanner-1.3.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.3.0",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "term_glyph",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/term_glyph-1.2.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1",
      "packageUri": "lib/",
      "languageVersion": "2.12"
    },
    {
      "name": "test_api",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/test_api-0.7.6",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.7.6",
      "packageUri": "lib/",
      "languageVersion": "3.5"
    },
    {
      "name": "vector_math",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/vector_math-2.2.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.2.0",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "vm_service",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/vm_service-14.3.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/vm_service-14.3.0",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
@@ -172,7 +172,7 @@
  ],
  "generator": "pub",
  "generatorVersion": "3.9.2",
-  "flutterRoot": "file:///Users/juliandalcalaf/Development/flutter",
-  "flutterVersion": "3.35.7",
-  "pubCache": "file:///Users/juliandalcalaf/.pub-cache"
+  "flutterRoot": "file:///C:/Program%20Files/Flutter",
+  "flutterVersion": "3.35.6",
+  "pubCache": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache"
 }
--- a/packages/flutter_treezor_entrust_sdk_bridge/.dart_tool/version
+++ b/packages/flutter_treezor_entrust_sdk_bridge/.dart_tool/version
@@ -1 +1 @@
-3.35.7
+3.35.6
--- a/packages/flutter_treezor_entrust_sdk_bridge/android/build/com/entrust/antelop/antelop/maven-metadata.xml
+++ b/packages/flutter_treezor_entrust_sdk_bridge/android/build/com/entrust/antelop/antelop/maven-metadata.xml
@@ -7,6 +7,6 @@
    <versions>
      <version>2.6.4</version>
    </versions>
-    <lastUpdated>20260316000000</lastUpdated>
+    <lastUpdated>20260320000000</lastUpdated>
  </versioning>
 </metadata>
--- a/packages/flutter_treezor_entrust_sdk_bridge/android/build/com/entrust/antelop/antelop/maven-metadata.xml.md5
+++ b/packages/flutter_treezor_entrust_sdk_bridge/android/build/com/entrust/antelop/antelop/maven-metadata.xml.md5
@@ -1 +1 @@
-a0ed8b315dd3aaa92839422686f00f9d
+20c099fa5d73eb3667d91872fabb23b6
--- a/packages/flutter_treezor_entrust_sdk_bridge/android/build/com/entrust/antelop/antelop/maven-metadata.xml.sha1
+++ b/packages/flutter_treezor_entrust_sdk_bridge/android/build/com/entrust/antelop/antelop/maven-metadata.xml.sha1
@@ -1 +1 @@
-4888c373e3701bd965ce8ff0daaa19071f7d9a9e
+67c2ba6eea196d22403b194e8407fcca966416f6
--- a/packages/flutter_treezor_entrust_sdk_bridge/example/.dart_tool/package_config.json
+++ b/packages/flutter_treezor_entrust_sdk_bridge/example/.dart_tool/package_config.json
@@ -3,91 +3,91 @@
  "packages": [
    {
      "name": "async",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/async-2.11.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.11.0",
      "packageUri": "lib/",
      "languageVersion": "2.18"
    },
    {
      "name": "boolean_selector",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/boolean_selector-2.1.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1",
      "packageUri": "lib/",
      "languageVersion": "2.17"
    },
    {
      "name": "characters",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/characters-1.4.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.4.0",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "clock",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/clock-1.1.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.2",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "collection",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/collection-1.19.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.19.1",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "crypto",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/crypto-3.0.6",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/crypto-3.0.6",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "cupertino_icons",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/cupertino_icons-1.0.8",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/cupertino_icons-1.0.8",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "dio",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/dio-5.7.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/dio-5.7.0",
      "packageUri": "lib/",
      "languageVersion": "2.18"
    },
    {
      "name": "dio_web_adapter",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/dio_web_adapter-2.0.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/dio_web_adapter-2.0.0",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "fake_async",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/fake_async-1.3.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.3",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "file",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/file-7.0.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/file-7.0.0",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "flutter",
-      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/packages/flutter",
+      "rootUri": "file:///C:/Program%20Files/Flutter/packages/flutter",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "flutter_driver",
-      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/packages/flutter_driver",
+      "rootUri": "file:///C:/Program%20Files/Flutter/packages/flutter_driver",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "flutter_lints",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/flutter_lints-4.0.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_lints-4.0.0",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "flutter_test",
-      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/packages/flutter_test",
+      "rootUri": "file:///C:/Program%20Files/Flutter/packages/flutter_test",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
@@ -99,163 +99,163 @@
    },
    {
      "name": "fuchsia_remote_debug_protocol",
-      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/packages/fuchsia_remote_debug_protocol",
+      "rootUri": "file:///C:/Program%20Files/Flutter/packages/fuchsia_remote_debug_protocol",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "http_parser",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/http_parser-4.0.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/http_parser-4.0.2",
      "packageUri": "lib/",
      "languageVersion": "2.12"
    },
    {
      "name": "integration_test",
-      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/packages/integration_test",
+      "rootUri": "file:///C:/Program%20Files/Flutter/packages/integration_test",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "leak_tracker",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/leak_tracker-11.0.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/leak_tracker-11.0.2",
      "packageUri": "lib/",
      "languageVersion": "3.2"
    },
    {
      "name": "leak_tracker_flutter_testing",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.10",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.10",
      "packageUri": "lib/",
      "languageVersion": "3.2"
    },
    {
      "name": "leak_tracker_testing",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/leak_tracker_testing-3.0.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/leak_tracker_testing-3.0.2",
      "packageUri": "lib/",
      "languageVersion": "3.2"
    },
    {
      "name": "lints",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/lints-4.0.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/lints-4.0.0",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "matcher",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/matcher-0.12.17",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.17",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "material_color_utilities",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/material_color_utilities-0.11.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.11.1",
      "packageUri": "lib/",
      "languageVersion": "2.17"
    },
    {
      "name": "meta",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/meta-1.16.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.16.0",
      "packageUri": "lib/",
      "languageVersion": "2.12"
    },
    {
      "name": "path",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path-1.9.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.9.1",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "platform",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/platform-3.1.5",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/platform-3.1.5",
      "packageUri": "lib/",
      "languageVersion": "3.2"
    },
    {
      "name": "plugin_platform_interface",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/plugin_platform_interface-2.1.8",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/plugin_platform_interface-2.1.8",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "process",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/process-5.0.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/process-5.0.2",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "sky_engine",
-      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/bin/cache/pkg/sky_engine",
+      "rootUri": "file:///C:/Program%20Files/Flutter/bin/cache/pkg/sky_engine",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "source_span",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/source_span-1.10.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0",
      "packageUri": "lib/",
      "languageVersion": "2.18"
    },
    {
      "name": "stack_trace",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/stack_trace-1.12.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.12.1",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "stream_channel",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/stream_channel-2.1.4",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.4",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "string_scanner",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/string_scanner-1.3.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.3.0",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "sync_http",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/sync_http-0.3.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/sync_http-0.3.1",
      "packageUri": "lib/",
      "languageVersion": "2.12"
    },
    {
      "name": "term_glyph",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/term_glyph-1.2.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1",
      "packageUri": "lib/",
      "languageVersion": "2.12"
    },
    {
      "name": "test_api",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/test_api-0.7.6",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.7.6",
      "packageUri": "lib/",
      "languageVersion": "3.5"
    },
    {
      "name": "typed_data",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/typed_data-1.4.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/typed_data-1.4.0",
      "packageUri": "lib/",
      "languageVersion": "3.5"
    },
    {
      "name": "vector_math",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/vector_math-2.2.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.2.0",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "vm_service",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/vm_service-14.3.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/vm_service-14.3.0",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "web",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/web-1.1.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/web-1.1.0",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "webdriver",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/webdriver-3.0.4",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/webdriver-3.0.4",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
@@ -268,7 +268,7 @@
  ],
  "generator": "pub",
  "generatorVersion": "3.9.2",
-  "flutterRoot": "file:///Users/juliandalcalaf/Development/flutter",
-  "flutterVersion": "3.35.7",
-  "pubCache": "file:///Users/juliandalcalaf/.pub-cache"
+  "flutterRoot": "file:///C:/Program%20Files/Flutter",
+  "flutterVersion": "3.35.6",
+  "pubCache": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache"
 }
--- a/packages/flutter_treezor_entrust_sdk_bridge/example/.flutter-plugins-dependencies
+++ b/packages/flutter_treezor_entrust_sdk_bridge/example/.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":"/Users/juliandalcalaf/Desktop/apps/sf-app-platform/packages/flutter_treezor_entrust_sdk_bridge/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"integration_test","path":"/Users/juliandalcalaf/Development/flutter/packages/integration_test/","native_build":true,"dependencies":[],"dev_dependency":true}],"android":[{"name":"flutter_treezor_entrust_sdk_bridge","path":"/Users/juliandalcalaf/Desktop/apps/sf-app-platform/packages/flutter_treezor_entrust_sdk_bridge/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"integration_test","path":"/Users/juliandalcalaf/Development/flutter/packages/integration_test/","native_build":true,"dependencies":[],"dev_dependency":true}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_treezor_entrust_sdk_bridge","dependencies":[]},{"name":"integration_test","dependencies":[]}],"date_created":"2026-03-13 09:49:17.301395","version":"3.35.7","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":"C:\\\\dev\\\\sf-app-platform\\\\packages\\\\flutter_treezor_entrust_sdk_bridge\\\\","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"integration_test","path":"C:\\\\Program Files\\\\Flutter\\\\packages\\\\integration_test\\\\","native_build":true,"dependencies":[],"dev_dependency":true}],"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":"integration_test","path":"C:\\\\Program Files\\\\Flutter\\\\packages\\\\integration_test\\\\","native_build":true,"dependencies":[],"dev_dependency":true}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_treezor_entrust_sdk_bridge","dependencies":[]},{"name":"integration_test","dependencies":[]}],"date_created":"2026-03-16 09:33:20.855374","version":"3.35.6","swift_package_manager_enabled":{"ios":false,"macos":false}}
--- a/packages/flutter_treezor_entrust_sdk_bridge/example/android/local.properties
+++ b/packages/flutter_treezor_entrust_sdk_bridge/example/android/local.properties
@@ -1,3 +1,3 @@
-sdk.dir=/Users/juliandalcalaf/Library/Android/sdk
-flutter.sdk=/Users/juliandalcalaf/Development/flutter
+sdk.dir=C:\\dev\\sdk\\android
+flutter.sdk=C:\\Program Files\\Flutter
 flutter.buildMode=debug
--- a/packages/fonts/.dart_tool/package_config.json
+++ b/packages/fonts/.dart_tool/package_config.json
@@ -3,43 +3,43 @@
  "packages": [
    {
      "name": "characters",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/characters-1.4.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.4.0",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "collection",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/collection-1.19.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.19.1",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "flutter",
-      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/packages/flutter",
+      "rootUri": "file:///C:/Program%20Files/Flutter/packages/flutter",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "material_color_utilities",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/material_color_utilities-0.11.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.11.1",
      "packageUri": "lib/",
      "languageVersion": "2.17"
    },
    {
      "name": "meta",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/meta-1.16.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.16.0",
      "packageUri": "lib/",
      "languageVersion": "2.12"
    },
    {
      "name": "sky_engine",
-      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/bin/cache/pkg/sky_engine",
+      "rootUri": "file:///C:/Program%20Files/Flutter/bin/cache/pkg/sky_engine",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "vector_math",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/vector_math-2.2.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.2.0",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
@@ -52,7 +52,7 @@
  ],
  "generator": "pub",
  "generatorVersion": "3.9.2",
-  "flutterRoot": "file:///Users/juliandalcalaf/Development/flutter",
-  "flutterVersion": "3.35.7",
-  "pubCache": "file:///Users/juliandalcalaf/.pub-cache"
+  "flutterRoot": "file:///C:/Program%20Files/Flutter",
+  "flutterVersion": "3.35.6",
+  "pubCache": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache"
 }
--- a/packages/fonts/.dart_tool/version
+++ b/packages/fonts/.dart_tool/version
@@ -1 +1 @@
-3.35.7
+3.35.6
--- a/packages/payments/.dart_tool/package_config.json
+++ b/packages/payments/.dart_tool/package_config.json
@@ -3,211 +3,211 @@
  "packages": [
    {
      "name": "_fe_analyzer_shared",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/_fe_analyzer_shared-85.0.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/_fe_analyzer_shared-85.0.0",
      "packageUri": "lib/",
      "languageVersion": "3.5"
    },
    {
      "name": "analyzer",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/analyzer-7.6.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/analyzer-7.6.0",
      "packageUri": "lib/",
      "languageVersion": "3.5"
    },
    {
      "name": "analyzer_buffer",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/analyzer_buffer-0.1.10",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/analyzer_buffer-0.1.10",
      "packageUri": "lib/",
      "languageVersion": "3.6"
    },
    {
      "name": "analyzer_plugin",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/analyzer_plugin-0.13.4",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/analyzer_plugin-0.13.4",
      "packageUri": "lib/",
      "languageVersion": "3.5"
    },
    {
      "name": "archive",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/archive-4.0.9",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/archive-4.0.9",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "args",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/args-2.7.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/args-2.7.0",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "async",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/async-2.13.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.13.0",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "boolean_selector",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/boolean_selector-2.1.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.2",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "build",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/build-3.1.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/build-3.1.0",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "build_config",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/build_config-1.2.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/build_config-1.2.0",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "build_daemon",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/build_daemon-4.1.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/build_daemon-4.1.1",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "build_resolvers",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/build_resolvers-3.0.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/build_resolvers-3.0.3",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "build_runner",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/build_runner-2.7.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/build_runner-2.7.1",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "build_runner_core",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/build_runner_core-9.3.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/build_runner_core-9.3.1",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "built_collection",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/built_collection-5.1.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/built_collection-5.1.1",
      "packageUri": "lib/",
      "languageVersion": "2.12"
    },
    {
      "name": "built_value",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/built_value-8.12.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/built_value-8.12.3",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "characters",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/characters-1.4.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.4.0",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "checked_yaml",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/checked_yaml-2.0.4",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/checked_yaml-2.0.4",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "ci",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/ci-0.1.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/ci-0.1.0",
      "packageUri": "lib/",
      "languageVersion": "2.12"
    },
    {
      "name": "cli_config",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/cli_config-0.2.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/cli_config-0.2.0",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "cli_util",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/cli_util-0.4.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/cli_util-0.4.2",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "clock",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/clock-1.1.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.2",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "code_builder",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/code_builder-4.11.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/code_builder-4.11.1",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "collection",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/collection-1.19.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.19.1",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "confetti",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/confetti-0.7.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/confetti-0.7.0",
      "packageUri": "lib/",
      "languageVersion": "2.17"
    },
    {
      "name": "convert",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/convert-3.1.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/convert-3.1.2",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "cookie_jar",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/cookie_jar-4.0.8",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/cookie_jar-4.0.8",
      "packageUri": "lib/",
      "languageVersion": "2.15"
    },
    {
      "name": "country_code_picker",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/country_code_picker-3.4.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/country_code_picker-3.4.1",
      "packageUri": "lib/",
      "languageVersion": "2.17"
    },
    {
      "name": "coverage",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/coverage-1.15.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/coverage-1.15.0",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "crypto",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/crypto-3.0.7",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/crypto-3.0.7",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "custom_lint",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/custom_lint-0.8.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/custom_lint-0.8.0",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "custom_lint_builder",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/custom_lint_builder-0.8.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/custom_lint_builder-0.8.0",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "custom_lint_core",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/custom_lint_core-0.8.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/custom_lint_core-0.8.0",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "custom_lint_visitor",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/custom_lint_visitor-1.0.0+7.7.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/custom_lint_visitor-1.0.0+7.7.0",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "dart_style",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/dart_style-3.1.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/dart_style-3.1.1",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
@@ -219,79 +219,79 @@
    },
    {
      "name": "diacritic",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/diacritic-0.1.6",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/diacritic-0.1.6",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "dio",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/dio-5.9.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/dio-5.9.1",
      "packageUri": "lib/",
      "languageVersion": "2.18"
    },
    {
      "name": "dio_cookie_manager",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/dio_cookie_manager-3.3.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/dio_cookie_manager-3.3.0",
      "packageUri": "lib/",
      "languageVersion": "2.18"
    },
    {
      "name": "dio_web_adapter",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/dio_web_adapter-2.1.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/dio_web_adapter-2.1.1",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "fake_async",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/fake_async-1.3.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.3",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "ffi",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/ffi-2.2.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/ffi-2.2.0",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "file",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/file-7.0.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/file-7.0.1",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "fixnum",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/fixnum-1.1.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/fixnum-1.1.1",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "flutter",
-      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/packages/flutter",
+      "rootUri": "file:///C:/Program%20Files/Flutter/packages/flutter",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "flutter_lints",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/flutter_lints-5.0.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_lints-5.0.0",
      "packageUri": "lib/",
      "languageVersion": "3.5"
    },
    {
      "name": "flutter_riverpod",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/flutter_riverpod-3.0.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_riverpod-3.0.3",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "flutter_test",
-      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/packages/flutter_test",
+      "rootUri": "file:///C:/Program%20Files/Flutter/packages/flutter_test",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "flutter_web_plugins",
-      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/packages/flutter_web_plugins",
+      "rootUri": "file:///C:/Program%20Files/Flutter/packages/flutter_web_plugins",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
@@ -303,163 +303,163 @@
    },
    {
      "name": "freezed",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/freezed-3.2.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/freezed-3.2.3",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "freezed_annotation",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/freezed_annotation-3.1.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/freezed_annotation-3.1.0",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "frontend_server_client",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/frontend_server_client-4.0.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/frontend_server_client-4.0.0",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "get_it",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/get_it-9.2.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/get_it-9.2.0",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "glob",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/glob-2.1.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/glob-2.1.3",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "go_router",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/go_router-17.1.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/go_router-17.1.0",
      "packageUri": "lib/",
      "languageVersion": "3.9"
    },
    {
      "name": "graphs",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/graphs-2.3.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/graphs-2.3.2",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "hotreloader",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/hotreloader-4.3.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/hotreloader-4.3.0",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "http",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/http-1.6.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/http-1.6.0",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "http_multi_server",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/http_multi_server-3.2.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/http_multi_server-3.2.2",
      "packageUri": "lib/",
      "languageVersion": "3.2"
    },
    {
      "name": "http_parser",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/http_parser-4.1.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/http_parser-4.1.2",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "intl",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/intl-0.20.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/intl-0.20.2",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "io",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/io-1.0.5",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/io-1.0.5",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "js",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/js-0.7.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/js-0.7.2",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "json_annotation",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/json_annotation-4.9.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/json_annotation-4.9.0",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "json_serializable",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/json_serializable-6.11.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/json_serializable-6.11.2",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "leak_tracker",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/leak_tracker-11.0.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/leak_tracker-11.0.2",
      "packageUri": "lib/",
      "languageVersion": "3.2"
    },
    {
      "name": "leak_tracker_flutter_testing",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.10",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.10",
      "packageUri": "lib/",
      "languageVersion": "3.2"
    },
    {
      "name": "leak_tracker_testing",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/leak_tracker_testing-3.0.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/leak_tracker_testing-3.0.2",
      "packageUri": "lib/",
      "languageVersion": "3.2"
    },
    {
      "name": "lints",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/lints-5.1.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/lints-5.1.1",
      "packageUri": "lib/",
      "languageVersion": "3.6"
    },
    {
      "name": "logging",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/logging-1.3.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/logging-1.3.0",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "lottie",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/lottie-3.3.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/lottie-3.3.2",
      "packageUri": "lib/",
      "languageVersion": "3.9"
    },
    {
      "name": "matcher",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/matcher-0.12.17",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.17",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "material_color_utilities",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/material_color_utilities-0.11.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.11.1",
      "packageUri": "lib/",
      "languageVersion": "2.17"
    },
    {
      "name": "meta",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/meta-1.16.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.16.0",
      "packageUri": "lib/",
      "languageVersion": "2.12"
    },
    {
      "name": "mime",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/mime-2.0.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/mime-2.0.0",
      "packageUri": "lib/",
      "languageVersion": "3.2"
    },
    {
      "name": "mockito",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/mockito-5.5.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/mockito-5.5.0",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
@@ -471,127 +471,127 @@
    },
    {
      "name": "node_preamble",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/node_preamble-2.0.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/node_preamble-2.0.2",
      "packageUri": "lib/",
      "languageVersion": "2.12"
    },
    {
      "name": "package_config",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/package_config-2.2.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/package_config-2.2.0",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "path",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path-1.9.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.9.1",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "path_provider",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider-2.1.5",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider-2.1.5",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "path_provider_android",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_android-2.2.22",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_android-2.2.22",
      "packageUri": "lib/",
      "languageVersion": "3.9"
    },
    {
      "name": "path_provider_foundation",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_foundation-2.5.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_foundation-2.5.1",
      "packageUri": "lib/",
      "languageVersion": "3.9"
    },
    {
      "name": "path_provider_linux",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_linux-2.2.1",
      "packageUri": "lib/",
      "languageVersion": "2.19"
    },
    {
      "name": "path_provider_platform_interface",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_platform_interface-2.1.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_platform_interface-2.1.2",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "path_provider_windows",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_windows-2.3.0",
      "packageUri": "lib/",
      "languageVersion": "3.2"
    },
    {
      "name": "platform",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/platform-3.1.6",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/platform-3.1.6",
      "packageUri": "lib/",
      "languageVersion": "3.2"
    },
    {
      "name": "plugin_platform_interface",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/plugin_platform_interface-2.1.8",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/plugin_platform_interface-2.1.8",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "pool",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/pool-1.5.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/pool-1.5.2",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "posix",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/posix-6.5.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/posix-6.5.0",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "pub_semver",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/pub_semver-2.2.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/pub_semver-2.2.0",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "pubspec_parse",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/pubspec_parse-1.5.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/pubspec_parse-1.5.0",
      "packageUri": "lib/",
      "languageVersion": "3.6"
    },
    {
      "name": "riverpod",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/riverpod-3.0.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/riverpod-3.0.3",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "riverpod_analyzer_utils",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/riverpod_analyzer_utils-1.0.0-dev.7",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/riverpod_analyzer_utils-1.0.0-dev.7",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "riverpod_annotation",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/riverpod_annotation-3.0.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/riverpod_annotation-3.0.3",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "riverpod_generator",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/riverpod_generator-3.0.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/riverpod_generator-3.0.3",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "riverpod_lint",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/riverpod_lint-3.0.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/riverpod_lint-3.0.3",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "rxdart",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/rxdart-0.28.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/rxdart-0.28.0",
      "packageUri": "lib/",
      "languageVersion": "2.12"
    },
@@ -609,181 +609,181 @@
    },
    {
      "name": "shared_preferences",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences-2.5.4",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shared_preferences-2.5.4",
      "packageUri": "lib/",
      "languageVersion": "3.9"
    },
    {
      "name": "shared_preferences_android",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences_android-2.4.20",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shared_preferences_android-2.4.20",
      "packageUri": "lib/",
      "languageVersion": "3.9"
    },
    {
      "name": "shared_preferences_foundation",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.6",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shared_preferences_foundation-2.5.6",
      "packageUri": "lib/",
      "languageVersion": "3.9"
    },
    {
      "name": "shared_preferences_linux",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.4.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shared_preferences_linux-2.4.1",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "shared_preferences_platform_interface",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences_platform_interface-2.4.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shared_preferences_platform_interface-2.4.1",
      "packageUri": "lib/",
      "languageVersion": "3.2"
    },
    {
      "name": "shared_preferences_web",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences_web-2.4.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shared_preferences_web-2.4.3",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "shared_preferences_windows",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.4.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shared_preferences_windows-2.4.1",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "shelf",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shelf-1.4.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shelf-1.4.2",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "shelf_packages_handler",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shelf_packages_handler-3.0.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shelf_packages_handler-3.0.2",
      "packageUri": "lib/",
      "languageVersion": "2.17"
    },
    {
      "name": "shelf_static",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shelf_static-1.1.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shelf_static-1.1.3",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "shelf_web_socket",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/shelf_web_socket-3.0.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/shelf_web_socket-3.0.0",
      "packageUri": "lib/",
      "languageVersion": "3.5"
    },
    {
      "name": "sky_engine",
-      "rootUri": "file:///Users/juliandalcalaf/Development/flutter/bin/cache/pkg/sky_engine",
+      "rootUri": "file:///C:/Program%20Files/Flutter/bin/cache/pkg/sky_engine",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "source_gen",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/source_gen-3.1.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/source_gen-3.1.0",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "source_helper",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/source_helper-1.3.8",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/source_helper-1.3.8",
      "packageUri": "lib/",
      "languageVersion": "3.7"
    },
    {
      "name": "source_map_stack_trace",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/source_map_stack_trace-2.1.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/source_map_stack_trace-2.1.2",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "source_maps",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/source_maps-0.10.13",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/source_maps-0.10.13",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "source_span",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/source_span-1.10.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.2",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "stack_trace",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/stack_trace-1.12.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.12.1",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "state_notifier",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/state_notifier-1.0.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/state_notifier-1.0.0",
      "packageUri": "lib/",
      "languageVersion": "2.12"
    },
    {
      "name": "stream_channel",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/stream_channel-2.1.4",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.4",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "stream_transform",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/stream_transform-2.1.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/stream_transform-2.1.1",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "string_scanner",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/string_scanner-1.4.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.4.1",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "term_glyph",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/term_glyph-1.2.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.2",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "test",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/test-1.26.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/test-1.26.2",
      "packageUri": "lib/",
      "languageVersion": "3.5"
    },
    {
      "name": "test_api",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/test_api-0.7.6",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.7.6",
      "packageUri": "lib/",
      "languageVersion": "3.5"
    },
    {
      "name": "test_core",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/test_core-0.6.11",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/test_core-0.6.11",
      "packageUri": "lib/",
      "languageVersion": "3.5"
    },
    {
      "name": "timing",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/timing-1.0.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/timing-1.0.2",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "top_snackbar_flutter",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/top_snackbar_flutter-3.3.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/top_snackbar_flutter-3.3.0",
      "packageUri": "lib/",
      "languageVersion": "2.15"
    },
    {
      "name": "typed_data",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/typed_data-1.4.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/typed_data-1.4.0",
      "packageUri": "lib/",
      "languageVersion": "3.5"
    },
    {
      "name": "universal_io",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/universal_io-2.3.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/universal_io-2.3.1",
      "packageUri": "lib/",
      "languageVersion": "3.6"
    },
@@ -795,85 +795,85 @@
    },
    {
      "name": "uuid",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/uuid-4.5.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/uuid-4.5.2",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "vector_math",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/vector_math-2.2.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.2.0",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "vm_service",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/vm_service-15.0.2",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/vm_service-15.0.2",
      "packageUri": "lib/",
      "languageVersion": "3.5"
    },
    {
      "name": "watcher",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/watcher-1.2.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/watcher-1.2.1",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "web",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/web-1.1.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/web-1.1.1",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "web_socket",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/web_socket-1.0.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/web_socket-1.0.1",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "web_socket_channel",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/web_socket_channel-3.0.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/web_socket_channel-3.0.3",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "webkit_inspection_protocol",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/webkit_inspection_protocol-1.2.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/webkit_inspection_protocol-1.2.1",
      "packageUri": "lib/",
      "languageVersion": "3.0"
    },
    {
      "name": "webview_flutter",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/webview_flutter-4.13.1",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/webview_flutter-4.13.1",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "webview_flutter_android",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/webview_flutter_android-4.10.11",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/webview_flutter_android-4.10.11",
      "packageUri": "lib/",
      "languageVersion": "3.9"
    },
    {
      "name": "webview_flutter_platform_interface",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/webview_flutter_platform_interface-2.14.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/webview_flutter_platform_interface-2.14.0",
      "packageUri": "lib/",
      "languageVersion": "3.6"
    },
    {
      "name": "webview_flutter_wkwebview",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/webview_flutter_wkwebview-3.23.6",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/webview_flutter_wkwebview-3.23.6",
      "packageUri": "lib/",
      "languageVersion": "3.9"
    },
    {
      "name": "xdg_directories",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/xdg_directories-1.1.0",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/xdg_directories-1.1.0",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "yaml",
-      "rootUri": "file:///Users/juliandalcalaf/.pub-cache/hosted/pub.dev/yaml-3.1.3",
+      "rootUri": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache/hosted/pub.dev/yaml-3.1.3",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
@@ -886,7 +886,7 @@
  ],
  "generator": "pub",
  "generatorVersion": "3.9.2",
-  "flutterRoot": "file:///Users/juliandalcalaf/Development/flutter",
-  "flutterVersion": "3.35.7",
-  "pubCache": "file:///Users/juliandalcalaf/.pub-cache"
+  "flutterRoot": "file:///C:/Program%20Files/Flutter",
+  "flutterVersion": "3.35.6",
+  "pubCache": "file:///C:/Users/Aitor%20Arana/AppData/Local/Pub/Cache"
 }
--- a/packages/payments/.dart_tool/version
+++ b/packages/payments/.dart_tool/version
@@ -1 +1 @@
-3.35.7
+3.35.6
--- a/packages/payments/.flutter-plugins-dependencies
+++ b/packages/payments/.flutter-plugins-dependencies
@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"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},{"name":"webview_flutter_wkwebview","path":"/Users/juliandalcalaf/.pub-cache/hosted/pub.dev/webview_flutter_wkwebview-3.23.6/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false}],"android":[{"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},{"name":"webview_flutter_android","path":"/Users/juliandalcalaf/.pub-cache/hosted/pub.dev/webview_flutter_android-4.10.11/","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},{"name":"webview_flutter_wkwebview","path":"/Users/juliandalcalaf/.pub-cache/hosted/pub.dev/webview_flutter_wkwebview-3.23.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":"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"]},{"name":"webview_flutter","dependencies":["webview_flutter_android","webview_flutter_wkwebview"]},{"name":"webview_flutter_android","dependencies":[]},{"name":"webview_flutter_wkwebview","dependencies":[]}],"date_created":"2026-03-13 09:49:21.741790","version":"3.35.7","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":"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},{"name":"webview_flutter_wkwebview","path":"C:\\\\Users\\\\Aitor Arana\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\webview_flutter_wkwebview-3.23.6\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false}],"android":[{"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},{"name":"webview_flutter_android","path":"C:\\\\Users\\\\Aitor Arana\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\webview_flutter_android-4.10.11\\\\","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},{"name":"webview_flutter_wkwebview","path":"C:\\\\Users\\\\Aitor Arana\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\webview_flutter_wkwebview-3.23.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":"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"]},{"name":"webview_flutter","dependencies":["webview_flutter_android","webview_flutter_wkwebview"]},{"name":"webview_flutter_android","dependencies":[]},{"name":"webview_flutter_wkwebview","dependencies":[]}],"date_created":"2026-03-16 09:33:26.998435","version":"3.35.6","swift_package_manager_enabled":{"ios":false,"macos":false}}
--- a/packages/sf_infrastructure/lib/src/network/treezor_token_interceptor.dart
+++ b/packages/sf_infrastructure/lib/src/network/treezor_token_interceptor.dart
@@ -16,16 +16,19 @@ class TreezorTokenInterceptor extends Interceptor {
  @override
  void onError(DioException err, ErrorInterceptorHandler handler) {
    if (!_handling) {
-      final message = _extractApiMessage(err.response?.data);
-      if (message != null && message.contains('Treezor Token Expired')) {
-        _handling = true;
-        _onTokenExpired();
-        Future.delayed(const Duration(seconds: 2), () => _handling = false);
-      } else if (err.response?.statusCode == 500) {
-        _handling = true;
-        _onTokenExpired();
-        Future.delayed(const Duration(seconds: 2), () => _handling = false);
-      } else if (err.response?.statusCode == 401) {
+      // final message = _extractApiMessage(err.response?.data);
+      // if (message != null && message.contains('Treezor Token Expired')) {
+      //   _handling = true;
+      //   _onTokenExpired();
+      //   Future.delayed(const Duration(seconds: 2), () => _handling = false);
+      // }
+      // else if (err.response?.statusCode == 500) {
+      //   _handling = true;
+      //   _onTokenExpired();
+      //   Future.delayed(const Duration(seconds: 2), () => _handling = false);
+      // }
+      // else
+      if (err.response?.statusCode == 401) {
        _handling = true;
        _onUnauthorized();
        Future.delayed(const Duration(seconds: 2), () => _handling = false);
--- a/packages/sf_localizations/assets/l10n/de.json
+++ b/packages/sf_localizations/assets/l10n/de.json
@@ -273,8 +273,17 @@
  "transactionCheckRefund": "Scheckerstattung",
  "transactionSctr": "Banküberweisung",
  "transactionCreditInternationalTransfer": "Auslandsüberweisung",
+  "transactionBankDirectDebit": "Lastschrift",
+  "transactionBankTransfer": "Banküberweisung",
+  "transactionCardTopup": "Kartenaufladung",
+  "transactionCheck": "Scheck",
+  "transactionCreditNote": "Gutschrift",
+  "transactionFees": "Gebühren",
+  "transactionInstantBankTransfer": "Sofortüberweisung",
+  "transactionWalletTransfer": "Kontotransfer",
  "transactionUnknown": "Bewegung",
  "loadMore": "Mehr laden",
+  "transactionsShown": "Bewegungen",

  "profileAccountSettings": "Kontoeinstellungen",
  "profileWithdrawMoney": "Geld vom Wallet abheben",
@@ -382,6 +391,9 @@
  "deleteDeviceConfirmTitle": "Gerät löschen?",
  "deleteDeviceConfirmMessage": "Diese Aktion kann nicht rückgängig gemacht werden. Bist du sicher, dass du dieses Gerät löschen möchtest?",
  "deleteDeviceSuccess": "Gerät erfolgreich gelöscht",
+  "deleteDeviceNotAllowedTitle": "Löschen nicht möglich",
+  "deleteDeviceChecking": "Überprüfung...",
+  "deleteDeviceWalletNonZeroBalance": "Das Profil kann nicht gelöscht werden, da das Wallet ein verfügbares Guthaben hat",

  "limitsSave": "Limits speichern",
  "limitsSpendingTitle": "Ausgabenlimits setzen",
@@ -473,6 +485,13 @@
  "profileSettingsLogoutConfirm": "Sind Sie sicher, dass Sie sich abmelden möchten?",
  "profileSettingsLogoutError": "Fehler beim Abmelden",
  "profileSettingsSave": "Änderungen speichern",
+  "profileSettingsSaveSuccess": "Änderungen erfolgreich gespeichert",
+  "profileSettingsLastName": "Nachname",
+  "profileSettingsStreet": "Straße",
+  "profileSettingsCity": "Stadt",
+  "profileSettingsProvince": "Provinz",
+  "profileSettingsState": "Bundesland",
+  "profileSettingsPostCode": "Postleitzahl",

  "dashboardTabHome": "Startseite",
  "dashboardTabActivity": "Aktivität",
@@ -501,7 +520,7 @@
  "scheduledActivityStartTime": "Beginn",
  "scheduledActivityEndTime": "Ende",
  "scheduledActivityStartBeforeEnd": "Die Startzeit muss vor der Endzeit liegen",
-  "scheduledActivityOverlap": "Überschneidung mit „{name}" ({time})",
+  "scheduledActivityOverlap": "Überschneidung mit „{name}\" ({time})",
  "scheduledActivityNewTitle": "Neue Aktivität",
  "scheduledActivityEditTitle": "Aktivität bearbeiten",
  "scheduledActivityDeleteTitle": "Aktivität löschen",
@@ -575,23 +594,7 @@
  "wifiBssid": "MAC-Adresse (BSSID)",
  "wifiSsidHint": "z.B. MeinHeimWLAN",
  "wifiBssidHint": "z.B. 0c:80:63:e4:cb:e1",
-  "transactionBankDirectDebit": "Lastschrift",
-  "transactionBankTransfer": "Banküberweisung",
-  "transactionCardTopup": "Kartenaufladung",
-  "transactionCheck": "Scheck",
-  "transactionCreditNote": "Gutschrift",
-  "transactionFees": "Gebühren",
-  "transactionInstantBankTransfer": "Sofortüberweisung",
-  "transactionWalletTransfer": "Kontotransfer",
  "editChildProfile": "Profil bearbeiten",
-  "editChildProfileSaveSuccess": "Kinderprofil erfolgreich aktualisiert",
  "editChildProfileTitle": "Kinderprofil bearbeiten",
-  "deleteDeviceChecking": "Überprüfung...",
-  "deleteDeviceNotAllowedTitle": "Löschen nicht möglich",
-  "deleteDeviceWalletNonZeroBalance": "Das Profil kann nicht gelöscht werden, da das Wallet ein verfügbares Guthaben hat",
-  "profileSettingsCity": "Stadt",
-  "profileSettingsLastName": "Nachname",
-  "profileSettingsPostCode": "Postleitzahl",
-  "profileSettingsStreet": "Straße",
-  "profileSettingsSaveSuccess": "Änderungen erfolgreich gespeichert"
+  "editChildProfileSaveSuccess": "Kinderprofil erfolgreich aktualisiert"
 }
--- a/packages/sf_localizations/assets/l10n/en.json
+++ b/packages/sf_localizations/assets/l10n/en.json
@@ -266,8 +266,17 @@
  "transactionCheckRefund": "Check refund",
  "transactionSctr": "Credit transfer",
  "transactionCreditInternationalTransfer": "International transfer",
+  "transactionBankDirectDebit": "Direct debit",
+  "transactionBankTransfer": "Bank transfer",
+  "transactionCardTopup": "Card top-up",
+  "transactionCheck": "Check",
+  "transactionCreditNote": "Credit note",
+  "transactionFees": "Fees",
+  "transactionInstantBankTransfer": "Instant transfer",
+  "transactionWalletTransfer": "Wallet transfer",
  "transactionUnknown": "Transaction",
  "loadMore": "Load more",
+  "transactionsShown": "transactions",
  "profileAccountSettings": "Account settings",
  "profileWithdrawMoney": "Withdraw money from wallet",
  "profileNoRecentTransactions": "No recent transactions",
@@ -364,6 +373,9 @@
  "deleteDeviceConfirmTitle": "Delete device?",
  "deleteDeviceConfirmMessage": "This action cannot be undone. Are you sure you want to delete this device?",
  "deleteDeviceSuccess": "Device deleted successfully",
+  "deleteDeviceNotAllowedTitle": "Cannot delete",
+  "deleteDeviceChecking": "Checking...",
+  "deleteDeviceWalletNonZeroBalance": "Cannot delete the profile because the wallet has a non-zero balance",
  "limitsSave": "Save limits",
  "limitsSpendingTitle": "Set spending limits",
  "limitsSpendingSubtitle": "Freedom for them, peace of mind for you",
@@ -452,6 +464,13 @@
  "profileSettingsLogoutConfirm": "Are you sure you want to log out?",
  "profileSettingsLogoutError": "Error logging out",
  "profileSettingsSave": "Save changes",
+  "profileSettingsSaveSuccess": "Changes saved successfully",
+  "profileSettingsLastName": "Last name",
+  "profileSettingsStreet": "Street",
+  "profileSettingsCity": "City",
+  "profileSettingsProvince": "Province",
+  "profileSettingsState": "State",
+  "profileSettingsPostCode": "Post code",
  "dashboardTabHome": "Home",
  "dashboardTabActivity": "Activity",
  "dashboardTabNotifications": "Notifications",
@@ -563,7 +582,7 @@
  "deviceSetup_weightHint": "30",
  "deviceSetup_heightLabel": "Height (cm)",
  "deviceSetup_heightHint": "120",
-  "activationKeyLabel": "Activation key",
+  "activationKeyLabel": "Activation key (check your email)",
  "rewardsMessage": "*Using this feature you can reward your child for goals achieved or good actions.",
  "sendRewards": "Send rewards!",
  "rewardsSent": "Rewards sent!",
@@ -684,23 +703,9 @@
  "wifiBssid": "MAC address (BSSID)",
  "wifiSsidHint": "e.g. MyHomeWiFi",
  "wifiBssidHint": "e.g. 0c:80:63:e4:cb:e1",
-  "transactionBankDirectDebit": "Direct debit",
-  "transactionBankTransfer": "Bank transfer",
-  "transactionCardTopup": "Card top-up",
-  "transactionCheck": "Check",
-  "transactionCreditNote": "Credit note",
-  "transactionFees": "Fees",
-  "transactionInstantBankTransfer": "Instant transfer",
-  "transactionWalletTransfer": "Wallet transfer",
  "editChildProfile": "Edit profile",
  "editChildProfileSaveSuccess": "Child profile updated successfully",
  "editChildProfileTitle": "Edit child profile",
-  "deleteDeviceChecking": "Checking...",
-  "deleteDeviceNotAllowedTitle": "Cannot delete",
-  "deleteDeviceWalletNonZeroBalance": "Cannot delete the profile because the wallet has a non-zero balance",
-  "profileSettingsCity": "City",
-  "profileSettingsLastName": "Last name",
-  "profileSettingsPostCode": "Post code",
-  "profileSettingsStreet": "Street",
-  "profileSettingsSaveSuccess": "Changes saved successfully"
+  "activationCodeMessage": "An activation key has been sent to your email",
+  "photoTaken": "Photo taken successfully"
 }
--- a/packages/sf_localizations/assets/l10n/es.json
+++ b/packages/sf_localizations/assets/l10n/es.json
@@ -266,8 +266,17 @@
  "transactionCheckRefund": "Reembolso de cheque",
  "transactionSctr": "Transferencia bancaria",
  "transactionCreditInternationalTransfer": "Transferencia internacional",
+  "transactionBankDirectDebit": "Domiciliación bancaria",
+  "transactionBankTransfer": "Transferencia bancaria",
+  "transactionCardTopup": "Recarga con tarjeta",
+  "transactionCheck": "Cheque",
+  "transactionCreditNote": "Nota de crédito",
+  "transactionFees": "Comisiones",
+  "transactionInstantBankTransfer": "Transferencia instantánea",
+  "transactionWalletTransfer": "Transferencia entre cuentas",
  "transactionUnknown": "Movimiento",
  "loadMore": "Cargar más",
+  "transactionsShown": "movimientos",
  "profileAccountSettings": "Ajustes de la cuenta",
  "profileWithdrawMoney": "Retirar dinero del wallet",
  "profileNoRecentTransactions": "No hay movimientos recientes",
@@ -363,6 +372,9 @@
  "deleteDeviceConfirmTitle": "¿Eliminar dispositivo?",
  "deleteDeviceConfirmMessage": "Esta acción no se puede deshacer. ¿Estás seguro de que quieres eliminar este dispositivo?",
  "deleteDeviceSuccess": "Dispositivo eliminado correctamente",
+  "deleteDeviceNotAllowedTitle": "No se puede eliminar",
+  "deleteDeviceChecking": "Comprobando...",
+  "deleteDeviceWalletNonZeroBalance": "No se puede eliminar el perfil porque la cartera tiene saldo disponible",
  "limitsSave": "Guardar límites",
  "limitsSpendingTitle": "Pon límite de gastos",
  "limitsSpendingSubtitle": "Libertad para ellos, tranquilidad para ti",
@@ -451,6 +463,13 @@
  "profileSettingsLogoutConfirm": "¿Estás seguro de que deseas cerrar sesión?",
  "profileSettingsLogoutError": "Error al cerrar sesión",
  "profileSettingsSave": "Guardar cambios",
+  "profileSettingsSaveSuccess": "Cambios guardados correctamente",
+  "profileSettingsLastName": "Apellido",
+  "profileSettingsStreet": "Calle",
+  "profileSettingsCity": "Ciudad",
+  "profileSettingsProvince": "Provincia",
+  "profileSettingsState": "Estado",
+  "profileSettingsPostCode": "Código postal",
  "dashboardTabHome": "Inicio",
  "dashboardTabActivity": "Actividad",
  "dashboardTabNotifications": "Notificaciones",
@@ -561,7 +580,7 @@
  "deviceSetup_weightHint": "30",
  "deviceSetup_heightLabel": "Altura (cm)",
  "deviceSetup_heightHint": "120",
-  "activationKeyLabel": "Clave de activación",
+  "activationKeyLabel": "Clave de activación (consulta tu correo electrónico)",
  "rewardsMessage": "*Usando esta función puedes recompensar a tu hijo por metas alcanzadas o buenas acciones.",
  "sendRewards": "¡Enviar recompensas!",
  "rewardsSent": "¡Recompensas enviadas!",
@@ -682,23 +701,9 @@
  "wifiBssid": "Dirección MAC (BSSID)",
  "wifiSsidHint": "ej. MiWiFiCasa",
  "wifiBssidHint": "ej. 0c:80:63:e4:cb:e1",
-  "transactionBankDirectDebit": "Domiciliación bancaria",
-  "transactionBankTransfer": "Transferencia bancaria",
-  "transactionCardTopup": "Recarga con tarjeta",
-  "transactionCheck": "Cheque",
-  "transactionCreditNote": "Nota de crédito",
-  "transactionFees": "Comisiones",
-  "transactionInstantBankTransfer": "Transferencia instantánea",
-  "transactionWalletTransfer": "Transferencia entre cuentas",
  "editChildProfile": "Editar perfil",
-  "editChildProfileSaveSuccess": "Perfil del niño actualizado correctamente",
  "editChildProfileTitle": "Editar perfil del niño",
-  "deleteDeviceChecking": "Comprobando...",
-  "deleteDeviceNotAllowedTitle": "No se puede eliminar",
-  "deleteDeviceWalletNonZeroBalance": "No se puede eliminar el perfil porque la cartera tiene saldo disponible",
-  "profileSettingsCity": "Ciudad",
-  "profileSettingsLastName": "Apellido",
-  "profileSettingsPostCode": "Código postal",
-  "profileSettingsStreet": "Calle",
-  "profileSettingsSaveSuccess": "Cambios guardados correctamente"
+  "editChildProfileSaveSuccess": "Perfil del niño actualizado correctamente",
+  "activationCodeMessage": "Se ha enviado un código de activación a tu correo electrónico",
+  "photoTaken": "Foto tomada exitosamente"
 }
--- a/packages/sf_localizations/assets/l10n/fr.json
+++ b/packages/sf_localizations/assets/l10n/fr.json
@@ -273,8 +273,17 @@
  "transactionCheckRefund": "Remboursement de chèque",
  "transactionSctr": "Virement bancaire",
  "transactionCreditInternationalTransfer": "Virement international",
+  "transactionBankDirectDebit": "Prélèvement bancaire",
+  "transactionBankTransfer": "Virement bancaire",
+  "transactionCardTopup": "Rechargement par carte",
+  "transactionCheck": "Chèque",
+  "transactionCreditNote": "Avoir",
+  "transactionFees": "Frais",
+  "transactionInstantBankTransfer": "Virement instantané",
+  "transactionWalletTransfer": "Transfert entre comptes",
  "transactionUnknown": "Mouvement",
  "loadMore": "Charger plus",
+  "transactionsShown": "mouvements",

  "profileAccountSettings": "Paramètres du compte",
  "profileWithdrawMoney": "Retirer de l'argent du portefeuille",
@@ -382,6 +391,9 @@
  "deleteDeviceConfirmTitle": "Supprimer l'appareil ?",
  "deleteDeviceConfirmMessage": "Cette action est irréversible. Êtes-vous sûr de vouloir supprimer cet appareil ?",
  "deleteDeviceSuccess": "Appareil supprimé avec succès",
+  "deleteDeviceNotAllowedTitle": "Suppression impossible",
+  "deleteDeviceChecking": "Vérification...",
+  "deleteDeviceWalletNonZeroBalance": "Impossible de supprimer le profil car le portefeuille a un solde disponible",

  "limitsSave": "Enregistrer les limites",
  "limitsSpendingTitle": "Fixe des limites de dépenses",
@@ -473,6 +485,13 @@
  "profileSettingsLogoutConfirm": "Êtes-vous sûr de vouloir vous déconnecter ?",
  "profileSettingsLogoutError": "Erreur lors de la déconnexion",
  "profileSettingsSave": "Enregistrer les modifications",
+  "profileSettingsSaveSuccess": "Modifications enregistrées avec succès",
+  "profileSettingsLastName": "Nom de famille",
+  "profileSettingsStreet": "Rue",
+  "profileSettingsCity": "Ville",
+  "profileSettingsProvince": "Province",
+  "profileSettingsState": "État",
+  "profileSettingsPostCode": "Code postal",

  "dashboardTabHome": "Accueil",
  "dashboardTabActivity": "Activité",
@@ -575,23 +594,7 @@
  "wifiBssid": "Adresse MAC (BSSID)",
  "wifiSsidHint": "ex. MonWiFiMaison",
  "wifiBssidHint": "ex. 0c:80:63:e4:cb:e1",
-  "transactionBankDirectDebit": "Prélèvement bancaire",
-  "transactionBankTransfer": "Virement bancaire",
-  "transactionCardTopup": "Rechargement par carte",
-  "transactionCheck": "Chèque",
-  "transactionCreditNote": "Avoir",
-  "transactionFees": "Frais",
-  "transactionInstantBankTransfer": "Virement instantané",
-  "transactionWalletTransfer": "Transfert entre comptes",
  "editChildProfile": "Modifier le profil",
-  "editChildProfileSaveSuccess": "Profil de l'enfant mis à jour avec succès",
  "editChildProfileTitle": "Modifier le profil de l'enfant",
-  "deleteDeviceChecking": "Vérification...",
-  "deleteDeviceNotAllowedTitle": "Suppression impossible",
-  "deleteDeviceWalletNonZeroBalance": "Impossible de supprimer le profil car le portefeuille a un solde disponible",
-  "profileSettingsCity": "Ville",
-  "profileSettingsLastName": "Nom de famille",
-  "profileSettingsPostCode": "Code postal",
-  "profileSettingsStreet": "Rue",
-  "profileSettingsSaveSuccess": "Modifications enregistrées avec succès"
+  "editChildProfileSaveSuccess": "Profil de l'enfant mis à jour avec succès"
 }
--- a/packages/sf_localizations/assets/l10n/it.json
+++ b/packages/sf_localizations/assets/l10n/it.json
@@ -273,8 +273,17 @@
  "transactionCheckRefund": "Rimborso assegno",
  "transactionSctr": "Bonifico bancario",
  "transactionCreditInternationalTransfer": "Bonifico internazionale",
+  "transactionBankDirectDebit": "Addebito diretto",
+  "transactionBankTransfer": "Bonifico bancario",
+  "transactionCardTopup": "Ricarica con carta",
+  "transactionCheck": "Assegno",
+  "transactionCreditNote": "Nota di credito",
+  "transactionFees": "Commissioni",
+  "transactionInstantBankTransfer": "Bonifico istantaneo",
+  "transactionWalletTransfer": "Trasferimento tra conti",
  "transactionUnknown": "Movimento",
  "loadMore": "Carica altro",
+  "transactionsShown": "movimenti",

  "profileAccountSettings": "Impostazioni account",
  "profileWithdrawMoney": "Preleva denaro dal portafoglio",
@@ -382,6 +391,9 @@
  "deleteDeviceConfirmTitle": "Eliminare il dispositivo?",
  "deleteDeviceConfirmMessage": "Questa azione non può essere annullata. Sei sicuro di voler eliminare questo dispositivo?",
  "deleteDeviceSuccess": "Dispositivo eliminato con successo",
+  "deleteDeviceNotAllowedTitle": "Impossibile eliminare",
+  "deleteDeviceChecking": "Verifica in corso...",
+  "deleteDeviceWalletNonZeroBalance": "Impossibile eliminare il profilo perché il portafoglio ha un saldo disponibile",

  "limitsSave": "Salva limiti",
  "limitsSpendingTitle": "Imposta limiti di spesa",
@@ -473,6 +485,13 @@
  "profileSettingsLogoutConfirm": "Sei sicuro di voler uscire?",
  "profileSettingsLogoutError": "Errore durante la disconnessione",
  "profileSettingsSave": "Salva modifiche",
+  "profileSettingsSaveSuccess": "Modifiche salvate con successo",
+  "profileSettingsLastName": "Cognome",
+  "profileSettingsStreet": "Via",
+  "profileSettingsCity": "Città",
+  "profileSettingsProvince": "Provincia",
+  "profileSettingsState": "Stato",
+  "profileSettingsPostCode": "Codice postale",

  "dashboardTabHome": "Home",
  "dashboardTabActivity": "Attività",
@@ -575,23 +594,7 @@
  "wifiBssid": "Indirizzo MAC (BSSID)",
  "wifiSsidHint": "es. MiaReteCasa",
  "wifiBssidHint": "es. 0c:80:63:e4:cb:e1",
-  "transactionBankDirectDebit": "Addebito diretto",
-  "transactionBankTransfer": "Bonifico bancario",
-  "transactionCardTopup": "Ricarica con carta",
-  "transactionCheck": "Assegno",
-  "transactionCreditNote": "Nota di credito",
-  "transactionFees": "Commissioni",
-  "transactionInstantBankTransfer": "Bonifico istantaneo",
-  "transactionWalletTransfer": "Trasferimento tra conti",
  "editChildProfile": "Modifica profilo",
-  "editChildProfileSaveSuccess": "Profilo del bambino aggiornato con successo",
  "editChildProfileTitle": "Modifica profilo del bambino",
-  "deleteDeviceChecking": "Verifica in corso...",
-  "deleteDeviceNotAllowedTitle": "Impossibile eliminare",
-  "deleteDeviceWalletNonZeroBalance": "Impossibile eliminare il profilo perché il portafoglio ha un saldo disponibile",
-  "profileSettingsCity": "Città",
-  "profileSettingsLastName": "Cognome",
-  "profileSettingsPostCode": "Codice postale",
-  "profileSettingsStreet": "Via",
-  "profileSettingsSaveSuccess": "Modifiche salvate con successo"
+  "editChildProfileSaveSuccess": "Profilo del bambino aggiornato con successo"
 }
--- a/packages/sf_localizations/assets/l10n/pt.json
+++ b/packages/sf_localizations/assets/l10n/pt.json
@@ -273,8 +273,17 @@
  "transactionCheckRefund": "Reembolso de cheque",
  "transactionSctr": "Transferência bancária",
  "transactionCreditInternationalTransfer": "Transferência internacional",
+  "transactionBankDirectDebit": "Débito direto",
+  "transactionBankTransfer": "Transferência bancária",
+  "transactionCardTopup": "Carregamento com cartão",
+  "transactionCheck": "Cheque",
+  "transactionCreditNote": "Nota de crédito",
+  "transactionFees": "Taxas",
+  "transactionInstantBankTransfer": "Transferência instantânea",
+  "transactionWalletTransfer": "Transferência entre contas",
  "transactionUnknown": "Movimento",
  "loadMore": "Carregar mais",
+  "transactionsShown": "movimentos",

  "profileAccountSettings": "Definições da conta",
  "profileWithdrawMoney": "Levantar dinheiro da carteira",
@@ -382,6 +391,9 @@
  "deleteDeviceConfirmTitle": "Eliminar dispositivo?",
  "deleteDeviceConfirmMessage": "Esta ação não pode ser desfeita. Tens a certeza de que queres eliminar este dispositivo?",
  "deleteDeviceSuccess": "Dispositivo eliminado com sucesso",
+  "deleteDeviceNotAllowedTitle": "Não é possível eliminar",
+  "deleteDeviceChecking": "A verificar...",
+  "deleteDeviceWalletNonZeroBalance": "Não é possível eliminar o perfil porque a carteira tem saldo disponível",

  "limitsSave": "Guardar limites",
  "limitsSpendingTitle": "Define limite de gastos",
@@ -473,6 +485,13 @@
  "profileSettingsLogoutConfirm": "Tem a certeza de que deseja terminar sessão?",
  "profileSettingsLogoutError": "Erro ao terminar sessão",
  "profileSettingsSave": "Guardar alterações",
+  "profileSettingsSaveSuccess": "Alterações guardadas com sucesso",
+  "profileSettingsLastName": "Apelido",
+  "profileSettingsStreet": "Rua",
+  "profileSettingsCity": "Cidade",
+  "profileSettingsProvince": "Província",
+  "profileSettingsState": "Estado",
+  "profileSettingsPostCode": "Código postal",

  "dashboardTabHome": "Início",
  "dashboardTabActivity": "Atividade",
@@ -575,23 +594,7 @@
  "wifiBssid": "Endereço MAC (BSSID)",
  "wifiSsidHint": "ex. MinhaRedeWiFi",
  "wifiBssidHint": "ex. 0c:80:63:e4:cb:e1",
-  "transactionBankDirectDebit": "Débito direto",
-  "transactionBankTransfer": "Transferência bancária",
-  "transactionCardTopup": "Carregamento com cartão",
-  "transactionCheck": "Cheque",
-  "transactionCreditNote": "Nota de crédito",
-  "transactionFees": "Taxas",
-  "transactionInstantBankTransfer": "Transferência instantânea",
-  "transactionWalletTransfer": "Transferência entre contas",
  "editChildProfile": "Editar perfil",
-  "editChildProfileSaveSuccess": "Perfil da criança atualizado com sucesso",
  "editChildProfileTitle": "Editar perfil da criança",
-  "deleteDeviceChecking": "A verificar...",
-  "deleteDeviceNotAllowedTitle": "Não é possível eliminar",
-  "deleteDeviceWalletNonZeroBalance": "Não é possível eliminar o perfil porque a carteira tem saldo disponível",
-  "profileSettingsCity": "Cidade",
-  "profileSettingsLastName": "Apelido",
-  "profileSettingsPostCode": "Código postal",
-  "profileSettingsStreet": "Rua",
-  "profileSettingsSaveSuccess": "Alterações guardadas com sucesso"
+  "editChildProfileSaveSuccess": "Perfil da criança atualizado com sucesso"
 }
--- a/packages/sf_localizations/lib/src/generated/i18n.dart
+++ b/packages/sf_localizations/lib/src/generated/i18n.dart
@@ -327,8 +327,17 @@ class I18n {
  static const String transactionSctr = 'transactionSctr';
  static const String transactionCreditInternationalTransfer =
      'transactionCreditInternationalTransfer';
+  static const String transactionBankDirectDebit = 'transactionBankDirectDebit';
+  static const String transactionBankTransfer = 'transactionBankTransfer';
+  static const String transactionCardTopup = 'transactionCardTopup';
+  static const String transactionCheck = 'transactionCheck';
+  static const String transactionCreditNote = 'transactionCreditNote';
+  static const String transactionFees = 'transactionFees';
+  static const String transactionInstantBankTransfer = 'transactionInstantBankTransfer';
+  static const String transactionWalletTransfer = 'transactionWalletTransfer';
  static const String transactionUnknown = 'transactionUnknown';
  static const String loadMore = 'loadMore';
+  static const String transactionsShown = 'transactionsShown';
  static const String profileAccountSettings = 'profileAccountSettings';
  static const String profileWithdrawMoney = 'profileWithdrawMoney';
  static const String profileNoRecentTransactions =
@@ -451,6 +460,9 @@ class I18n {
  static const String deleteDeviceConfirmTitle = 'deleteDeviceConfirmTitle';
  static const String deleteDeviceConfirmMessage = 'deleteDeviceConfirmMessage';
  static const String deleteDeviceSuccess = 'deleteDeviceSuccess';
+  static const String deleteDeviceNotAllowedTitle = 'deleteDeviceNotAllowedTitle';
+  static const String deleteDeviceChecking = 'deleteDeviceChecking';
+  static const String deleteDeviceWalletNonZeroBalance = 'deleteDeviceWalletNonZeroBalance';

  // Limits
  static const String limitsSave = 'limitsSave';
@@ -542,6 +554,13 @@ class I18n {
      'profileSettingsLogoutConfirm';
  static const String profileSettingsLogoutError = 'profileSettingsLogoutError';
  static const String profileSettingsSave = 'profileSettingsSave';
+  static const String profileSettingsSaveSuccess = 'profileSettingsSaveSuccess';
+  static const String profileSettingsLastName = 'profileSettingsLastName';
+  static const String profileSettingsStreet = 'profileSettingsStreet';
+  static const String profileSettingsCity = 'profileSettingsCity';
+  static const String profileSettingsProvince = 'profileSettingsProvince';
+  static const String profileSettingsState = 'profileSettingsState';
+  static const String profileSettingsPostCode = 'profileSettingsPostCode';

  // Account Documents
  static const String accountDetails = 'accountDetails';
@@ -807,23 +826,9 @@ class I18n {
  static const String wifiBssid = 'wifiBssid';
  static const String wifiSsidHint = 'wifiSsidHint';
  static const String wifiBssidHint = 'wifiBssidHint';
-  static const String transactionBankDirectDebit = 'transactionBankDirectDebit';
-  static const String transactionBankTransfer = 'transactionBankTransfer';
-  static const String transactionCardTopup = 'transactionCardTopup';
-  static const String transactionCheck = 'transactionCheck';
-  static const String transactionCreditNote = 'transactionCreditNote';
-  static const String transactionFees = 'transactionFees';
-  static const String transactionInstantBankTransfer = 'transactionInstantBankTransfer';
-  static const String transactionWalletTransfer = 'transactionWalletTransfer';
  static const String editChildProfile = 'editChildProfile';
-  static const String editChildProfileSaveSuccess = 'editChildProfileSaveSuccess';
  static const String editChildProfileTitle = 'editChildProfileTitle';
-  static const String deleteDeviceChecking = 'deleteDeviceChecking';
-  static const String deleteDeviceNotAllowedTitle = 'deleteDeviceNotAllowedTitle';
-  static const String deleteDeviceWalletNonZeroBalance = 'deleteDeviceWalletNonZeroBalance';
-  static const String profileSettingsCity = 'profileSettingsCity';
-  static const String profileSettingsLastName = 'profileSettingsLastName';
-  static const String profileSettingsPostCode = 'profileSettingsPostCode';
-  static const String profileSettingsStreet = 'profileSettingsStreet';
-  static const String profileSettingsSaveSuccess = 'profileSettingsSaveSuccess';
+  static const String editChildProfileSaveSuccess = 'editChildProfileSaveSuccess';
+  static const String activationCodeMessage = 'activationCodeMessage';
+  static const String photoTaken = 'photoTaken';
 }
--- a/packages/sf_shared/lib/sf_shared.dart
+++ b/packages/sf_shared/lib/sf_shared.dart
@@ -29,6 +29,7 @@ export 'src/providers/user_info_provider.dart';
 export 'src/domain/repositories/user_repository.dart';
 export 'src/data/repositories/user_repository_impl.dart';
 export 'src/data/datasource/user_remote_datasource_impl.dart';
+export 'src/domain/entities/beneficiary_validation_entity.dart';
 export 'src/domain/entities/transaction_beneficiary_entity.dart';
 export 'src/data/models/payout_beneficiary_model.dart';
 export 'src/domain/entities/payout_beneficiary_entity.dart';
--- a/packages/sf_shared/lib/src/data/datasource/treezor_remote_data_source.dart
+++ b/packages/sf_shared/lib/src/data/datasource/treezor_remote_data_source.dart
@@ -3,6 +3,7 @@ import 'package:sf_shared/src/data/models/mcc_group_model.dart';
 import 'package:sf_shared/src/data/models/payment_profile_response_model.dart';
 import 'package:sf_shared/src/data/models/payout_beneficiary_model.dart';
 import 'package:sf_shared/src/data/models/sca_wallet_model.dart';
+import 'package:sf_shared/src/data/models/beneficiary_validation_model.dart';
 import 'package:sf_shared/src/data/models/transaction_beneficiary_model.dart';
 import 'package:sf_shared/src/data/models/wallet_balance_model.dart';
 import 'package:sf_shared/src/data/models/wallet_card_model.dart';
@@ -41,7 +42,7 @@ abstract class TreezorRemoteDatasource {
    required String scaProof,
  });

-  Future<String> validateTransactionBeneficiary({required int beneficiaryId});
+  Future<BeneficiaryValidationResponseModel> validateTransactionBeneficiary({required int beneficiaryId});

  Future<void> walletTransfer({
    required int beneficiaryId,
--- a/packages/sf_shared/lib/src/data/datasource/treezor_remote_data_source_impl.dart
+++ b/packages/sf_shared/lib/src/data/datasource/treezor_remote_data_source_impl.dart
@@ -7,6 +7,7 @@ import 'package:sf_shared/src/data/models/mcc_group_model.dart';
 import 'package:sf_shared/src/data/models/payment_profile_response_model.dart';
 import 'package:sf_shared/src/data/models/payout_beneficiary_model.dart';
 import 'package:sf_shared/src/data/models/sca_wallet_model.dart';
+import 'package:sf_shared/src/data/models/beneficiary_validation_model.dart';
 import 'package:sf_shared/src/data/models/transaction_beneficiary_model.dart';
 import 'package:sf_shared/src/data/models/wallet_balance_model.dart';
 import 'package:sf_shared/src/data/models/wallet_card_model.dart';
@@ -241,7 +242,7 @@ class TreezorRemoteDatasourceImpl implements TreezorRemoteDatasource {
  }

  @override
-  Future<String> validateTransactionBeneficiary({
+  Future<BeneficiaryValidationResponseModel> validateTransactionBeneficiary({
    required int beneficiaryId,
  }) async {
    try {
@@ -254,7 +255,9 @@ class TreezorRemoteDatasourceImpl implements TreezorRemoteDatasource {
          'Invalid response from /transaction-beneficiaries/$beneficiaryId/validation',
        );
      }
-      return data['item'] as String;
+      return BeneficiaryValidationResponseModel.fromJson(
+        Map<String, dynamic>.from(data),
+      );
    } on DioException catch (error) {
      throw _mapDioError(
        error,
--- a/packages/sf_shared/lib/src/data/models/beneficiary_validation_model.dart
+++ b/packages/sf_shared/lib/src/data/models/beneficiary_validation_model.dart
@@ -0,0 +1,54 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:sf_shared/src/domain/entities/beneficiary_validation_entity.dart';
+
+part 'beneficiary_validation_model.freezed.dart';
+part 'beneficiary_validation_model.g.dart';
+
+@freezed
+abstract class BeneficiaryValidationResponseModel
+    with _$BeneficiaryValidationResponseModel {
+  const BeneficiaryValidationResponseModel._();
+
+  const factory BeneficiaryValidationResponseModel({
+    @Default(false) bool isCreated,
+    required BeneficiaryValidationItemModel item,
+  }) = _BeneficiaryValidationResponseModel;
+
+  factory BeneficiaryValidationResponseModel.fromJson(
+    Map<String, dynamic> json,
+  ) =>
+      _$BeneficiaryValidationResponseModelFromJson(json);
+
+  BeneficiaryValidationEntity toEntity() => BeneficiaryValidationEntity(
+        isCreated: isCreated,
+        beneficiaryValidationId: item.beneficiaryValidationId,
+        createdDate: item.createdDate,
+        vopResult: item.vop?.result ?? '',
+      );
+}
+
+@freezed
+abstract class BeneficiaryValidationItemModel
+    with _$BeneficiaryValidationItemModel {
+  const factory BeneficiaryValidationItemModel({
+    required String beneficiaryValidationId,
+    @Default('') String createdDate,
+    BeneficiaryValidationVopModel? vop,
+  }) = _BeneficiaryValidationItemModel;
+
+  factory BeneficiaryValidationItemModel.fromJson(Map<String, dynamic> json) =>
+      _$BeneficiaryValidationItemModelFromJson(json);
+}
+
+@freezed
+abstract class BeneficiaryValidationVopModel
+    with _$BeneficiaryValidationVopModel {
+  const factory BeneficiaryValidationVopModel({
+    @Default('') String matchedName,
+    @Default('') String recurrenceType,
+    @Default('') String result,
+  }) = _BeneficiaryValidationVopModel;
+
+  factory BeneficiaryValidationVopModel.fromJson(Map<String, dynamic> json) =>
+      _$BeneficiaryValidationVopModelFromJson(json);
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
aitorarana	48cb23379c	remote photo command	2026-03-20 15:14:40 +01:00
aitorarana	48d2430c9c	remote call command	2026-03-18 17:09:03 +01:00
aitorarana	cf0c55eafe	Merge branch 'feature/linked-devices' into fusion-app	2026-03-18 15:09:35 +01:00
aitorarana	03c6633504	fix delete device sizing	2026-03-18 15:09:13 +01:00
aitorarana	b8184f02ec	Merge remote-tracking branch 'origin/fusion-app' into fusion-app	2026-03-18 14:56:51 +01:00
JulianAlcala	c12d1924c4	splash screen fix	2026-03-18 13:52:07 +01:00
aitorarana	869f33f1f1	Merge remote-tracking branch 'origin/feature/change-password' into fusion-app	2026-03-18 13:21:52 +01:00
aitorarana	a07246130e	fix change password fields and validation	2026-03-18 13:21:16 +01:00
JulianAlcala	67aafafd1e	hide interceptor for legacy app	2026-03-18 13:15:00 +01:00
JulianAlcala	c929e1e2d7	beneficiary validation and development api origin fix	2026-03-18 13:13:36 +01:00
aitorarana	990266ba95	delete device command and device setup flow	2026-03-18 11:49:05 +01:00
aitorarana	fa36037aac	personal data dial code	2026-03-16 17:45:00 +01:00
aitorarana	c9e2adf692	contacts dial codes	2026-03-16 16:22:45 +01:00
aitorarana	995b69eb65	Merge remote-tracking branch 'origin/fusion-app' into legacy	2026-03-16 15:25:16 +01:00
aitorarana	f1226b4c18	Merge remote-tracking branch 'origin/fusion-app' into legacy # Conflicts: # apps/mobile_app/lib/save_family_app.dart # packages/sf_localizations/assets/l10n/de.json # packages/sf_localizations/assets/l10n/en.json # packages/sf_localizations/assets/l10n/es.json # packages/sf_localizations/assets/l10n/fr.json # packages/sf_localizations/assets/l10n/it.json # packages/sf_localizations/assets/l10n/pt.json # packages/sf_localizations/lib/src/generated/i18n.dart	2026-03-16 13:26:08 +01:00
aitorarana	797d236547	fix translation texts	2026-03-16 12:56:17 +01:00
aitorarana	90447ce9a0	Merge branch 'feature/remote-management' into legacy # Conflicts: # apps/mobile_app/lib/save_family_app.dart # packages/sf_localizations/assets/l10n/de.json # packages/sf_localizations/assets/l10n/en.json # packages/sf_localizations/assets/l10n/es.json # packages/sf_localizations/assets/l10n/fr.json # packages/sf_localizations/assets/l10n/it.json # packages/sf_localizations/assets/l10n/pt.json # packages/sf_localizations/lib/src/generated/i18n.dart	2026-03-16 12:54:23 +01:00
aitorarana	22ef648b41	Merge remote-tracking branch 'origin/fusion-app' into legacy # Conflicts: # apps/mobile_app/lib/navigation/app_router.dart # packages/sf_localizations/assets/l10n/en.json # packages/sf_localizations/assets/l10n/es.json # packages/sf_localizations/lib/src/generated/i18n.dart	2026-03-16 12:50:54 +01:00
aitorarana	ae4bc7824a	Merge remote-tracking branch 'origin/feature/remote-management' into feature/remote-management	2026-03-16 12:47:18 +01:00
aitorarana	01d9d4241b	remote management commands	2026-03-16 12:46:13 +01:00
@@ -1 +1 @@
 .35.7
 .35.6