diff --git a/.github/workflows/build_app.yml b/.github/workflows/build_app.yml
index 35e54a5..c45a6fd 100644
--- a/.github/workflows/build_app.yml
+++ b/.github/workflows/build_app.yml
@@ -3,7 +3,7 @@ on:
     inputs:
       ruby_version:
         description: 'Ruby Version'
-        default: "3.1.1"
+        default: "3.2.2"
         type: string
         required: false
       node_version:
diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml
index 20fe405..97217cb 100644
--- a/.github/workflows/ci_tests.yml
+++ b/.github/workflows/ci_tests.yml
@@ -15,7 +15,7 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 3.1.1
+  RUBY_VERSION: 3.2.2
   NODE_VERSION: 18.17.1
 
 concurrency:
diff --git a/.github/workflows/test_app.yml b/.github/workflows/test_app.yml
index 70894d8..fa96241 100644
--- a/.github/workflows/test_app.yml
+++ b/.github/workflows/test_app.yml
@@ -3,7 +3,7 @@ on:
     inputs:
       ruby_version:
         description: 'Ruby Version'
-        default: "3.1.1"
+        default: "3.2.2"
         required: false
         type: string
       test_command:
@@ -13,7 +13,7 @@ on:
       chrome_version:
         description: 'Chrome & Chromedriver version'
         required: false
-        default: "126.0.6478.182"
+        default: "136.0.7103.92"
         type: string
 
 jobs:
diff --git a/.ruby-version b/.ruby-version
index 94ff29c..be94e6f 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.1.1
+3.2.2
diff --git a/Gemfile b/Gemfile
index ed3f02d..bc27dc4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-DECIDIM_VERSION = "~> 0.28"
+DECIDIM_VERSION = "~> 0.29"
 
 source "https://rubygems.org"
 
@@ -10,7 +10,7 @@ gem "decidim", DECIDIM_VERSION
 gem "decidim-extra_user_fields", path: "."
 
 gem "bootsnap", "~> 1.3"
-gem "country_select", "~> 4.0"
+gem "country_select", "~> 9.0"
 gem "puma", ">= 4.3"
 
 group :development, :test do
@@ -23,7 +23,7 @@ group :development do
   gem "letter_opener_web", "~> 2.0"
   gem "listen", "~> 3.1"
   gem "rubocop-faker"
-  gem "spring", "~> 2.0"
+  gem "spring", "~> 4.0"
   gem "spring-watcher-listen", "~> 2.0"
   gem "web-console", "~> 4.2"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 1539fe4..8d440a4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,48 +1,55 @@
 PATH
   remote: .
   specs:
-    decidim-extra_user_fields (0.28.0)
-      country_select (~> 4.0)
-      decidim-core (>= 0.28)
+    decidim-extra_user_fields (0.29.0)
+      country_select (~> 9.0)
+      decidim-core (>= 0.29)
       deface (~> 1.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actioncable (7.0.8.7)
+      actionpack (= 7.0.8.7)
+      activesupport (= 7.0.8.7)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activestorage (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actionmailbox (7.0.8.7)
+      actionpack (= 7.0.8.7)
+      activejob (= 7.0.8.7)
+      activerecord (= 7.0.8.7)
+      activestorage (= 7.0.8.7)
+      activesupport (= 7.0.8.7)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      actionview (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.8.7)
+      actionpack (= 7.0.8.7)
+      actionview (= 7.0.8.7)
+      activejob (= 7.0.8.7)
+      activesupport (= 7.0.8.7)
       mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.8)
-      actionview (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.8.7)
+      actionview (= 7.0.8.7)
+      activesupport (= 7.0.8.7)
+      rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activestorage (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actiontext (7.0.8.7)
+      actionpack (= 7.0.8.7)
+      activerecord (= 7.0.8.7)
+      activestorage (= 7.0.8.7)
+      activesupport (= 7.0.8.7)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actionview (7.0.8.7)
+      activesupport (= 7.0.8.7)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -50,33 +57,32 @@ GEM
     active_link_to (1.0.5)
       actionpack
       addressable
-    activejob (6.1.7.8)
-      activesupport (= 6.1.7.8)
+    activejob (7.0.8.7)
+      activesupport (= 7.0.8.7)
       globalid (>= 0.3.6)
-    activemodel (6.1.7.8)
-      activesupport (= 6.1.7.8)
-    activerecord (6.1.7.8)
-      activemodel (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
-    activestorage (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    activemodel (7.0.8.7)
+      activesupport (= 7.0.8.7)
+    activerecord (7.0.8.7)
+      activemodel (= 7.0.8.7)
+      activesupport (= 7.0.8.7)
+    activestorage (7.0.8.7)
+      actionpack (= 7.0.8.7)
+      activejob (= 7.0.8.7)
+      activerecord (= 7.0.8.7)
+      activesupport (= 7.0.8.7)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.7.8)
+    activesupport (7.0.8.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    acts_as_list (1.2.1)
+    acts_as_list (1.2.4)
       activerecord (>= 6.1)
       activesupport (>= 6.1)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
-    ast (2.4.2)
+    ast (2.4.3)
     base64 (0.2.0)
     batch-loader (1.5.0)
     bcrypt (3.1.20)
@@ -87,9 +93,9 @@ GEM
       erubi (~> 1.4)
       parser (>= 2.4)
       smart_properties
-    bigdecimal (3.1.8)
+    bigdecimal (3.1.9)
     bindex (0.8.1)
-    bootsnap (1.18.3)
+    bootsnap (1.18.4)
       msgpack (~> 1.2)
     browser (2.7.1)
     builder (3.3.0)
@@ -106,105 +112,93 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    carrierwave (2.2.6)
-      activemodel (>= 5.0.0)
-      activesupport (>= 5.0.0)
-      addressable (~> 2.6)
-      image_processing (~> 1.1)
-      marcel (~> 1.0.0)
-      mini_mime (>= 0.1.3)
-      ssrf_filter (~> 1.0)
-    cells (4.1.7)
-      declarative-builder (< 0.2.0)
+    cells (4.1.8)
+      declarative-builder (~> 0.2.0)
       declarative-option (< 0.2.0)
       tilt (>= 1.4, < 3)
       uber (< 0.2.0)
     cells-erb (0.1.0)
       cells (~> 4.0)
       erbse (>= 0.1.1)
-    cells-rails (0.1.5)
+    cells-rails (0.1.6)
       actionpack (>= 5.0)
       cells (>= 4.1.6, < 5.0.0)
-    charlock_holmes (0.7.8)
+    charlock_holmes (0.7.9)
     childprocess (5.1.0)
       logger (~> 1.5)
-    commonmarker (0.23.10)
-    concurrent-ruby (1.3.3)
-    countries (3.1.0)
-      i18n_data (~> 0.11.0)
-      sixarm_ruby_unaccent (~> 1.1)
-      unicode_utils (~> 1.4)
-    country_select (4.0.0)
-      countries (~> 3.0)
-      sort_alphabetical (~> 1.0)
+    commonmarker (0.23.11)
+    concurrent-ruby (1.3.4)
+    countries (6.0.1)
+      unaccent (~> 0.3)
+    country_select (9.0.0)
+      countries (> 5.0, < 7.0)
     crack (1.0.0)
       bigdecimal
       rexml
     crass (1.0.6)
-    css_parser (1.17.1)
+    css_parser (1.21.1)
       addressable
-    csv (3.3.0)
-    date (3.3.4)
+    csv (3.3.3)
+    dartsass (1.49.8)
+    date (3.4.1)
     date_validator (0.12.0)
       activemodel (>= 3)
       activesupport (>= 3)
-    decidim (0.28.1)
-      decidim-accountability (= 0.28.1)
-      decidim-admin (= 0.28.1)
-      decidim-api (= 0.28.1)
-      decidim-assemblies (= 0.28.1)
-      decidim-blogs (= 0.28.1)
-      decidim-budgets (= 0.28.1)
-      decidim-comments (= 0.28.1)
-      decidim-core (= 0.28.1)
-      decidim-debates (= 0.28.1)
-      decidim-forms (= 0.28.1)
-      decidim-generators (= 0.28.1)
-      decidim-meetings (= 0.28.1)
-      decidim-pages (= 0.28.1)
-      decidim-participatory_processes (= 0.28.1)
-      decidim-proposals (= 0.28.1)
-      decidim-sortitions (= 0.28.1)
-      decidim-surveys (= 0.28.1)
-      decidim-system (= 0.28.1)
-      decidim-templates (= 0.28.1)
-      decidim-verifications (= 0.28.1)
-    decidim-accountability (0.28.1)
-      decidim-comments (= 0.28.1)
-      decidim-core (= 0.28.1)
-    decidim-admin (0.28.1)
+    decidim (0.29.2)
+      decidim-accountability (= 0.29.2)
+      decidim-admin (= 0.29.2)
+      decidim-api (= 0.29.2)
+      decidim-assemblies (= 0.29.2)
+      decidim-blogs (= 0.29.2)
+      decidim-budgets (= 0.29.2)
+      decidim-comments (= 0.29.2)
+      decidim-core (= 0.29.2)
+      decidim-debates (= 0.29.2)
+      decidim-forms (= 0.29.2)
+      decidim-generators (= 0.29.2)
+      decidim-meetings (= 0.29.2)
+      decidim-pages (= 0.29.2)
+      decidim-participatory_processes (= 0.29.2)
+      decidim-proposals (= 0.29.2)
+      decidim-sortitions (= 0.29.2)
+      decidim-surveys (= 0.29.2)
+      decidim-system (= 0.29.2)
+      decidim-verifications (= 0.29.2)
+    decidim-accountability (0.29.2)
+      decidim-comments (= 0.29.2)
+      decidim-core (= 0.29.2)
+    decidim-admin (0.29.2)
       active_link_to (~> 1.0)
-      decidim-core (= 0.28.1)
+      decidim-core (= 0.29.2)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
       devise_invitable (~> 2.0, >= 2.0.9)
-    decidim-api (0.28.1)
-      commonmarker (~> 0.23.0, >= 0.23.9)
-      decidim-core (= 0.28.1)
-      graphql (~> 2.0.0)
-      graphql-docs (~> 3.0.1)
+    decidim-api (0.29.2)
+      decidim-core (= 0.29.2)
+      graphql (~> 2.2.6)
+      graphql-docs (~> 4.0)
       rack-cors (~> 1.0)
-    decidim-assemblies (0.28.1)
-      decidim-core (= 0.28.1)
-    decidim-blogs (0.28.1)
-      decidim-admin (= 0.28.1)
-      decidim-comments (= 0.28.1)
-      decidim-core (= 0.28.1)
-    decidim-budgets (0.28.1)
-      decidim-comments (= 0.28.1)
-      decidim-core (= 0.28.1)
-    decidim-comments (0.28.1)
-      decidim-core (= 0.28.1)
+    decidim-assemblies (0.29.2)
+      decidim-core (= 0.29.2)
+    decidim-blogs (0.29.2)
+      decidim-admin (= 0.29.2)
+      decidim-comments (= 0.29.2)
+      decidim-core (= 0.29.2)
+    decidim-budgets (0.29.2)
+      decidim-comments (= 0.29.2)
+      decidim-core (= 0.29.2)
+    decidim-comments (0.29.2)
+      decidim-core (= 0.29.2)
       redcarpet (~> 3.5, >= 3.5.1)
-    decidim-core (0.28.1)
+    decidim-core (0.29.2)
       active_link_to (~> 1.0)
       acts_as_list (~> 1.0)
       batch-loader (~> 1.2)
       browser (~> 2.7)
-      carrierwave (~> 2.2.5, >= 2.2.5)
       cells-erb (~> 0.1.0)
       cells-rails (~> 0.1.3)
       charlock_holmes (~> 0.7)
+      concurrent-ruby (= 1.3.4)
       date_validator (~> 0.12.0)
       devise (~> 4.7)
       devise-i18n (~> 1.2, < 1.11.1)
@@ -216,12 +210,14 @@ GEM
       foundation_rails_helper (~> 4.0)
       geocoder (~> 1.8)
       hashdiff (>= 0.4.0, < 2.0.0)
+      image_processing (~> 1.2)
       invisible_captcha (~> 0.12)
       kaminari (~> 1.2, >= 1.2.1)
       loofah (~> 2.19, >= 2.19.1)
       mime-types (>= 1.16, < 4.0)
       mini_magick (~> 4.9)
       net-smtp (~> 0.3.1)
+      nokogiri (~> 1.16, >= 1.16.2)
       omniauth (~> 2.0)
       omniauth-facebook (~> 5.0)
       omniauth-google-oauth2 (~> 1.0)
@@ -232,33 +228,32 @@ GEM
       pg_search (~> 2.2)
       premailer-rails (~> 1.10)
       psych (~> 4.0)
-      rack (~> 2.2, >= 2.2.6.4)
+      rack (~> 2.2, >= 2.2.8.1)
       rack-attack (~> 6.0)
-      rails (~> 6.1.7, >= 6.1.7.4)
-      rails-i18n (~> 6.0)
+      rails (~> 7.0.8)
+      rails-i18n (~> 7.0)
       ransack (~> 3.2.1)
       redis (~> 4.1)
       request_store (~> 1.5.0)
       rubyXL (~> 3.4)
       rubyzip (~> 2.0)
-      seven_zip_ruby (~> 1.3)
       shakapacker (~> 7.1.0)
       valid_email2 (~> 4.0)
       web-push (~> 3.0)
       wisper (~> 2.0)
-    decidim-debates (0.28.1)
-      decidim-comments (= 0.28.1)
-      decidim-core (= 0.28.1)
-    decidim-dev (0.28.1)
-      bullet (~> 7.0)
+    decidim-debates (0.29.2)
+      decidim-comments (= 0.29.2)
+      decidim-core (= 0.29.2)
+    decidim-dev (0.29.2)
+      bullet (~> 7.1.6)
       byebug (~> 11.0)
       capybara (~> 3.39)
-      decidim (= 0.28.1)
+      decidim (= 0.29.2)
       erb_lint (~> 0.4.0)
       factory_bot_rails (~> 6.2)
       faker (~> 3.2)
       i18n-tasks (~> 1.0)
-      nokogiri (~> 1.14, >= 1.14.3)
+      nokogiri (~> 1.16, >= 1.16.2)
       parallel_tests (~> 4.2)
       puma (~> 6.2, >= 6.3.1)
       rails-controller-testing (~> 1.0)
@@ -268,56 +263,59 @@ GEM
       rspec-rails (~> 6.0)
       rspec-retry (~> 0.6.2)
       rspec_junit_formatter (~> 0.6.0)
-      rubocop (~> 1.50.0)
+      rubocop (~> 1.65.0)
+      rubocop-capybara (~> 2.21)
+      rubocop-factory_bot (~> 2.26)
       rubocop-faker (~> 1.1)
-      rubocop-rails (~> 2.19)
-      rubocop-rspec (~> 2.20)
+      rubocop-performance (~> 1.21)
+      rubocop-rails (~> 2.25)
+      rubocop-rspec (~> 3.0)
+      rubocop-rspec_rails (~> 2.30)
+      rubocop-rubycw (~> 0.1)
       selenium-webdriver (~> 4.9)
       simplecov (~> 0.22.0)
       simplecov-cobertura (~> 2.1.0)
+      spring (~> 4.0)
+      spring-watcher-listen (~> 2.0)
       w3c_rspec_validators (~> 0.3.0)
       webmock (~> 3.18)
       wisper-rspec (~> 1.0)
-    decidim-forms (0.28.1)
-      decidim-core (= 0.28.1)
+    decidim-forms (0.29.2)
+      decidim-core (= 0.29.2)
       wicked_pdf (~> 2.1)
-      wkhtmltopdf-binary (~> 0.12)
-    decidim-generators (0.28.1)
-      decidim-core (= 0.28.1)
-    decidim-meetings (0.28.1)
-      decidim-core (= 0.28.1)
-      decidim-forms (= 0.28.1)
+    decidim-generators (0.29.2)
+      decidim-core (= 0.29.2)
+    decidim-meetings (0.29.2)
+      decidim-core (= 0.29.2)
+      decidim-forms (= 0.29.2)
       icalendar (~> 2.5)
-    decidim-pages (0.28.1)
-      decidim-core (= 0.28.1)
-    decidim-participatory_processes (0.28.1)
-      decidim-core (= 0.28.1)
-    decidim-proposals (0.28.1)
-      decidim-comments (= 0.28.1)
-      decidim-core (= 0.28.1)
-      doc2text (~> 0.4.6)
+    decidim-pages (0.29.2)
+      decidim-core (= 0.29.2)
+    decidim-participatory_processes (0.29.2)
+      decidim-core (= 0.29.2)
+    decidim-proposals (0.29.2)
+      decidim-comments (= 0.29.2)
+      decidim-core (= 0.29.2)
+      doc2text (~> 0.4.7)
       redcarpet (~> 3.5, >= 3.5.1)
-    decidim-sortitions (0.28.1)
-      decidim-admin (= 0.28.1)
-      decidim-comments (= 0.28.1)
-      decidim-core (= 0.28.1)
-      decidim-proposals (= 0.28.1)
-    decidim-surveys (0.28.1)
-      decidim-core (= 0.28.1)
-      decidim-forms (= 0.28.1)
-    decidim-system (0.28.1)
+    decidim-sortitions (0.29.2)
+      decidim-admin (= 0.29.2)
+      decidim-comments (= 0.29.2)
+      decidim-core (= 0.29.2)
+      decidim-proposals (= 0.29.2)
+    decidim-surveys (0.29.2)
+      decidim-core (= 0.29.2)
+      decidim-forms (= 0.29.2)
+    decidim-system (0.29.2)
       active_link_to (~> 1.0)
-      decidim-core (= 0.28.1)
+      decidim-core (= 0.29.2)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
       devise_invitable (~> 2.0, >= 2.0.9)
-    decidim-templates (0.28.1)
-      decidim-core (= 0.28.1)
-      decidim-forms (= 0.28.1)
-    decidim-verifications (0.28.1)
-      decidim-core (= 0.28.1)
-    declarative-builder (0.1.0)
-      declarative-option (< 0.2.0)
+    decidim-verifications (0.29.2)
+      decidim-core (= 0.29.2)
+    declarative-builder (0.2.0)
+      trailblazer-option (~> 0.1.0)
     declarative-option (0.1.0)
     deface (1.9.0)
       actionview (>= 5.2)
@@ -333,16 +331,16 @@ GEM
       warden (~> 1.2.3)
     devise-i18n (1.11.0)
       devise (>= 4.9.0)
-    devise_invitable (2.0.9)
+    devise_invitable (2.0.10)
       actionmailer (>= 5.0)
       devise (>= 4.6)
-    diff-lcs (1.5.1)
-    diffy (3.4.2)
-    doc2text (0.4.7)
-      nokogiri (>= 1.13.2, < 1.17.0)
+    diff-lcs (1.6.1)
+    diffy (3.4.3)
+    doc2text (0.4.8)
+      nokogiri (>= 1.18.2)
       rubyzip (~> 2.3.0)
-    docile (1.4.0)
-    doorkeeper (5.7.1)
+    docile (1.4.1)
+    doorkeeper (5.8.2)
       railties (>= 5)
     doorkeeper-i18n (4.0.1)
     erb_lint (0.4.0)
@@ -354,33 +352,42 @@ GEM
       smart_properties
     erbse (0.1.4)
       temple
-    erubi (1.13.0)
-    escape_utils (1.2.2)
-    excon (0.111.0)
+    erubi (1.13.1)
+    escape_utils (1.3.0)
+    excon (1.2.5)
+      logger
     extended-markdown-filter (0.7.0)
       html-pipeline (~> 2.9)
-    factory_bot (6.4.6)
-      activesupport (>= 5.0.0)
-    factory_bot_rails (6.4.3)
-      factory_bot (~> 6.4)
+    factory_bot (6.5.1)
+      activesupport (>= 6.1.0)
+    factory_bot_rails (6.4.4)
+      factory_bot (~> 6.5)
       railties (>= 5.0.0)
     faker (3.3.1)
       i18n (>= 1.8.11, < 2)
-    faraday (2.10.0)
-      faraday-net_http (>= 2.0, < 3.2)
+    faraday (2.12.2)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
       logger
-    faraday-net_http (3.1.0)
-      net-http
-    ffi (1.17.0)
+    faraday-net_http (3.4.0)
+      net-http (>= 0.5.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-musl)
+    ffi (1.17.1-arm-linux-gnu)
+    ffi (1.17.1-arm-linux-musl)
+    ffi (1.17.1-arm64-darwin)
+    ffi (1.17.1-x86_64-darwin)
+    ffi (1.17.1-x86_64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-musl)
     file_validators (3.0.0)
       activemodel (>= 3.2)
       mime-types (>= 1.0)
-    fog-core (2.4.0)
+    fog-core (2.6.0)
       builder
-      excon (~> 0.71)
+      excon (~> 1.0)
       formatador (>= 0.2, < 2.0)
       mime-types
-    fog-local (0.8.0)
+    fog-local (0.9.0)
       fog-core (>= 1.27, < 3.0)
     formatador (1.1.0)
     foundation_rails_helper (4.0.1)
@@ -389,31 +396,32 @@ GEM
       activesupport (>= 4.1, < 7.1)
       railties (>= 4.1, < 7.1)
     gemoji (3.0.1)
-    geocoder (1.8.3)
+    geocoder (1.8.5)
       base64 (>= 0.1.0)
       csv (>= 3.0.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    graphql (2.0.31)
+    graphql (2.2.17)
       base64
-    graphql-docs (3.0.1)
-      commonmarker (~> 0.16)
-      escape_utils (~> 1.2.2)
+    graphql-docs (4.0.0)
+      commonmarker (~> 0.23, >= 0.23.6)
+      dartsass (~> 1.49)
+      escape_utils (~> 1.2)
       extended-markdown-filter (~> 0.4)
       gemoji (~> 3.0)
       graphql (~> 2.0)
-      html-pipeline (~> 2.9)
-      sass (~> 3.4)
-    hashdiff (1.1.0)
+      html-pipeline (~> 2.14, >= 2.14.3)
+    hashdiff (1.1.2)
     hashie (5.0.0)
-    highline (3.0.1)
+    highline (3.1.2)
+      reline
     html-pipeline (2.14.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     htmlentities (4.3.4)
-    i18n (1.14.5)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (1.0.14)
+    i18n-tasks (1.0.15)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
       erubi
@@ -422,18 +430,20 @@ GEM
       parser (>= 3.2.2.1)
       rails-i18n
       rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.8, >= 1.8.1)
       terminal-table (>= 1.5.1)
-    i18n_data (0.11.0)
-    icalendar (2.10.1)
+    icalendar (2.10.3)
       ice_cube (~> 0.16)
-    ice_cube (0.16.4)
-    image_processing (1.12.2)
-      mini_magick (>= 4.9.5, < 5)
+      ostruct
+    ice_cube (0.17.0)
+    image_processing (1.14.0)
+      mini_magick (>= 4.9.5, < 6)
       ruby-vips (>= 2.0.17, < 3)
     invisible_captcha (0.13.0)
       rails (>= 3.2.0)
-    json (2.7.2)
-    jwt (2.8.2)
+    io-console (0.8.0)
+    json (2.10.2)
+    jwt (2.10.1)
       base64
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -447,7 +457,8 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    launchy (3.1.0)
+    language_server-protocol (3.17.0.4)
+    launchy (3.1.1)
       addressable (~> 2.8)
       childprocess (~> 5.0)
       logger (~> 1.6)
@@ -461,8 +472,8 @@ GEM
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.0)
-    loofah (2.22.0)
+    logger (1.7.0)
+    loofah (2.24.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -473,17 +484,19 @@ GEM
     marcel (1.0.4)
     matrix (0.4.2)
     method_source (1.1.0)
-    mime-types (3.5.2)
+    mime-types (3.6.2)
+      logger
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0702)
+    mime-types-data (3.2025.0402)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    minitest (5.24.1)
-    msgpack (1.7.2)
-    multi_xml (0.6.0)
-    net-http (0.4.1)
+    minitest (5.25.5)
+    msgpack (1.8.0)
+    multi_xml (0.7.1)
+      bigdecimal (~> 3.1)
+    net-http (0.6.0)
       uri
-    net-imap (0.4.14)
+    net-imap (0.5.6)
       date
       net-protocol
     net-pop (0.1.2)
@@ -492,10 +505,22 @@ GEM
       timeout
     net-smtp (0.3.4)
       net-protocol
-    nio4r (2.7.3)
-    nokogiri (1.16.6-x86_64-darwin)
+    nio4r (2.7.4)
+    nokogiri (1.18.7-aarch64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.7-aarch64-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.7-arm-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.7-arm-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.16.6-x86_64-linux)
+    nokogiri (1.18.7-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.7-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.7-x86_64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.7-x86_64-linux-musl)
       racc (~> 1.4)
     oauth (1.1.0)
       oauth-tty (~> 1.0, >= 1.0.1)
@@ -510,20 +535,21 @@ GEM
       rack (>= 1.2, < 4)
       snaky_hash (~> 2.0)
       version_gem (~> 1.1)
-    omniauth (2.1.2)
+    omniauth (2.1.3)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
     omniauth-facebook (5.0.0)
       omniauth-oauth2 (~> 1.2)
-    omniauth-google-oauth2 (1.1.2)
-      jwt (>= 2.0)
+    omniauth-google-oauth2 (1.2.1)
+      jwt (>= 2.9.2)
       oauth2 (~> 2.0)
       omniauth (~> 2.0)
       omniauth-oauth2 (~> 1.8)
-    omniauth-oauth (1.2.0)
+    omniauth-oauth (1.2.1)
       oauth
       omniauth (>= 1.0, < 3)
+      rack (>= 1.6.2, < 4)
     omniauth-oauth2 (1.8.0)
       oauth2 (>= 1.4, < 3)
       omniauth (~> 2.0)
@@ -533,37 +559,39 @@ GEM
     omniauth-twitter (1.4.0)
       omniauth-oauth (~> 1.1)
       rack
-    openssl (3.2.0)
+    openssl (3.3.0)
     orm_adapter (0.5.0)
+    ostruct (0.6.1)
     paper_trail (12.3.0)
       activerecord (>= 5.2)
       request_store (~> 1.1)
-    parallel (1.25.1)
-    parallel_tests (4.7.1)
+    parallel (1.26.3)
+    parallel_tests (4.10.1)
       parallel
-    parser (3.3.3.0)
+    parser (3.3.7.4)
       ast (~> 2.4.1)
       racc
     pg (1.4.6)
-    pg_search (2.3.6)
-      activerecord (>= 5.2)
-      activesupport (>= 5.2)
+    pg_search (2.3.7)
+      activerecord (>= 6.1)
+      activesupport (>= 6.1)
     polyglot (0.3.5)
-    premailer (1.23.0)
+    premailer (1.27.0)
       addressable
-      css_parser (>= 1.12.0)
+      css_parser (>= 1.19.0)
       htmlentities (>= 4.0.0)
     premailer-rails (1.12.0)
       actionmailer (>= 3)
       net-smtp
       premailer (~> 1.7, >= 1.7.9)
+    prism (1.4.0)
     psych (4.0.6)
       stringio
-    public_suffix (6.0.0)
-    puma (6.4.2)
+    public_suffix (6.0.1)
+    puma (6.6.0)
       nio4r (~> 2.0)
-    racc (1.8.0)
-    rack (2.2.9)
+    racc (1.8.1)
+    rack (2.2.13)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-cors (1.1.1)
@@ -573,23 +601,22 @@ GEM
       rack (~> 2.2, >= 2.2.4)
     rack-proxy (0.7.7)
       rack
-    rack-test (2.1.0)
+    rack-test (2.2.0)
       rack (>= 1.3)
-    rails (6.1.7.8)
-      actioncable (= 6.1.7.8)
-      actionmailbox (= 6.1.7.8)
-      actionmailer (= 6.1.7.8)
-      actionpack (= 6.1.7.8)
-      actiontext (= 6.1.7.8)
-      actionview (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activemodel (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activestorage (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    rails (7.0.8.7)
+      actioncable (= 7.0.8.7)
+      actionmailbox (= 7.0.8.7)
+      actionmailer (= 7.0.8.7)
+      actionpack (= 7.0.8.7)
+      actiontext (= 7.0.8.7)
+      actionview (= 7.0.8.7)
+      activejob (= 7.0.8.7)
+      activemodel (= 7.0.8.7)
+      activerecord (= 7.0.8.7)
+      activestorage (= 7.0.8.7)
+      activesupport (= 7.0.8.7)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.8)
-      sprockets-rails (>= 2.0.0)
+      railties (= 7.0.8.7)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -598,18 +625,19 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
-      nokogiri (~> 1.14)
-    rails-i18n (6.0.0)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    rails-i18n (7.0.10)
       i18n (>= 0.7, < 2)
-      railties (>= 6.0.0, < 7)
-    railties (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+      railties (>= 6.0.0, < 8)
+    railties (7.0.8.7)
+      actionpack (= 7.0.8.7)
+      activesupport (= 7.0.8.7)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rainbow (3.1.1)
     rake (13.2.1)
     ransack (3.2.1)
@@ -619,35 +647,36 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    redcarpet (3.6.0)
+    redcarpet (3.6.1)
     redis (4.8.1)
-    regexp_parser (2.9.2)
+    regexp_parser (2.10.0)
+    reline (0.6.0)
+      io-console (~> 0.5)
     request_store (1.5.1)
       rack (>= 1.4)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.3.1)
-      strscan
+    rexml (3.4.1)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-cells (0.3.9)
+    rspec-cells (0.3.10)
       cells (>= 4.0.0, < 6.0.0)
-      rspec-rails (>= 3.0.0, < 6.2.0)
-    rspec-core (3.13.0)
+      rspec-rails (>= 3.0.0)
+    rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-html-matchers (0.10.0)
       nokogiri (~> 1)
       rspec (>= 3.0.0.a)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (6.1.3)
+    rspec-rails (6.1.5)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
@@ -657,60 +686,60 @@ GEM
       rspec-support (~> 3.13)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.13.1)
+    rspec-support (3.13.2)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.50.2)
+    rubocop (1.65.1)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
-      parser (>= 3.3.1.0)
+    rubocop-ast (1.44.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.1)
-      rubocop (~> 1.41)
-    rubocop-faker (1.1.0)
+    rubocop-factory_bot (2.26.1)
+      rubocop (~> 1.61)
+    rubocop-faker (1.2.0)
       faker (>= 2.12.0)
-      rubocop (>= 0.82.0)
-    rubocop-rails (2.25.1)
+      rubocop (>= 1.13.0)
+    rubocop-performance (1.23.1)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rails (2.29.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
+      rubocop (>= 1.52.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (2.31.0)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
-      rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.28.3)
-      rubocop (~> 1.40)
+    rubocop-rspec (3.4.0)
+      rubocop (~> 1.61)
+    rubocop-rspec_rails (2.30.0)
+      rubocop (~> 1.61)
+      rubocop-rspec (~> 3, >= 3.0.1)
+    rubocop-rubycw (0.1.6)
+      rubocop (~> 1.0)
     ruby-progressbar (1.13.0)
-    ruby-vips (2.2.1)
+    ruby-vips (2.2.3)
       ffi (~> 1.12)
-    rubyXL (3.4.27)
+      logger
+    rubyXL (3.4.33)
       nokogiri (>= 1.10.8)
       rubyzip (>= 1.3.0)
     rubyzip (2.3.2)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    selenium-webdriver (4.22.0)
+    selenium-webdriver (4.30.1)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    semantic_range (3.0.0)
-    seven_zip_ruby (1.3.0)
+    semantic_range (3.1.0)
     shakapacker (7.1.0)
       activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
@@ -723,46 +752,35 @@ GEM
     simplecov-cobertura (2.1.0)
       rexml
       simplecov (~> 0.19)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    sixarm_ruby_unaccent (1.2.2)
     smart_properties (1.17.0)
     snaky_hash (2.0.1)
       hashie
       version_gem (~> 1.1, >= 1.1.1)
-    sort_alphabetical (1.1.0)
-      unicode_utils (>= 1.2.2)
-    spring (2.1.1)
-    spring-watcher-listen (2.0.1)
+    spring (4.3.0)
+    spring-watcher-listen (2.1.0)
       listen (>= 2.7, < 4.0)
-      spring (>= 1.2, < 3.0)
-    sprockets (4.2.1)
-      concurrent-ruby (~> 1.0)
-      rack (>= 2.2.4, < 4)
-    sprockets-rails (3.5.1)
-      actionpack (>= 6.1)
-      activesupport (>= 6.1)
-      sprockets (>= 3.0.0)
-    ssrf_filter (1.1.2)
-    stringio (3.1.1)
-    strscan (3.1.0)
+      spring (>= 4)
+    stringio (3.1.6)
     temple (0.10.3)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
-    thor (1.3.1)
-    tilt (2.4.0)
-    timeout (0.4.1)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
+    thor (1.3.2)
+    tilt (2.6.0)
+    timeout (0.4.3)
+    trailblazer-option (0.1.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    unicode-display_width (2.5.0)
-    unicode_utils (1.4.0)
+    unaccent (0.4.0)
+    unicode-display_width (2.6.0)
     uniform_notifier (1.16.0)
-    uri (0.13.0)
+    uri (1.0.3)
     valid_email2 (4.0.6)
       activemodel (>= 3.2)
       mail (~> 2.5)
-    version_gem (1.1.4)
+    version_gem (1.1.6)
     w3c_rspec_validators (0.3.0)
       rails
       rspec
@@ -781,33 +799,40 @@ GEM
     web-push (3.0.1)
       jwt (~> 2.0)
       openssl (~> 3.0)
-    webmock (3.23.1)
+    webmock (3.25.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    websocket (1.2.10)
-    websocket-driver (0.7.6)
+    websocket (1.2.11)
+    websocket-driver (0.7.7)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    wicked_pdf (2.8.0)
+    wicked_pdf (2.8.2)
       activesupport
+      ostruct
     wisper (2.0.1)
     wisper-rspec (1.1.0)
-    wkhtmltopdf-binary (0.12.6.7)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.16)
+    zeitwerk (2.7.2)
 
 PLATFORMS
-  x86_64-darwin-24
-  x86_64-linux
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux-gnu
+  arm-linux-musl
+  arm64-darwin
+  x86_64-darwin
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
   bootsnap (~> 1.3)
   byebug (~> 11.0)
-  country_select (~> 4.0)
-  decidim (~> 0.28)
-  decidim-dev (~> 0.28)
+  country_select (~> 9.0)
+  decidim (~> 0.29)
+  decidim-dev (~> 0.29)
   decidim-extra_user_fields!
   faker (~> 3.3.1)
   letter_opener_web (~> 2.0)
@@ -816,12 +841,12 @@ DEPENDENCIES
   rubocop-factory_bot (!= 2.26.0)
   rubocop-faker
   rubocop-rspec_rails (!= 2.29.0)
-  spring (~> 2.0)
+  spring (~> 4.0)
   spring-watcher-listen (~> 2.0)
   web-console (~> 4.2)
 
 RUBY VERSION
-   ruby 3.1.1p18
+   ruby 3.2.2p53
 
 BUNDLED WITH
-   2.4.10
+   2.5.22
diff --git a/app/commands/concerns/decidim/extra_user_fields/update_account_commands_overrides.rb b/app/commands/concerns/decidim/extra_user_fields/update_account_commands_overrides.rb
index 2907c1e..41989f6 100644
--- a/app/commands/concerns/decidim/extra_user_fields/update_account_commands_overrides.rb
+++ b/app/commands/concerns/decidim/extra_user_fields/update_account_commands_overrides.rb
@@ -11,17 +11,17 @@ module UpdateAccountCommandsOverrides
       private
 
       def update_personal_data
-        @user.locale = @form.locale
-        @user.name = @form.name
-        @user.nickname = @form.nickname
-        @user.email = @form.email
-        @user.personal_url = @form.personal_url
-        @user.about = @form.about
-        @user.extended_data = extended_data
+        current_user.locale = @form.locale
+        current_user.name = @form.name
+        current_user.nickname = @form.nickname
+        current_user.email = @form.email
+        current_user.personal_url = @form.personal_url
+        current_user.about = @form.about
+        current_user.extended_data = extended_data
       end
 
       def extended_data
-        @extended_data ||= (@user&.extended_data || {}).merge(
+        @extended_data ||= (current_user&.extended_data || {}).merge(
           country: @form.country,
           postal_code: @form.postal_code,
           date_of_birth: @form.date_of_birth,
diff --git a/app/forms/concerns/decidim/extra_user_fields/forms_definitions.rb b/app/forms/concerns/decidim/extra_user_fields/forms_definitions.rb
index 982d7ac..d35b8bb 100644
--- a/app/forms/concerns/decidim/extra_user_fields/forms_definitions.rb
+++ b/app/forms/concerns/decidim/extra_user_fields/forms_definitions.rb
@@ -89,7 +89,7 @@ def phone_number?
       end
 
       def phone_number_format?
-        return unless phone_number?
+        return false unless phone_number?
 
         current_organization.extra_user_field_configuration(:phone_number)["pattern"].present?
       end
diff --git a/app/packs/entrypoints/decidim_extra_user_fields.js b/app/packs/entrypoints/decidim_extra_user_fields.js
index 1264f1e..1694e56 100644
--- a/app/packs/entrypoints/decidim_extra_user_fields.js
+++ b/app/packs/entrypoints/decidim_extra_user_fields.js
@@ -2,3 +2,4 @@
 require.context("../images", true)
 
 import "src/decidim/extra_user_fields/signup_form"
+import "src/decidim/extra_user_fields/accessible_datepicker"
diff --git a/app/packs/entrypoints/decidim_extra_user_fields.scss b/app/packs/entrypoints/decidim_extra_user_fields.scss
index 6b0fef8..95d1f8c 100644
--- a/app/packs/entrypoints/decidim_extra_user_fields.scss
+++ b/app/packs/entrypoints/decidim_extra_user_fields.scss
@@ -1 +1,2 @@
 @import "stylesheets/decidim/extra_user_fields/signup_form";
+@import "stylesheets/decidim/extra_user_fields/account_form";
diff --git a/app/packs/src/decidim/extra_user_fields/accessible_datepicker.js b/app/packs/src/decidim/extra_user_fields/accessible_datepicker.js
new file mode 100644
index 0000000..8955c8a
--- /dev/null
+++ b/app/packs/src/decidim/extra_user_fields/accessible_datepicker.js
@@ -0,0 +1,14 @@
+$(document).ready(function() {
+    const accountInput = $('#user_date_of_birth_date');
+    const registrationInput = $('#registration_user_date_of_birth_date')
+    const button = $('.datepicker__calendar-button');
+    if (accountInput && !accountInput.attr('aria-label')){
+        accountInput.attr('aria-label', "user date of birth")
+    }
+    if (registrationInput && !registrationInput.attr('aria-label')){
+        registrationInput.attr('aria-label', "user date of birth")
+    }
+    if (button && !button.attr('aria-label')){
+        button.attr('aria-label', "datepicker button")
+    }
+});
diff --git a/app/packs/src/decidim/extra_user_fields/signup_form.js b/app/packs/src/decidim/extra_user_fields/signup_form.js
index 12739c7..6f3a9f3 100644
--- a/app/packs/src/decidim/extra_user_fields/signup_form.js
+++ b/app/packs/src/decidim/extra_user_fields/signup_form.js
@@ -3,6 +3,7 @@ $(document).ready(function() {
     const statutoryRepresentativeEmailField = $('#statutory_representative_email_field');
     const dateOfBirthField = $('#registration_user_date_of_birth');
     const underageFieldSet = $('#underage_fieldset');
+    const buttonCalendar = $('button.datepicker__pick-calendar');
     let underageLimit = 18;
 
     // Function to show or hide underage related fields based on age
@@ -59,8 +60,15 @@ $(document).ready(function() {
     }
 
     if (dateOfBirthField.length && underageFieldSet.length) {
-        dateOfBirthField.on('change', function() {
-            updateUnderageFields();
-        });
+        $(document).on('keyup', dateOfBirthField, function() {
+            setTimeout(() => {
+                updateUnderageFields();
+            }, 500)
+        })
+        $(document).on('click', buttonCalendar, function() {
+            setTimeout(() => {
+                updateUnderageFields();
+            }, 500)
+        })
     }
 });
diff --git a/app/packs/stylesheets/decidim/extra_user_fields/account_form.scss b/app/packs/stylesheets/decidim/extra_user_fields/account_form.scss
new file mode 100644
index 0000000..e3eefdd
--- /dev/null
+++ b/app/packs/stylesheets/decidim/extra_user_fields/account_form.scss
@@ -0,0 +1,20 @@
+.datepicker__help-text-container {
+  position: relative;
+  width: 100%;
+  height: 1rem;
+}
+#user_date_of_birth_date {
+  margin-top: -1rem;
+}
+button.datepicker__calendar-button {
+  top: -0.5rem;
+}
+.datepicker__help-date {
+  position: relative;
+  display: inline-block;
+  width: 50%;
+  margin-top: 0 !important;
+}
+label[for="user_date_of_birth"] {
+  margin-bottom: -2rem;
+}
diff --git a/app/packs/stylesheets/decidim/extra_user_fields/signup_form.scss b/app/packs/stylesheets/decidim/extra_user_fields/signup_form.scss
index f4d336f..49cd29b 100644
--- a/app/packs/stylesheets/decidim/extra_user_fields/signup_form.scss
+++ b/app/packs/stylesheets/decidim/extra_user_fields/signup_form.scss
@@ -1,3 +1,20 @@
 .hidden {
   display: none;
 }
+.datepicker__help-text-container {
+  position: relative;
+  width: 100%;
+  height: 1rem;
+}
+#registration_user_date_of_birth_date {
+  margin-top: 0;
+}
+#registration_user_date_of_birth_datepicker_row button.datepicker__calendar-button {
+  top: 0;
+}
+.datepicker__help-date {
+  position: relative;
+  display: inline-block;
+  width: 50%;
+  margin-top: 0 !important;
+}
diff --git a/app/views/decidim/extra_user_fields/_profile_form.html.erb b/app/views/decidim/extra_user_fields/_profile_form.html.erb
index 46473e0..492a0f0 100644
--- a/app/views/decidim/extra_user_fields/_profile_form.html.erb
+++ b/app/views/decidim/extra_user_fields/_profile_form.html.erb
@@ -30,3 +30,5 @@
     <%= f.hidden_field :statutory_representative_email, value: current_user.extended_data["statutory_representative_email"] || "" %>
   <% end %>
 <% end %>
+<%= append_javascript_pack_tag "decidim_extra_user_fields.js" %>
+<%= append_stylesheet_pack_tag "decidim_extra_user_fields_css" %>
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 3e2a517..e020187 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -23,7 +23,7 @@ ca:
       actions:
         export: Exporta
       exports:
-        export_as: Exporta com a %{export_format}
+        export_as: Exporta %{name} com a %{export_format}
       extra_user_fields:
         menu:
           title: Gestiona camps d'usuari addicionals
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 50d9c8d..e9932a1 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -20,7 +20,7 @@ de:
       actions:
         export: Exportieren
       exports:
-        export_as: Exportieren im Format %{export_format}
+        export_as: Exportieren %{name} im Format %{export_format}
       extra_user_fields:
         menu:
           title: Benutzerdefinierte Anmeldefelder verwalten
diff --git a/config/locales/en.yml b/config/locales/en.yml
index af86e18..540ccc3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -22,7 +22,7 @@ en:
       actions:
         export: Export
       exports:
-        export_as: Export %{export_format}
+        export_as: Export %{name} as %{export_format}
       extra_user_fields:
         menu:
           title: Manage extra user fields
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 5df4c30..3ed4207 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -23,7 +23,7 @@ es:
       actions:
         export: Exportar
       exports:
-        export_as: Exportar como %{export_format}
+        export_as: Exportar %{name} como %{export_format}
       extra_user_fields:
         menu:
           title: Administrar campos de usuario adicionales
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index fd9beea..400f6e8 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -23,7 +23,7 @@ fr:
       actions:
         export: Exporter
       exports:
-        export_as: Exporter au format %{export_format}
+        export_as: Exporter %{name} au format %{export_format}
       extra_user_fields:
         menu:
           title: Gérer les champs d'inscription personnalisés
diff --git a/decidim-extra_user_fields.gemspec b/decidim-extra_user_fields.gemspec
index 50077d9..d5f0092 100644
--- a/decidim-extra_user_fields.gemspec
+++ b/decidim-extra_user_fields.gemspec
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email = ["fernando@populate.tools"]
   s.license = "AGPL-3.0"
   s.homepage = "https://github.com/PopulateTools/decidim-module-extra_user_fields"
-  s.required_ruby_version = ">= 3.0.2"
+  s.required_ruby_version = ">= 3.2.2"
 
   s.name = "decidim-extra_user_fields"
   s.summary = "Decidim module to add extra fields to users."
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir["{app,config,lib}/**/*", "LICENSE-AGPLv3.txt", "Rakefile", "README.md"]
 
-  s.add_dependency "country_select", "~> 4.0"
+  s.add_dependency "country_select", "~> 9.0"
   s.add_dependency "decidim-core", Decidim::ExtraUserFields.decidim_version
   s.add_dependency "deface", "~> 1.5"
 end
diff --git a/lib/decidim/extra_user_fields/admin_engine.rb b/lib/decidim/extra_user_fields/admin_engine.rb
index 0c058a3..e398626 100644
--- a/lib/decidim/extra_user_fields/admin_engine.rb
+++ b/lib/decidim/extra_user_fields/admin_engine.rb
@@ -17,7 +17,7 @@ class AdminEngine < ::Rails::Engine
         end
 
         resources :extra_user_fields, only: [:index]
-        match "/extra_user_fields" => "extra_user_fields#update", :via => :patch, as: "update"
+        match "/extra_user_fields" => "extra_user_fields#update", :via => :patch, :as => "update"
 
         root to: "extra_user_fields#index"
       end
diff --git a/lib/decidim/extra_user_fields/version.rb b/lib/decidim/extra_user_fields/version.rb
index f28f7fe..5349aae 100644
--- a/lib/decidim/extra_user_fields/version.rb
+++ b/lib/decidim/extra_user_fields/version.rb
@@ -4,11 +4,11 @@ module Decidim
   # This holds the decidim-extra_user_fields version.
   module ExtraUserFields
     def self.version
-      "0.28.0"
+      "0.29.0"
     end
 
     def self.decidim_version
-      [">= 0.28"].freeze
+      [">= 0.29"].freeze
     end
   end
 end
diff --git a/spec/factories.rb b/spec/factories.rb
index 3fda653..98a1ab7 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -9,7 +9,10 @@
       create_static_pages { true }
     end
 
-    name { Faker::Company.unique.name }
+    # we do not want machine translation here
+    name do
+      Decidim.available_locales.index_with { |_locale| Faker::Company.unique.name }
+    end
     reference_prefix { Faker::Name.suffix }
     time_zone { "UTC" }
     twitter_handler { Faker::Hipster.word }
@@ -34,7 +37,7 @@
     admin_terms_of_service_body { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     force_users_to_authenticate_before_access_organization { false }
     machine_translation_display_priority { "original" }
-    external_domain_whitelist { ["example.org", "twitter.com", "facebook.com", "youtube.com", "github.com", "mytesturl.me"] }
+    external_domain_allowlist { ["example.org", "twitter.com", "facebook.com", "youtube.com", "github.com", "mytesturl.me"] }
     smtp_settings do
       {
         "from" => "test@example.org",
diff --git a/spec/models/decidim/organization_spec.rb b/spec/models/decidim/organization_spec.rb
index 4760cfc..57ff74a 100644
--- a/spec/models/decidim/organization_spec.rb
+++ b/spec/models/decidim/organization_spec.rb
@@ -32,6 +32,10 @@ module Decidim
           enabled: true,
           client_id: nil,
           client_secret: nil
+        },
+        test: {
+          enabled: true,
+          icon: "tools-line"
         }
       }
     end
diff --git a/spec/system/account_spec.rb b/spec/system/account_spec.rb
index 5c66f68..93143ca 100644
--- a/spec/system/account_spec.rb
+++ b/spec/system/account_spec.rb
@@ -91,8 +91,13 @@
           fill_in :user_name, with: "Nikola Tesla"
           fill_in :user_personal_url, with: "https://example.org"
           fill_in :user_about, with: "A Serbian-American inventor, electrical engineer, mechanical engineer, physicist, and futurist."
-
-          fill_in :user_date_of_birth, with: "01/01/2000"
+          # date_of_birth
+          find(".datepicker__calendar-button").click
+          within "tbody.sc-wc-datepicker" do
+            find("span[aria-hidden=true]", text: "15").click
+          end
+          click_link_or_button "Select"
+          # fill_in :user_date_of_birth_date, with: "01/01/2000"
           select "Other", from: :user_gender
           select "Argentina", from: :user_country
           fill_in :user_postal_code, with: "00000"
@@ -122,7 +127,7 @@
 
       context "when updating avatar" do
         it "can update avatar" do
-          dynamically_attach_file(:user_avatar, Decidim::Dev.asset("avatar.jpg"))
+          dynamically_attach_file(:user_avatar, Decidim::Dev.asset("avatar.jpg"), remove_before: true)
 
           within "form.edit_user" do
             find("*[type=submit]").click
@@ -132,7 +137,7 @@
         end
 
         it "shows error when image is too big" do
-          find("#user_avatar_button").click
+          find_by_id("user_avatar_button").click
 
           within ".upload-modal" do
             click_on "Remove"
@@ -215,14 +220,22 @@
     end
 
     describe "when update password" do
+      let!(:encrypted_password) { user.encrypted_password }
+      let(:new_password) { "decidim1234567890" }
+
       before do
         within "form.edit_user" do
           select "English", from: :user_locale
           fill_in :user_name, with: "Nikola Tesla"
           fill_in :user_personal_url, with: "https://example.org"
           fill_in :user_about, with: "A Serbian-American inventor, electrical engineer, mechanical engineer, physicist, and futurist."
-
-          fill_in :user_date_of_birth, with: "01/01/2000"
+          # date_of_birth
+          find(".datepicker__calendar-button").click
+          within "tbody.sc-wc-datepicker" do
+            find("span[aria-hidden=true]", text: "15").click
+          end
+          click_link_or_button "Select"
+          # fill_in :user_date_of_birth_date, with: "01/01/2000"
           select "Other", from: :user_gender
           select "Argentina", from: :user_country
           fill_in :user_postal_code, with: "00000"
@@ -233,9 +246,6 @@
         click_on "Change password"
       end
 
-      let!(:encrypted_password) { user.encrypted_password }
-      let(:new_password) { "decidim1234567890" }
-
       it "toggles old and new password fields" do
         within "form.edit_user" do
           expect(page).to have_content("must not be too common (e.g. 123456) and must be different from your nickname and your email.")
@@ -281,8 +291,13 @@
           fill_in :user_name, with: "Nikola Tesla"
           fill_in :user_personal_url, with: "https://example.org"
           fill_in :user_about, with: "A Serbian-American inventor, electrical engineer, mechanical engineer, physicist, and futurist."
-
-          fill_in :user_date_of_birth, with: "01/01/2000"
+          # date_of_birth
+          find(".datepicker__calendar-button").click
+          within "tbody.sc-wc-datepicker" do
+            find("span[aria-hidden=true]", text: "15").click
+          end
+          click_link_or_button "Select"
+          # fill_in :user_date_of_birth_date, with: "01/01/2000"
           select "Other", from: :user_gender
           select "Argentina", from: :user_country
           fill_in :user_postal_code, with: "00000"
@@ -469,7 +484,9 @@
           click_on "Delete my account"
         end
 
-        click_on "Yes, I want to delete my account"
+        within "#delete-account-content" do
+          find("input.button", text: "").click
+        end
 
         within_flash_messages do
           expect(page).to have_content("successfully")
diff --git a/spec/system/admin_manages_officializations_spec.rb b/spec/system/admin_manages_officializations_spec.rb
index 93a1b69..e977cfb 100644
--- a/spec/system/admin_manages_officializations_spec.rb
+++ b/spec/system/admin_manages_officializations_spec.rb
@@ -31,7 +31,7 @@
   context "when clicking on export csv button" do
     before do
       find("span.exports").click
-      click_on "Export CSV"
+      click_on "Export Participants as CSV"
     end
 
     it "redirects to officialization index page and display a flash message" do
diff --git a/spec/system/registration_spec.rb b/spec/system/registration_spec.rb
index 9250b93..960eccc 100644
--- a/spec/system/registration_spec.rb
+++ b/spec/system/registration_spec.rb
@@ -11,7 +11,13 @@ def fill_registration_form
 end
 
 def fill_extra_user_fields
-  fill_in :registration_user_date_of_birth, with: "01/01/2000"
+  # date_of_birth
+  find(".datepicker__calendar-button").click
+  within "tbody.sc-wc-datepicker" do
+    page.find("span[aria-hidden=true]", text: "15").click
+  end
+  click_link_or_button "Select"
+  # fill_in :registration_user_date_of_birth, with: "01/01/2000"
   select "Other", from: :registration_user_gender
   select "Argentina", from: :registration_user_country
   fill_in :registration_user_postal_code, with: "00000"
@@ -104,7 +110,6 @@ def fill_extra_user_fields
     within "form.new_user" do
       find("*[type=submit]").click
     end
-
     expect(page).to have_content("message with a confirmation link has been sent")
   end
 
@@ -118,7 +123,6 @@ def fill_extra_user_fields
       within "form.new_user" do
         find("*[type=submit]").click
       end
-
       expect(page).to have_content("message with a confirmation link has been sent")
     end
   end
@@ -133,7 +137,6 @@ def fill_extra_user_fields
       within "form.new_user" do
         find("*[type=submit]").click
       end
-
       expect(page).to have_no_content("message with a confirmation link has been sent")
       within("label[for='registration_user_phone_number']") do
         expect(page).to have_content("There is an error in this field.")
@@ -172,7 +175,6 @@ def fill_extra_user_fields
       within "form.new_user" do
         find("*[type=submit]").click
       end
-
       expect(page).to have_content("message with a confirmation link has been sent")
     end
   end
diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 0000000..fb57ccd
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+