From 2c6ddd7f9093677e90860f092d654ff0879a7503 Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Mon, 27 Jul 2026 15:48:04 +0300
Subject: [PATCH 01/42] rate limit remove 2fa

---
 app/controllers/mfa_setup_controller.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/controllers/mfa_setup_controller.rb b/app/controllers/mfa_setup_controller.rb
index 2ea90412..1860c1ed 100644
--- a/app/controllers/mfa_setup_controller.rb
+++ b/app/controllers/mfa_setup_controller.rb
@@ -20,6 +20,8 @@ class MfaSetupController < ApplicationController
 
       redirect_to settings_profile_index_path, notice: I18n.t('2fa_has_been_configured')
     else
+      RateLimit.call("mfa-setup-otp-#{current_user.id}", limit: 5, ttl: 5.minutes, enabled: true)
+
       @provision_url = current_user.otp_provisioning_uri(current_user.email, issuer: Docuseal.product_name)
 
       @error_message = I18n.t('code_is_invalid')
@@ -34,6 +36,8 @@ class MfaSetupController < ApplicationController
 
       redirect_to settings_profile_index_path, notice: I18n.t('2fa_has_been_removed')
     else
+      RateLimit.call("mfa-setup-otp-#{current_user.id}", limit: 5, ttl: 5.minutes, enabled: true)
+
       @error_message = I18n.t('code_is_invalid')
 
       render turbo_stream: turbo_stream.replace(:modal, template: 'mfa_setup/edit'), status: :unprocessable_content

From 972f38242e824d483684e1a72ce5f8fbdd83872b Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Wed, 29 Jul 2026 21:53:03 +0300
Subject: [PATCH 02/42] update rails

---
 Gemfile.lock | 143 ++++++++++++++++++++++++++-------------------------
 1 file changed, 72 insertions(+), 71 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 816c8acd..15b1bbc8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,31 +1,31 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    action_text-trix (2.1.18)
+    action_text-trix (2.1.19)
       railties
-    actioncable (8.1.3)
-      actionpack (= 8.1.3)
-      activesupport (= 8.1.3)
+    actioncable (8.1.3.1)
+      actionpack (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (8.1.3)
-      actionpack (= 8.1.3)
-      activejob (= 8.1.3)
-      activerecord (= 8.1.3)
-      activestorage (= 8.1.3)
-      activesupport (= 8.1.3)
+    actionmailbox (8.1.3.1)
+      actionpack (= 8.1.3.1)
+      activejob (= 8.1.3.1)
+      activerecord (= 8.1.3.1)
+      activestorage (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
       mail (>= 2.8.0)
-    actionmailer (8.1.3)
-      actionpack (= 8.1.3)
-      actionview (= 8.1.3)
-      activejob (= 8.1.3)
-      activesupport (= 8.1.3)
+    actionmailer (8.1.3.1)
+      actionpack (= 8.1.3.1)
+      actionview (= 8.1.3.1)
+      activejob (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (8.1.3)
-      actionview (= 8.1.3)
-      activesupport (= 8.1.3)
+    actionpack (8.1.3.1)
+      actionview (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
       nokogiri (>= 1.8.5)
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
@@ -33,36 +33,36 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (8.1.3)
+    actiontext (8.1.3.1)
       action_text-trix (~> 2.1.15)
-      actionpack (= 8.1.3)
-      activerecord (= 8.1.3)
-      activestorage (= 8.1.3)
-      activesupport (= 8.1.3)
+      actionpack (= 8.1.3.1)
+      activerecord (= 8.1.3.1)
+      activestorage (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (8.1.3)
-      activesupport (= 8.1.3)
+    actionview (8.1.3.1)
+      activesupport (= 8.1.3.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (8.1.3)
-      activesupport (= 8.1.3)
+    activejob (8.1.3.1)
+      activesupport (= 8.1.3.1)
       globalid (>= 0.3.6)
-    activemodel (8.1.3)
-      activesupport (= 8.1.3)
-    activerecord (8.1.3)
-      activemodel (= 8.1.3)
-      activesupport (= 8.1.3)
+    activemodel (8.1.3.1)
+      activesupport (= 8.1.3.1)
+    activerecord (8.1.3.1)
+      activemodel (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
       timeout (>= 0.4.0)
-    activestorage (8.1.3)
-      actionpack (= 8.1.3)
-      activejob (= 8.1.3)
-      activerecord (= 8.1.3)
-      activesupport (= 8.1.3)
+    activestorage (8.1.3.1)
+      actionpack (= 8.1.3.1)
+      activejob (= 8.1.3.1)
+      activerecord (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
       marcel (~> 1.0)
-    activesupport (8.1.3)
+    activesupport (8.1.3.1)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -144,7 +144,7 @@ GEM
     cldr-plurals-runtime-rb (1.1.0)
     cmdparse (3.0.7)
     coderay (1.1.3)
-    concurrent-ruby (1.3.7)
+    concurrent-ruby (1.3.8)
     connection_pool (3.0.2)
     crack (1.0.1)
       bigdecimal
@@ -179,7 +179,7 @@ GEM
     dotenv (3.2.0)
     drb (2.2.3)
     email_typo (0.2.3)
-    erb (6.0.4)
+    erb (6.0.6)
     erb_lint (0.9.0)
       activesupport
       better_html (>= 2.0.1)
@@ -217,7 +217,7 @@ GEM
     foreman (0.90.0)
       thor (~> 1.4)
     geom2d (0.4.1)
-    globalid (1.3.0)
+    globalid (1.4.0)
       activesupport (>= 6.1)
     google-apis-core (1.0.2)
       addressable (~> 2.8, >= 2.8.7)
@@ -262,7 +262,7 @@ GEM
       geom2d (~> 0.4, >= 0.4.1)
       openssl (>= 2.2.1)
       strscan (>= 3.1.2)
-    i18n (1.14.8)
+    i18n (1.15.2)
       concurrent-ruby (~> 1.0)
     io-console (0.8.2)
     irb (1.18.0)
@@ -271,7 +271,7 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)
-    json (2.19.9)
+    json (2.21.1)
     jwt (3.2.0)
       base64
     language_server-protocol (3.17.0.5)
@@ -296,13 +296,13 @@ GEM
     loofah (2.25.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    mail (2.9.0)
+    mail (2.9.1)
       logger
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
       net-smtp
-    marcel (1.1.0)
+    marcel (1.2.1)
     matrix (0.4.3)
     method_source (1.1.0)
     mini_mime (1.1.5)
@@ -313,7 +313,7 @@ GEM
     multi_json (1.19.1)
     net-http (0.9.1)
       uri (>= 0.11.1)
-    net-imap (0.6.4.1)
+    net-imap (0.6.6)
       date
       net-protocol
     net-pop (0.1.2)
@@ -357,7 +357,7 @@ GEM
     pg (1.6.3-arm64-darwin)
     pg (1.6.3-x86_64-linux)
     pg (1.6.3-x86_64-linux-musl)
-    pp (0.6.3)
+    pp (0.6.4)
       prettyprint
     pretender (1.0.0)
       actionpack (>= 7.2)
@@ -369,9 +369,6 @@ GEM
       reline (>= 0.6.0)
     pry-rails (0.3.11)
       pry (>= 0.13.0)
-    psych (5.3.1)
-      date
-      stringio
     public_suffix (7.0.5)
     puma (8.0.2)
       nio4r (~> 2.0)
@@ -386,20 +383,20 @@ GEM
       rack (>= 1.3)
     rackup (2.3.1)
       rack (>= 3)
-    rails (8.1.3)
-      actioncable (= 8.1.3)
-      actionmailbox (= 8.1.3)
-      actionmailer (= 8.1.3)
-      actionpack (= 8.1.3)
-      actiontext (= 8.1.3)
-      actionview (= 8.1.3)
-      activejob (= 8.1.3)
-      activemodel (= 8.1.3)
-      activerecord (= 8.1.3)
-      activestorage (= 8.1.3)
-      activesupport (= 8.1.3)
+    rails (8.1.3.1)
+      actioncable (= 8.1.3.1)
+      actionmailbox (= 8.1.3.1)
+      actionmailer (= 8.1.3.1)
+      actionpack (= 8.1.3.1)
+      actiontext (= 8.1.3.1)
+      actionview (= 8.1.3.1)
+      activejob (= 8.1.3.1)
+      activemodel (= 8.1.3.1)
+      activerecord (= 8.1.3.1)
+      activestorage (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
       bundler (>= 1.15.0)
-      railties (= 8.1.3)
+      railties (= 8.1.3.1)
     rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
@@ -410,9 +407,9 @@ GEM
     rails-i18n (8.1.0)
       i18n (>= 0.7, < 2)
       railties (>= 8.0.0, < 9)
-    railties (8.1.3)
-      actionpack (= 8.1.3)
-      activesupport (= 8.1.3)
+    railties (8.1.3.1)
+      actionpack (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -421,9 +418,14 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.4.2)
-    rdoc (7.2.0)
+    rbs (4.1.0)
+      logger
+      prism (>= 1.6.0)
+      tsort
+    rdoc (8.0.0)
       erb
-      psych (>= 4.0.0)
+      prism (>= 1.6.0)
+      rbs (>= 4.0.0)
       tsort
     redis-client (0.29.0)
       connection_pool
@@ -530,7 +532,6 @@ GEM
     sqlite3 (2.9.2-arm64-darwin)
     sqlite3 (2.9.2-x86_64-linux-gnu)
     sqlite3 (2.9.2-x86_64-linux-musl)
-    stringio (3.2.0)
     strip_attributes (2.0.1)
       activemodel (>= 3.0, < 9.0)
     strscan (3.1.8)
@@ -570,14 +571,14 @@ GEM
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.9.2)
-    websocket-driver (0.8.0)
+    websocket-driver (0.8.2)
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yaml (0.4.0)
-    zeitwerk (2.7.5)
+    zeitwerk (2.8.2)
 
 PLATFORMS
   aarch64-linux

From b8c29324b8af3df96881a1937b3a299a3a64b707 Mon Sep 17 00:00:00 2001
From: Alex Turchyn <alex@docuseal.com>
Date: Tue, 28 Jul 2026 19:27:25 +0300
Subject: [PATCH 03/42] paypal configs

Co-authored-by: Pete Matsyburka <pete@docuseal.com>
---
 app/controllers/account_configs_controller.rb |   6 +-
 .../templates_form_preview_controller.rb      |   2 +-
 app/javascript/application.js                 |   5 +-
 app/javascript/form.js                        |   1 +
 app/javascript/submission_form/form.vue       |   6 +
 app/javascript/submission_form/i18n.js        |  14 ++
 .../submission_form/payment_step.vue          |  66 +++++++--
 app/javascript/template_builder/builder.vue   |  26 +++-
 .../template_builder/field_context_menu.vue   |  13 +-
 .../template_builder/payment_settings.vue     | 140 +++++++++++-------
 config/locales/i18n.yml                       | 127 ++++++++++++++++
 11 files changed, 334 insertions(+), 72 deletions(-)

diff --git a/app/controllers/account_configs_controller.rb b/app/controllers/account_configs_controller.rb
index 079866d7..23d82d94 100644
--- a/app/controllers/account_configs_controller.rb
+++ b/app/controllers/account_configs_controller.rb
@@ -37,7 +37,7 @@ class AccountConfigsController < ApplicationController
   end
 
   def destroy
-    raise InvalidKey unless allowed_keys.include?(@account_config.key)
+    raise InvalidKey unless allowed_destroy_keys.include?(@account_config.key)
 
     @account_config.destroy!
 
@@ -50,6 +50,10 @@ class AccountConfigsController < ApplicationController
     ALLOWED_KEYS
   end
 
+  def allowed_destroy_keys
+    ALLOWED_KEYS
+  end
+
   def load_account_config
     raise InvalidKey unless allowed_keys.include?(account_config_params[:key])
 
diff --git a/app/controllers/templates_form_preview_controller.rb b/app/controllers/templates_form_preview_controller.rb
index 5c4f23c6..f5c1d7a6 100644
--- a/app/controllers/templates_form_preview_controller.rb
+++ b/app/controllers/templates_form_preview_controller.rb
@@ -18,6 +18,6 @@ class TemplatesFormPreviewController < ApplicationController
     @attachments_index = ActiveStorage::Attachment.where(record: @submitter.submission.submitters, name: :attachments)
                                                   .preload(:blob).index_by(&:uuid)
 
-    @form_configs = Submitters::FormConfigs.call(@submitter)
+    @form_configs = Submitters::FormConfigs.call(@submitter, SubmitFormController::CONFIG_KEYS)
   end
 end
diff --git a/app/javascript/application.js b/app/javascript/application.js
index 458a7a4e..d834182a 100644
--- a/app/javascript/application.js
+++ b/app/javascript/application.js
@@ -181,7 +181,10 @@ safeRegisterElement('template-builder', class extends HTMLElement {
       authenticityToken: document.querySelector('meta[name="csrf-token"]')?.content,
       withCustomFields: true,
       withPayment: this.dataset.withPayment === 'true',
-      isPaymentConnected: this.dataset.isPaymentConnected === 'true',
+      isStripeConnected: this.dataset.isPaymentConnected === 'true' || this.dataset.isStripeConnected === 'true',
+      withStripe: this.dataset.withStripe !== 'false',
+      withPaypal: this.dataset.withPaypal === 'true',
+      isPaypalConnected: this.dataset.isPaypalConnected === 'true',
       withFormula: this.dataset.withFormula === 'true',
       withSendButton: this.dataset.withSendButton !== 'false',
       withSignYourselfButton: this.dataset.withSignYourselfButton !== 'false',
diff --git a/app/javascript/form.js b/app/javascript/form.js
index 75158250..ab9535ca 100644
--- a/app/javascript/form.js
+++ b/app/javascript/form.js
@@ -35,6 +35,7 @@ safeRegisterElement('submission-form', class extends HTMLElement {
       scrollPadding: this.dataset.scrollPadding || '-80px',
       signatureText: this.dataset.signatureText,
       language: this.dataset.language,
+      paymentProvider: this.dataset.paymentProvider,
       dryRun: this.dataset.dryRun === 'true',
       expand: ['true', 'false'].includes(this.dataset.expand) ? this.dataset.expand === 'true' : null,
       withSignatureId: this.dataset.withSignatureId === 'true',
diff --git a/app/javascript/submission_form/form.vue b/app/javascript/submission_form/form.vue
index e61feae5..882d7d08 100644
--- a/app/javascript/submission_form/form.vue
+++ b/app/javascript/submission_form/form.vue
@@ -560,6 +560,7 @@
             :fields="formulaFields"
             :values="values"
             :readonly-values="readonlyFieldValues"
+            :provider="paymentProvider"
             @attached="attachments.push($event)"
             @focus="scrollIntoField(currentField)"
             @submit="!isSubmitting && submitStep()"
@@ -1000,6 +1001,11 @@ export default {
       required: false,
       default: ''
     },
+    paymentProvider: {
+      type: String,
+      required: false,
+      default: ''
+    },
     values: {
       type: Object,
       required: false,
diff --git a/app/javascript/submission_form/i18n.js b/app/javascript/submission_form/i18n.js
index 71f73125..1da0bd06 100644
--- a/app/javascript/submission_form/i18n.js
+++ b/app/javascript/submission_form/i18n.js
@@ -107,6 +107,7 @@ const en = {
   email_has_been_sent: 'Email has been sent',
   processing: 'Processing',
   pay_with_stripe: 'Pay with Stripe',
+  pay_with_paypal: 'Pay with PayPal',
   reupload: 'Reupload',
   upload: 'Upload',
   files: 'Files',
@@ -225,6 +226,7 @@ const es = {
   email_has_been_sent: 'El correo electrónico ha sido enviado',
   processing: 'Procesando',
   pay_with_stripe: 'Pagar con Stripe',
+  pay_with_paypal: 'Pagar con PayPal',
   reupload: 'Volver a subir',
   upload: 'Subir',
   files: 'Archivos',
@@ -343,6 +345,7 @@ const it = {
   email_has_been_sent: "L'email è stata inviata",
   processing: 'Elaborazione',
   pay_with_stripe: 'Paga con Stripe',
+  pay_with_paypal: 'Paga con PayPal',
   reupload: 'Ricarica',
   upload: 'Carica',
   files: 'File',
@@ -461,6 +464,7 @@ const de = {
   email_has_been_sent: 'E-Mail wurde gesendet',
   processing: 'Verarbeitung',
   pay_with_stripe: 'Mit Stripe bezahlen',
+  pay_with_paypal: 'Mit PayPal bezahlen',
   reupload: 'Erneut hochladen',
   upload: 'Hochladen',
   files: 'Dateien',
@@ -579,6 +583,7 @@ const fr = {
   email_has_been_sent: "L'e-mail a été envoyé",
   processing: 'Traitement en cours',
   pay_with_stripe: 'Payer avec Stripe',
+  pay_with_paypal: 'Payer avec PayPal',
   reupload: 'Retéléverser',
   upload: 'Téléverser',
   files: 'Fichiers',
@@ -697,6 +702,7 @@ const pl = {
   email_has_been_sent: 'E-mail został wysłany',
   processing: 'Przetwarzanie',
   pay_with_stripe: 'Zapłać za pomocą Stripe',
+  pay_with_paypal: 'Zapłać za pomocą PayPal',
   reupload: 'Ponowne przesłanie',
   upload: 'Przesyłanie',
   files: 'Pliki',
@@ -815,6 +821,7 @@ const uk = {
   email_has_been_sent: 'Електронний лист був відправлений',
   processing: 'Обробка',
   pay_with_stripe: 'Сплатити за допомогою Stripe',
+  pay_with_paypal: 'Сплатити за допомогою PayPal',
   reupload: 'Перезавантажити',
   upload: 'Завантажити',
   files: 'Файли',
@@ -933,6 +940,7 @@ const cs = {
   email_has_been_sent: 'E-mail byl odeslán',
   processing: 'Zpracování',
   pay_with_stripe: 'Zaplatit přes Stripe',
+  pay_with_paypal: 'Zaplatit přes PayPal',
   reupload: 'Znovu nahrát',
   upload: 'Nahrát',
   files: 'Soubory',
@@ -1051,6 +1059,7 @@ const pt = {
   email_has_been_sent: 'Email enviado',
   processing: 'Processamento',
   pay_with_stripe: 'Pagar com Stripe',
+  pay_with_paypal: 'Pagar com PayPal',
   reupload: 'Recarregar',
   upload: 'Carregar',
   files: 'Arquivos',
@@ -1169,6 +1178,7 @@ const he = {
   email_has_been_sent: 'האימייל נשלח',
   processing: 'מעבד',
   pay_with_stripe: 'שלם עם סטרייפ',
+  pay_with_paypal: 'שלם עם פייפאל',
   reupload: 'העלה שוב',
   upload: 'העלאה',
   files: 'קבצים',
@@ -1287,6 +1297,7 @@ const nl = {
   email_has_been_sent: 'E-mail is verzonden',
   processing: 'Verwerken',
   pay_with_stripe: 'Betalen met Stripe',
+  pay_with_paypal: 'Betalen met PayPal',
   reupload: 'Opnieuw uploaden',
   upload: 'Uploaden',
   files: 'Bestanden',
@@ -1405,6 +1416,7 @@ const ar = {
   email_has_been_sent: 'تم إرسال البريد الإلكتروني',
   processing: 'جارٍ المعالجة',
   pay_with_stripe: 'الدفع بواسطة Stripe',
+  pay_with_paypal: 'الدفع بواسطة PayPal',
   reupload: 'إعادة التحميل',
   upload: 'تحميل',
   files: 'الملفات',
@@ -1523,6 +1535,7 @@ const ko = {
   email_has_been_sent: '이메일이 전송되었습니다',
   processing: '처리 중',
   pay_with_stripe: '스트라이프로 결제',
+  pay_with_paypal: 'PayPal로 결제',
   reupload: '다시 업로드',
   upload: '업로드',
   files: '파일',
@@ -1641,6 +1654,7 @@ const ja = {
   email_has_been_sent: 'メールが送信されました',
   processing: '処理中',
   pay_with_stripe: 'Stripeで支払う',
+  pay_with_paypal: 'PayPalで支払う',
   reupload: '再アップロード',
   upload: 'アップロード',
   files: 'ファイル',
diff --git a/app/javascript/submission_form/payment_step.vue b/app/javascript/submission_form/payment_step.vue
index e1afbf40..f1ebabcc 100644
--- a/app/javascript/submission_form/payment_step.vue
+++ b/app/javascript/submission_form/payment_step.vue
@@ -1,6 +1,6 @@
 <template>
   <label
-    v-if="!modelValue && !sessionId"
+    v-if="!modelValue && !isProcessing"
     class="label text-xl sm:text-2xl py-0 mb-2 sm:mb-3.5 field-name-label"
   >
     <MarkdownContent
@@ -25,14 +25,14 @@
       class="hidden"
     >
     <div
-      v-if="modelValue && !sessionId"
+      v-if="modelValue && !isProcessing"
       class=" text-2xl mb-2"
     >
       {{ t('already_paid') }}
     </div>
     <div v-else>
       <button
-        v-if="sessionId"
+        v-if="isProcessing"
         type="button"
         disabled
         class="base-button w-full modal-save-button"
@@ -49,8 +49,8 @@
         v-else
         :id="field.uuid"
         type="button"
-        class="btn bg-[#7B73FF] text-white hover:bg-[#0A2540] text-lg w-full"
-        :class="{ disabled: isCreatingCheckout }"
+        class="btn text-white text-lg w-full"
+        :class="[isPaypal ? 'bg-[#003087] hover:bg-[#012169]' : 'bg-[#7B73FF] hover:bg-[#0A2540]', { disabled: isCreatingCheckout }]"
         :disabled="isCreatingCheckout"
         @click.prevent="postCheckout"
       >
@@ -59,12 +59,16 @@
           width="22"
           class="animate-spin"
         />
+        <IconBrandPaypal
+          v-else-if="isPaypal"
+          width="22"
+        />
         <IconBrandStripe
           v-else
           width="22"
         />
         <span>
-          {{ t('pay_with_stripe') }}
+          {{ isPaypal ? t('pay_with_paypal') : t('pay_with_stripe') }}
         </span>
       </button>
     </div>
@@ -72,13 +76,14 @@
 </template>
 
 <script>
-import { IconBrandStripe, IconInnerShadowTop, IconLoader } from '@tabler/icons-vue'
+import { IconBrandStripe, IconBrandPaypal, IconInnerShadowTop, IconLoader } from '@tabler/icons-vue'
 import MarkdownContent from './markdown_content'
 
 export default {
   name: 'PaymentStep',
   components: {
     IconBrandStripe,
+    IconBrandPaypal,
     MarkdownContent,
     IconInnerShadowTop,
     IconLoader
@@ -111,12 +116,18 @@ export default {
     submitterSlug: {
       type: String,
       required: true
+    },
+    provider: {
+      type: String,
+      required: false,
+      default: ''
     }
   },
   emits: ['focus', 'submit', 'update:model-value', 'attached'],
   data () {
     return {
       isCreatingCheckout: false,
+      isProcessing: false,
       isMathLoaded: false
     }
   },
@@ -131,8 +142,14 @@ export default {
     queryParams () {
       return new URLSearchParams(window.location.search)
     },
+    isPaypal () {
+      return this.provider === 'paypal'
+    },
+    paymentEndpoint () {
+      return this.isPaypal ? '/api/paypal_payments' : '/api/stripe_payments'
+    },
     sessionId () {
-      return this.queryParams.get('stripe_session_id')
+      return this.queryParams.get('stripe_session_id') || this.queryParams.get('paypal_order_id') || (this.isPaypal && this.queryParams.get('token'))
     },
     defaultName () {
       if (this.field.preferences?.price_id || this.field.preferences?.payment_link_id) {
@@ -159,6 +176,8 @@ export default {
   },
   async mounted () {
     if (this.sessionId) {
+      this.isProcessing = true
+
       this.$emit('submit')
     }
 
@@ -175,6 +194,21 @@ export default {
     }
   },
   methods: {
+    normalizedPaymentUrl () {
+      const url = new URL(window.location.href)
+      const keys = ['stripe_session_id', 'paypal_order_id', 'field_uuid']
+
+      if (this.isPaypal) {
+        keys.push('token', 'PayerID')
+      }
+
+      keys.forEach((key) => url.searchParams.delete(key))
+
+      return url.toString()
+    },
+    normalizedPaymentParams () {
+      window.history.replaceState({}, document.title, this.normalizedPaymentUrl())
+    },
     calculateFormula () {
       const transformedFormula = this.normalizeFormula(this.field.preferences.formula).replace(/{{(.*?)}}/g, (match, uuid) => {
         return this.readonlyValues[uuid] || this.values[uuid] || 0.0
@@ -195,7 +229,7 @@ export default {
     },
     async submit () {
       if (this.sessionId) {
-        return fetch(this.baseUrl + '/api/stripe_payments/' + this.sessionId, {
+        return fetch(this.baseUrl + this.paymentEndpoint + '/' + this.sessionId, {
           method: 'PUT',
           body: JSON.stringify({
             submitter_slug: this.submitterSlug
@@ -203,16 +237,22 @@ export default {
           headers: { 'Content-Type': 'application/json' }
         }).then(async (resp) => {
           if (resp.status === 422 || resp.status === 500) {
+            this.isProcessing = false
+
             const data = await resp.json()
 
-            alert(data.error || 'Unexpected error')
+            if (data.error) {
+              alert(data.error)
+            }
 
             return Promise.reject(new Error(data.error))
           }
 
           const attachment = await resp.json()
 
-          window.history.replaceState({}, document.title, window.location.pathname)
+          this.isProcessing = false
+
+          this.normalizedPaymentParams()
 
           this.$emit('update:model-value', attachment.uuid)
           this.$emit('attached', attachment)
@@ -226,13 +266,13 @@ export default {
     postCheckout ({ checkStatus } = {}) {
       this.isCreatingCheckout = true
 
-      fetch(this.baseUrl + '/api/stripe_payments', {
+      fetch(this.baseUrl + this.paymentEndpoint, {
         method: 'POST',
         body: JSON.stringify({
           submitter_slug: this.submitterSlug,
           field_uuid: this.field.uuid,
           check_status: checkStatus,
-          referer: document.location.href
+          referer: this.normalizedPaymentUrl()
         }),
         headers: { 'Content-Type': 'application/json' }
       }).then(async (resp) => {
diff --git a/app/javascript/template_builder/builder.vue b/app/javascript/template_builder/builder.vue
index e12cc78d..d6e3198e 100644
--- a/app/javascript/template_builder/builder.vue
+++ b/app/javascript/template_builder/builder.vue
@@ -779,7 +779,10 @@ export default {
       withVerification: this.withVerification,
       withKba: this.withKba,
       withPayment: this.withPayment,
-      isPaymentConnected: this.isPaymentConnected,
+      isStripeConnected: this.isStripeConnected,
+      withStripe: this.withStripe,
+      withPaypal: this.withPaypal,
+      isPaypalConnected: this.isPaypalConnected,
       withFormula: this.withFormula,
       withConditions: this.withConditions,
       withCustomFields: this.withCustomFields,
@@ -1049,7 +1052,22 @@ export default {
       required: false,
       default: false
     },
-    isPaymentConnected: {
+    isStripeConnected: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    withStripe: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    withPaypal: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    isPaypalConnected: {
       type: Boolean,
       required: false,
       default: false
@@ -1363,6 +1381,10 @@ export default {
       if (document.location.search?.includes('stripe_connect_success')) {
         document.querySelector('form[action="/auth/stripe_connect"]')?.closest('.dropdown')?.querySelector('label')?.focus()
       }
+
+      if (document.location.search?.includes('paypal_connect_success')) {
+        document.querySelector('a[href^="/auth/paypal_connect"]')?.closest('.dropdown')?.querySelector('label')?.focus()
+      }
     })
 
     this.template.schema.forEach((item) => {
diff --git a/app/javascript/template_builder/field_context_menu.vue b/app/javascript/template_builder/field_context_menu.vue
index 8785f4ae..f7223d79 100644
--- a/app/javascript/template_builder/field_context_menu.vue
+++ b/app/javascript/template_builder/field_context_menu.vue
@@ -494,6 +494,7 @@ import FieldType from './field_type.vue'
 import FieldSettings from './field_settings.vue'
 import ContextSubmenu from './field_context_submenu.vue'
 import ContextModal from './field_context_modal.vue'
+import { stripeConnectedRef } from './payment_settings'
 
 export default {
   name: 'FieldContextMenu',
@@ -716,12 +717,18 @@ export default {
     currentCurrency () {
       return this.field.preferences?.currency || 'USD'
     },
+    isStripeConnected: () => stripeConnectedRef.value,
     priceTypeOptions () {
-      return [
+      const options = [
         { value: 'one_off', label: this.t('fixed') },
-        { value: 'formula', label: this.t('formula') },
-        { value: 'payment_link', label: this.t('payment_link') }
+        { value: 'formula', label: this.t('formula') }
       ]
+
+      if (this.isStripeConnected) {
+        options.push({ value: 'payment_link', label: this.t('payment_link') })
+      }
+
+      return options
     },
     currentPriceType () {
       if (this.field.preferences?.formula) {
diff --git a/app/javascript/template_builder/payment_settings.vue b/app/javascript/template_builder/payment_settings.vue
index 331481fe..09fdd479 100644
--- a/app/javascript/template_builder/payment_settings.vue
+++ b/app/javascript/template_builder/payment_settings.vue
@@ -1,7 +1,7 @@
 <template>
   <span
     class="dropdown dropdown-end field-settings-dropdown"
-    :class="{ 'dropdown-open': withForceOpen && ((!field.preferences?.price && !field.preferences?.formula && !field.preferences?.price_id && !field.preferences?.payment_link_id) || !isConnected) && !isLoading }"
+    :class="{ 'dropdown-open': withForceOpen && !field.preferences?.price && !field.preferences?.formula && !field.preferences?.price_id && !field.preferences?.payment_link_id && !isLoading }"
   >
     <label
       tabindex="0"
@@ -21,7 +21,7 @@
       @click="closeDropdown"
     >
       <div
-        v-if="!('price_id' in field.preferences) && !('payment_link_id' in field.preferences)"
+        v-if="isPaypal || (!('price_id' in field.preferences) && !('payment_link_id' in field.preferences))"
         class="field-settings-currency py-1.5 px-1 relative"
         @click.stop
       >
@@ -52,14 +52,14 @@
         @click.stop
       >
         <input
-          v-if="'payment_link_id' in field.preferences"
+          v-if="isStripe && 'payment_link_id' in field.preferences"
           v-model="field.preferences.payment_link_id"
           placeholder="plink_XXXXX"
           class="input input-bordered input-xs w-full max-w-xs h-7 !outline-0"
           @blur="save"
         >
         <input
-          v-else-if="'price_id' in field.preferences"
+          v-else-if="isStripe && 'price_id' in field.preferences"
           v-model="field.preferences.price_id"
           placeholder="Price ID: price_XXXXX"
           class="input input-bordered input-xs w-full max-w-xs h-7 !outline-0"
@@ -89,7 +89,10 @@
         >
           {{ 'payment_link_id' in field.preferences ? t('payment_link') : t('price') }}
         </label>
-        <div class="flex items-center justify-center">
+        <div
+          v-if="isStripe && stripeConnected"
+          class="flex items-center justify-center"
+        >
           <a
             href="#"
             class="hover:underline"
@@ -120,21 +123,22 @@
         </div>
       </div>
       <div
-        v-if="!isConnected || isOauthSuccess"
-        class="field-settings-stripe-connect py-1.5 px-1 relative"
+        v-if="!stripeConnected && !paypalConnected"
+        class="flex flex-col gap-1 py-1.5 px-1"
         @click.stop
       >
-        <div
-          v-if="isConnected && isOauthSuccess"
-          class="text-sm text-center"
+        <a
+          v-if="withPaypal"
+          :href="paypalConnectUrl"
+          target="_blank"
+          data-turbo="false"
+          class="btn bg-[#003087] hover:bg-[#012169] btn-sm text-white w-full"
         >
-          <IconCircleCheck
-            class="inline text-green-600 w-4 h-4"
-          />
-          Stripe Connected
-        </div>
+          <IconBrandPaypal class="w-4 h-4 inline" />
+          <span>Connect PayPal</span>
+        </a>
         <form
-          v-if="!isConnected"
+          v-if="withStripe"
           data-turbo="false"
           action="/auth/stripe_connect"
           accept-charset="UTF-8"
@@ -170,33 +174,25 @@
             :disabled="isLoading"
             class="btn bg-[#7B73FF] hover:bg-[#0A2540] btn-sm text-white w-full"
           >
-            <span
+            <IconInnerShadowTop
               v-if="isLoading"
-              class="flex items-center space-x-1"
-            >
-              <IconInnerShadowTop
-                class="w-4 h-4 animate-spin inline"
-              />
-              <span>
-                Connect Stripe
-              </span>
-            </span>
-            <span
+              class="w-4 h-4 animate-spin inline"
+            />
+            <IconBrandStripe
               v-else
-              class="flex items-center space-x-1"
-            >
-              <IconBrandStripe
-                class="w-4 h-4 inline"
-              />
-              <span>
-                Connect Stripe
-              </span>
-            </span>
+              class="w-4 h-4 inline"
+            />
+            <span>Connect Stripe</span>
           </button>
         </form>
+      </div>
+      <div
+        v-if="isStripe && !stripeConnected"
+        class="px-1 pb-1.5"
+        @click.stop
+      >
         <a
-          v-if="!isConnected"
-          class="block link text-center mt-1"
+          class="block link text-center text-xs"
           href="https://www.docuseal.com/blog/accept-payments-and-request-signatures-with-ease"
           target="_blank"
           data-turbo="false"
@@ -272,24 +268,25 @@
 </template>
 
 <script>
-import { IconMathFunction, IconSettings, IconCircleCheck, IconInfoCircle, IconBrandStripe, IconInnerShadowTop, IconRouteAltLeft, IconForms } from '@tabler/icons-vue'
+import { IconMathFunction, IconSettings, IconInfoCircle, IconBrandStripe, IconBrandPaypal, IconInnerShadowTop, IconRouteAltLeft, IconForms } from '@tabler/icons-vue'
 import { ref } from 'vue'
 
-const isConnected = ref(false)
+export const stripeConnectedRef = ref(false)
+export const paypalConnectedRef = ref(false)
 
 export default {
   name: 'PaymentSettings',
   components: {
     IconSettings,
-    IconCircleCheck,
     IconRouteAltLeft,
     IconInfoCircle,
     IconForms,
     IconMathFunction,
     IconInnerShadowTop,
-    IconBrandStripe
+    IconBrandStripe,
+    IconBrandPaypal
   },
-  inject: ['backgroundColor', 'save', 'currencies', 't', 'isPaymentConnected'],
+  inject: ['backgroundColor', 'save', 'currencies', 't', 'isStripeConnected', 'isPaypalConnected', 'withStripe', 'withPaypal'],
   props: {
     field: {
       type: Object,
@@ -318,13 +315,27 @@ export default {
     }
   },
   computed: {
-    isConnected: () => isConnected.value,
-    isOauthSuccess () {
-      return document.location.search?.includes('stripe_connect_success')
+    stripeConnected: () => stripeConnectedRef.value,
+    paypalConnected: () => paypalConnectedRef.value,
+    provider () {
+      if (this.paypalConnected && !this.stripeConnected) return 'paypal'
+      if (this.stripeConnected && !this.paypalConnected) return 'stripe'
+      if (this.withPaypal && !this.withStripe) return 'paypal'
+
+      return 'stripe'
+    },
+    isStripe () {
+      return this.provider === 'stripe'
+    },
+    isPaypal () {
+      return this.provider === 'paypal'
     },
     redirectUri () {
       return document.location.origin + '/auth/stripe_connect/callback'
     },
+    paypalConnectUrl () {
+      return `/auth/paypal_connect?redir=${encodeURIComponent(document.location.href)}`
+    },
     defaultCurrencies () {
       return ['USD', 'EUR', 'GBP', 'CAD', 'AUD']
     },
@@ -363,26 +374,53 @@ export default {
   mounted () {
     this.field.preferences.currency ||= this.defaultCurrency
 
-    isConnected.value ||= this.isPaymentConnected
+    stripeConnectedRef.value ||= this.isStripeConnected
+    paypalConnectedRef.value ||= this.isPaypalConnected
+
+    if (this.withStripe && !this.stripeConnected && !this.paypalConnected) {
+      this.checkStripeStatus()
+    }
 
-    if (!this.isConnected) {
-      this.checkStatus()
+    if (this.withPaypal && !this.paypalConnected && !this.stripeConnected) {
+      this.checkPaypalStatus()
+      window.addEventListener('focus', this.onWindowFocus)
     }
   },
+  beforeUnmount () {
+    window.removeEventListener('focus', this.onWindowFocus)
+  },
   methods: {
-    checkStatus () {
+    onWindowFocus () {
+      if (this.withPaypal && !this.paypalConnected) {
+        this.checkPaypalStatus()
+      }
+    },
+    checkStripeStatus () {
       this.isLoading = true
 
       fetch('/api/stripe_connect').then(async (resp) => {
         const { status } = await resp.json()
 
         if (status === 'connected') {
-          isConnected.value = true
+          stripeConnectedRef.value = true
+
+          window.removeEventListener('focus', this.onWindowFocus)
         }
       }).finally(() => {
         this.isLoading = false
       })
     },
+    checkPaypalStatus () {
+      fetch('/api/paypal_connect').then(async (resp) => {
+        const { status } = await resp.json()
+
+        if (status === 'connected') {
+          paypalConnectedRef.value = true
+
+          window.removeEventListener('focus', this.onWindowFocus)
+        }
+      })
+    },
     closeDropdown () {
       document.activeElement.blur()
     }
diff --git a/config/locales/i18n.yml b/config/locales/i18n.yml
index 63897f6c..19e11f72 100644
--- a/config/locales/i18n.yml
+++ b/config/locales/i18n.yml
@@ -53,6 +53,25 @@ en: &en
   require_all_recipients: Require all recipients
   stripe_account_has_been_connected: Stripe account has been connected.
   re_connect_stripe: Re-connect Stripe
+  paypal_integration: PayPal Integration
+  paypal_account_has_been_connected: PayPal account has been connected.
+  re_connect_paypal: Re-connect PayPal
+  disconnect: Disconnect
+  failed_to_connect_paypal: Failed to connect PayPal. Please try again.
+  paypal_connect_not_completed: PayPal connection was not completed.
+  payment_receipt: Payment Receipt
+  amount_paid: Amount paid
+  transaction: Transaction
+  transaction_id: Transaction ID
+  order_id: Order ID
+  payment_date: Date
+  paid_by: Paid by
+  paid_to: Paid to
+  business: Business
+  country: Country
+  payer_id: Payer ID
+  merchant_id: Merchant ID
+  breakdown: Breakdown
   bcc_recipients: BCC recipients
   resend_pending: Re-send pending
   always_enforce_signing_order: Always enforce the signing order
@@ -1124,6 +1143,24 @@ es: &es
   stripe_integration: Integración con Stripe
   stripe_account_has_been_connected: La cuenta de Stripe ha sido conectada.
   re_connect_stripe: Volver a conectar Stripe
+  paypal_integration: Integración con PayPal
+  paypal_account_has_been_connected: La cuenta de PayPal ha sido conectada.
+  re_connect_paypal: Volver a conectar PayPal
+  failed_to_connect_paypal: No se pudo conectar PayPal. Por favor, inténtalo de nuevo.
+  paypal_connect_not_completed: La conexión con PayPal no se completó.
+  payment_receipt: Recibo de pago
+  amount_paid: Importe pagado
+  transaction: Transacción
+  transaction_id: ID de transacción
+  order_id: ID de pedido
+  payment_date: Fecha
+  paid_by: Pagado por
+  paid_to: Pagado a
+  business: Empresa
+  country: País
+  payer_id: ID de pagador
+  merchant_id: ID de comerciante
+  breakdown: Desglose
   private: Privado
   _variables: Variables
   your_email_address_has_been_released_immediately_you_can_now_be_added_to_your_company_team_without_waiting_for_the_deletion_period_to_end: Su dirección de correo electrónico ha sido liberada inmediatamente. Si se une a un equipo, ahora puede ser invitado al equipo de su empresa sin esperar a que finalice el período de eliminación.
@@ -2202,6 +2239,24 @@ it: &it
   stripe_integration: Integrazione Stripe
   stripe_account_has_been_connected: L'account Stripe è stato collegato.
   re_connect_stripe: Ricollega Stripe
+  paypal_integration: Integrazione PayPal
+  paypal_account_has_been_connected: L'account PayPal è stato collegato.
+  re_connect_paypal: Ricollega PayPal
+  failed_to_connect_paypal: Impossibile collegare PayPal. Riprova.
+  paypal_connect_not_completed: La connessione con PayPal non è stata completata.
+  payment_receipt: Ricevuta di pagamento
+  amount_paid: Importo pagato
+  transaction: Transazione
+  transaction_id: ID transazione
+  order_id: ID ordine
+  payment_date: Data
+  paid_by: Pagato da
+  paid_to: Pagato a
+  business: Azienda
+  country: Paese
+  payer_id: ID pagatore
+  merchant_id: ID esercente
+  breakdown: Dettaglio
   private: Privato
   _variables: Variabili
   your_email_address_has_been_released_immediately_you_can_now_be_added_to_your_company_team_without_waiting_for_the_deletion_period_to_end: Il tuo indirizzo email è stato rilasciato immediatamente. Se stai per unirti a un team, ora puoi essere invitato nel team della tua azienda senza aspettare la fine del periodo di eliminazione.
@@ -3280,6 +3335,24 @@ fr: &fr
   stripe_integration: Intégration Stripe
   stripe_account_has_been_connected: Le compte Stripe a été connecté.
   re_connect_stripe: Reconnecter Stripe
+  paypal_integration: Intégration PayPal
+  paypal_account_has_been_connected: Le compte PayPal a été connecté.
+  re_connect_paypal: Reconnecter PayPal
+  failed_to_connect_paypal: Échec de la connexion à PayPal. Veuillez réessayer.
+  paypal_connect_not_completed: La connexion à PayPal n'a pas été complétée.
+  payment_receipt: Reçu de paiement
+  amount_paid: Montant payé
+  transaction: Transaction
+  transaction_id: ID de transaction
+  order_id: ID de commande
+  payment_date: Date
+  paid_by: Payé par
+  paid_to: Payé à
+  business: Entreprise
+  country: Pays
+  payer_id: ID payeur
+  merchant_id: ID marchand
+  breakdown: Détail
   private: Privé
   _variables: Variables
   your_email_address_has_been_released_immediately_you_can_now_be_added_to_your_company_team_without_waiting_for_the_deletion_period_to_end: Votre adresse e-mail a été libérée immédiatement. Si vous rejoignez une équipe, vous pouvez maintenant être invité dans l'équipe de votre entreprise sans attendre la fin de la période de suppression.
@@ -4355,6 +4428,24 @@ pt: &pt
   stripe_integration: Integração com Stripe
   stripe_account_has_been_connected: Conta Stripe foi conectada.
   re_connect_stripe: Reconectar Stripe
+  paypal_integration: Integração com PayPal
+  paypal_account_has_been_connected: Conta PayPal foi conectada.
+  re_connect_paypal: Reconectar PayPal
+  failed_to_connect_paypal: Falha ao conectar PayPal. Tente novamente.
+  paypal_connect_not_completed: A conexão com PayPal não foi concluída.
+  payment_receipt: Recibo de pagamento
+  amount_paid: Valor pago
+  transaction: Transação
+  transaction_id: ID da transação
+  order_id: ID do pedido
+  payment_date: Data
+  paid_by: Pago por
+  paid_to: Pago a
+  business: Empresa
+  country: País
+  payer_id: ID do pagador
+  merchant_id: ID do comerciante
+  breakdown: Detalhamento
   private: Privado
   _variables: Variáveis
   your_email_address_has_been_released_immediately_you_can_now_be_added_to_your_company_team_without_waiting_for_the_deletion_period_to_end: Seu endereço de e-mail foi liberado imediatamente. Se você estiver entrando em uma equipe, agora pode ser convidado para a equipe da sua empresa sem esperar o fim do período de exclusão.
@@ -5443,6 +5534,24 @@ de: &de
   require_all_recipients: Alle Empfänger verpflichten
   stripe_account_has_been_connected: Stripe-Konto wurde verbunden.
   re_connect_stripe: Stripe erneut verbinden
+  paypal_integration: PayPal-Integration
+  paypal_account_has_been_connected: PayPal-Konto wurde verbunden.
+  re_connect_paypal: PayPal erneut verbinden
+  failed_to_connect_paypal: PayPal konnte nicht verbunden werden. Bitte erneut versuchen.
+  paypal_connect_not_completed: Die PayPal-Verbindung wurde nicht abgeschlossen.
+  payment_receipt: Zahlungsbeleg
+  amount_paid: Gezahlter Betrag
+  transaction: Transaktion
+  transaction_id: Transaktions-ID
+  order_id: Bestell-ID
+  payment_date: Datum
+  paid_by: Gezahlt von
+  paid_to: Gezahlt an
+  business: Unternehmen
+  country: Land
+  payer_id: Zahler-ID
+  merchant_id: Händler-ID
+  breakdown: Aufschlüsselung
   bcc_recipients: BCC-Empfänger
   resend_pending: Ausstehende erneut versenden
   always_enforce_signing_order: Reihenfolge der Unterschriften immer erzwingen
@@ -6925,6 +7034,24 @@ nl: &nl
   require_all_recipients: Alle ontvangers verplichten
   stripe_account_has_been_connected: Stripe-account is verbonden.
   re_connect_stripe: Stripe opnieuw verbinden
+  paypal_integration: PayPal-integratie
+  paypal_account_has_been_connected: PayPal-account is verbonden.
+  re_connect_paypal: PayPal opnieuw verbinden
+  failed_to_connect_paypal: PayPal kon niet worden verbonden. Probeer het opnieuw.
+  paypal_connect_not_completed: De verbinding met PayPal is niet voltooid.
+  payment_receipt: Betalingsbewijs
+  amount_paid: Betaald bedrag
+  transaction: Transactie
+  transaction_id: Transactie-ID
+  order_id: Order-ID
+  payment_date: Datum
+  paid_by: Betaald door
+  paid_to: Betaald aan
+  business: Bedrijf
+  country: Land
+  payer_id: Betaler-ID
+  merchant_id: Verkoper-ID
+  breakdown: Specificatie
   bcc_recipients: BCC-ontvangers
   resend_pending: Opnieuw verzenden in behandeling
   always_enforce_signing_order: Ondertekenvolgorde altijd afdwingen

From 5ec8e4ccc7104c75a364af7ccfbdc672f08af44e Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Thu, 30 Jul 2026 10:43:59 +0300
Subject: [PATCH 04/42] text formula

---
 .../submission_form/accessibility_areas.vue   |  5 ++--
 .../submission_form/formula_areas.vue         | 23 +++++++++++++++++--
 app/javascript/template_builder/builder.vue   | 21 ++++++++++++++++-
 .../template_builder/field_context_menu.vue   |  2 +-
 .../template_builder/field_settings.vue       |  2 +-
 .../template_builder/formula_modal.vue        | 12 ++++++++--
 lib/submitters/submit_values.rb               | 15 ++++++++++--
 7 files changed, 69 insertions(+), 11 deletions(-)

diff --git a/app/javascript/submission_form/accessibility_areas.vue b/app/javascript/submission_form/accessibility_areas.vue
index 6e720e93..8f05d4c9 100644
--- a/app/javascript/submission_form/accessibility_areas.vue
+++ b/app/javascript/submission_form/accessibility_areas.vue
@@ -69,8 +69,8 @@
               :attachments-index="attachmentsIndex"
             />
             <FieldArea
-              v-else-if="item.type === 'formula_area' && isMathLoaded"
-              :model-value="calculateFormula(item.field)"
+              v-else-if="item.type === 'formula_area' && (isMathLoaded || item.field.type === 'text')"
+              :model-value="item.field.type === 'text' ? evalTextFormula(item.field) : calculateFormula(item.field)"
               :is-inline-size="isInlineSize"
               :field="item.field"
               :area="item.area"
@@ -289,6 +289,7 @@ export default {
   methods: {
     normalizeFormula: FormulaAreas.methods.normalizeFormula,
     calculateFormula: FormulaAreas.methods.calculateFormula,
+    evalTextFormula: FormulaAreas.methods.evalTextFormula,
     scrollInContainer: FieldAreas.methods.scrollInContainer,
     scrollIntoArea: FieldAreas.methods.scrollIntoArea,
     scrollIntoField: FieldAreas.methods.scrollIntoField,
diff --git a/app/javascript/submission_form/formula_areas.vue b/app/javascript/submission_form/formula_areas.vue
index b0b1698c..77e633f0 100644
--- a/app/javascript/submission_form/formula_areas.vue
+++ b/app/javascript/submission_form/formula_areas.vue
@@ -12,8 +12,8 @@
         :to="findPageElementForArea(area)"
       >
         <FieldArea
-          v-if="isMathLoaded"
-          :model-value="calculateFormula(field)"
+          v-if="isMathLoaded || field.type === 'text'"
+          :model-value="field.type === 'text' ? evalTextFormula(field) : calculateFormula(field)"
           :is-inline-size="isInlineSize"
           :field="field"
           :area="area"
@@ -95,6 +95,25 @@ export default {
       })
 
       return this.math.evaluate(transformedFormula.toLowerCase())
+    },
+    evalTextFormula (field, depth = 0) {
+      if (depth > 10) return ''
+
+      return field.preferences.formula.replace(/{{(.*?)}}/g, (match, uuid) => {
+        const formulaField = this.fieldsUuidIndex[uuid]
+
+        if (formulaField?.preferences?.formula) {
+          if (formulaField.type === 'text') {
+            return this.evalTextFormula(formulaField, depth + 1)
+          } else if (this.isMathLoaded) {
+            return this.calculateFormula(formulaField)
+          }
+        }
+
+        const value = this.readonlyValues[uuid] ?? this.values[uuid]
+
+        return Array.isArray(value) ? value.join(', ') : (value ?? '')
+      })
     }
   }
 }
diff --git a/app/javascript/template_builder/builder.vue b/app/javascript/template_builder/builder.vue
index d6e3198e..5b0546af 100644
--- a/app/javascript/template_builder/builder.vue
+++ b/app/javascript/template_builder/builder.vue
@@ -1259,7 +1259,7 @@ export default {
 
       return formulaFields.reduce((acc, f) => {
         if (this.conditionalFieldIndex[f.uuid] !== false) {
-          acc[f.uuid] = this.calculateFormula(f)
+          acc[f.uuid] = f.type === 'text' ? this.evalTextFormula(f) : this.calculateFormula(f)
         }
 
         return acc
@@ -1526,6 +1526,25 @@ export default {
 
       return this.math.evaluate(transformedFormula.toLowerCase())
     },
+    evalTextFormula (field, depth = 0) {
+      if (depth > 10) return ''
+
+      return field.preferences.formula.replace(/{{(.*?)}}/g, (match, uuid) => {
+        const formulaField = this.fieldsUuidIndex[uuid]
+
+        if (formulaField?.preferences?.formula) {
+          if (formulaField.type === 'text') {
+            return this.evalTextFormula(formulaField, depth + 1)
+          } else if (this.isMathLoaded) {
+            return this.calculateFormula(formulaField)
+          }
+        }
+
+        const value = formulaField?.default_value
+
+        return Array.isArray(value) ? value.join(', ') : (value ?? '')
+      })
+    },
     hasFormulaDependencyValue (field) {
       const normalized = this.normalizeFormula(field.preferences.formula)
 
diff --git a/app/javascript/template_builder/field_context_menu.vue b/app/javascript/template_builder/field_context_menu.vue
index f7223d79..0ab8f1dd 100644
--- a/app/javascript/template_builder/field_context_menu.vue
+++ b/app/javascript/template_builder/field_context_menu.vue
@@ -611,7 +611,7 @@ export default {
       return this.withCondition && !['stamp', 'heading'].includes(this.field.type)
     },
     showFormula () {
-      return this.field.type === 'number' || this.field.type === 'payment'
+      return this.field.type === 'number' || this.field.type === 'payment' || !!this.field.preferences?.formula
     },
     showRequired () {
       return this.withRequired && !['phone', 'stamp', 'verification', 'strikethrough', 'heading'].includes(this.field.type)
diff --git a/app/javascript/template_builder/field_settings.vue b/app/javascript/template_builder/field_settings.vue
index a5930565..ef76d2b0 100644
--- a/app/javascript/template_builder/field_settings.vue
+++ b/app/javascript/template_builder/field_settings.vue
@@ -500,7 +500,7 @@
     </label>
   </li>
   <li
-    v-if="field.type == 'number'"
+    v-if="field.type == 'number' || field.preferences?.formula"
     class="field-settings-formula"
   >
     <label
diff --git a/app/javascript/template_builder/formula_modal.vue b/app/javascript/template_builder/formula_modal.vue
index 37d085d0..ee8eb4b3 100644
--- a/app/javascript/template_builder/formula_modal.vue
+++ b/app/javascript/template_builder/formula_modal.vue
@@ -61,7 +61,10 @@
               @input="resizeTextarea"
             />
           </div>
-          <div class="mb-3 mt-1">
+          <div
+            v-if="field.type !== 'text'"
+            class="mb-3 mt-1"
+          >
             <div
               target="blank"
               class="text-sm mb-2 inline space-x-2 font-mono"
@@ -161,7 +164,9 @@ export default {
   computed: {
     fields () {
       return this.template.fields.reduce((acc, f) => {
-        if (f !== this.field && this.isNumberField(f) && (!f.preferences?.formula || !f.preferences.formula.includes(this.field.uuid))) {
+        const isAllowed = this.field.type === 'text' ? this.isTextField(f) : this.isNumberField(f)
+
+        if (f !== this.field && isAllowed && (!f.preferences?.formula || !f.preferences.formula.includes(this.field.uuid))) {
           acc.push(f)
         }
 
@@ -179,6 +184,9 @@ export default {
     isNumberField (field) {
       return field.type === 'number' || (['radio', 'select'].includes(field.type) && field.options?.every((o) => String(o.value).match(/^[\d.-]+$/)))
     },
+    isTextField (field) {
+      return ['text', 'number', 'select', 'radio', 'cells', 'phone'].includes(field.type)
+    },
     humanizeFormula (text) {
       return text.replace(/{{(.*?)}}/g, (match, uuid) => {
         const foundField = this.template.fields.find((f) => f.uuid === uuid)
diff --git a/lib/submitters/submit_values.rb b/lib/submitters/submit_values.rb
index 16545480..5484f238 100644
--- a/lib/submitters/submit_values.rb
+++ b/lib/submitters/submit_values.rb
@@ -220,9 +220,16 @@ module Submitters
             submitter.values
           end
 
-        formula = normalize_formula(formula, submitter.submission, submission_values:)
+        values = submission_values.merge(acc.compact_blank)
 
-        acc[field['uuid']] = calculate_formula_value(formula, submission_values.merge(acc.compact_blank))
+        acc[field['uuid']] =
+          if field['type'] == 'text'
+            eval_text_formula_value(formula, values, submitter.submission)
+          else
+            normalized_formula = normalize_formula(formula, submitter.submission, submission_values:)
+
+            calculate_formula_value(normalized_formula, values)
+          end
       end
 
       computed_values.compact_blank
@@ -250,6 +257,10 @@ module Submitters
       0
     end
 
+    def eval_text_formula_value(_formula, _values, _submission)
+      ''
+    end
+
     def replace_current_date_placeholders(submitter)
       submitter.values.each_with_object({}) do |(uuid, v), acc|
         acc[uuid] =

From 76d0e76fd5ada3747d50baa6b34076a4990ce507 Mon Sep 17 00:00:00 2001
From: Alex Turchyn <alex@docuseal.com>
Date: Wed, 22 Jul 2026 18:06:04 +0300
Subject: [PATCH 05/42] no touch tooltips on nav elements

---
 app/javascript/application.scss                  |  7 +++++++
 app/views/accounts/show.html.erb                 |  4 ++--
 app/views/dashboard/_toggle_view.html.erb        |  4 ++--
 app/views/shared/_github.html.erb                |  2 +-
 app/views/shared/_settings_nav.html.erb          |  6 +++---
 app/views/submissions/_send_sms_button.html.erb  |  2 +-
 app/views/submissions/show.html.erb              |  2 +-
 .../_applied_filters.html.erb                    |  8 ++++----
 app/views/templates/_submission.html.erb         | 16 ++++++++--------
 app/views/templates/_template.html.erb           | 10 +++++-----
 app/views/templates_share_link/show.html.erb     |  2 +-
 app/views/webhook_settings/show.html.erb         |  2 +-
 12 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/app/javascript/application.scss b/app/javascript/application.scss
index fd02cecf..1050df66 100644
--- a/app/javascript/application.scss
+++ b/app/javascript/application.scss
@@ -114,6 +114,13 @@ button[disabled] .enabled, button.btn-disabled .enabled {
   bottom: auto;
 }
 
+@media (hover: none), (pointer: coarse) {
+  .tooltip-no-touch:before,
+  .tooltip-no-touch:after {
+    display: none;
+  }
+}
+
 .autocomplete {
   background: white;
   z-index: 1000;
diff --git a/app/views/accounts/show.html.erb b/app/views/accounts/show.html.erb
index ba9a9c49..d6d2fec1 100644
--- a/app/views/accounts/show.html.erb
+++ b/app/views/accounts/show.html.erb
@@ -147,7 +147,7 @@
                   <%= f.check_box :value, class: 'toggle', checked: account_config.value != false %>
                 </submit-form>
               <% else %>
-                <a href="<%= console_redirect_index_path(redir: "#{Docuseal::CONSOLE_URL}/plans") %>" data-turbo="false" data-tip="<%= I18n.t('unlock_with_docuseal_pro') %>" data-on="change" class="flex tooltip">
+                <a href="<%= console_redirect_index_path(redir: "#{Docuseal::CONSOLE_URL}/plans") %>" data-turbo="false" data-tip="<%= I18n.t('unlock_with_docuseal_pro') %>" data-on="change" class="flex tooltip tooltip-no-touch">
                   <%= f.check_box :value, class: 'toggle pointer-events-none', checked: account_config.value != false, disabled: true %>
                 </a>
               <% end %>
@@ -170,7 +170,7 @@
                   <%= f.check_box :value, class: 'toggle', checked: account_config.value == true %>
                 </submit-form>
               <% else %>
-                <a href="<%= console_redirect_index_path(redir: "#{Docuseal::CONSOLE_URL}/plans") %>" data-turbo="false" data-tip="<%= I18n.t('unlock_with_docuseal_pro') %>" class="flex tooltip">
+                <a href="<%= console_redirect_index_path(redir: "#{Docuseal::CONSOLE_URL}/plans") %>" data-turbo="false" data-tip="<%= I18n.t('unlock_with_docuseal_pro') %>" class="flex tooltip tooltip-no-touch">
                   <%= f.check_box :value, class: 'toggle pointer-events-none', checked: account_config.value == true, disabled: true %>
                 </a>
               <% end %>
diff --git a/app/views/dashboard/_toggle_view.html.erb b/app/views/dashboard/_toggle_view.html.erb
index 63cdf0c8..54836506 100644
--- a/app/views/dashboard/_toggle_view.html.erb
+++ b/app/views/dashboard/_toggle_view.html.erb
@@ -1,10 +1,10 @@
 <form action="<%= root_path %>" method="get" id="templates_submissions_toggle" class="bg-base-200 px-1.5 rounded-xl py-1 whitespace-nowrap">
-  <toggle-cookies data-value="templates" data-key="dashboard_view" class="sm:tooltip tooltip-top" data-tip="<%= t('templates') %>">
+  <toggle-cookies data-value="templates" data-key="dashboard_view" class="sm:tooltip tooltip-top tooltip-no-touch" data-tip="<%= t('templates') %>">
     <button class="<%= local_assigns[:selected] == 'submissions' ? 'btn !border !rounded-lg btn-square !p-0 !btn-sm !h-8 !w-9' : 'btn btn-neutral !rounded-lg btn-square !p-0 hover:text-neutral-300 !btn-sm !h-8 !w-9 disabled:btn-neutral' %>">
       <%= svg_icon('layout_grid', class: 'w-6 h-6 stroke-2') %>
     </button>
   </toggle-cookies>
-  <toggle-cookies data-value="submissions" data-key="dashboard_view" class="sm:tooltip tooltip-top" data-tip="<%= t('submissions') %>">
+  <toggle-cookies data-value="submissions" data-key="dashboard_view" class="sm:tooltip tooltip-top tooltip-no-touch" data-tip="<%= t('submissions') %>">
     <button class="<%= local_assigns[:selected] == 'submissions' ? 'btn btn-neutral !rounded-lg btn-square !p-0 hover:text-neutral-300 !btn-sm !h-8 !w-9' : 'btn !border !rounded-lg btn-square !p-0 !btn-sm !h-8 !w-9 disabled:btn-neutral' %>">
       <%= svg_icon('layout_list', class: 'w-6 h-6 stroke-2') %>
     </button>
diff --git a/app/views/shared/_github.html.erb b/app/views/shared/_github.html.erb
index a27f7f96..be9d7c0b 100644
--- a/app/views/shared/_github.html.erb
+++ b/app/views/shared/_github.html.erb
@@ -1,4 +1,4 @@
-<a target="_blank" href="<%= Docuseal::GITHUB_URL %>" rel="noopener noreferrer nofollow" class="relative flex items-center rounded-full px-2 py-0.5 text-xs leading-4 mt-1 text-base-content border border-base-300 tooltip tooltip-bottom" data-tip="Give a star on GitHub">
+<a target="_blank" href="<%= Docuseal::GITHUB_URL %>" rel="noopener noreferrer nofollow" class="relative flex items-center rounded-full px-2 py-0.5 text-xs leading-4 mt-1 text-base-content border border-base-300 tooltip tooltip-bottom tooltip-no-touch" data-tip="Give a star on GitHub">
   <span class="flex items-center justify-between space-x-0.5 font-medium">
     <%= svg_icon('start', class: 'h-3 w-3') %>
     <span>18k</span>
diff --git a/app/views/shared/_settings_nav.html.erb b/app/views/shared/_settings_nav.html.erb
index 217854da..4dde21bf 100644
--- a/app/views/shared/_settings_nav.html.erb
+++ b/app/views/shared/_settings_nav.html.erb
@@ -119,18 +119,18 @@
         <%= t('need_help_ask_a_question_') %>
       </div>
       <div class="flex mt-3 space-x-3">
-        <div class="tooltip" data-tip="GitHub">
+        <div class="tooltip tooltip-no-touch" data-tip="GitHub">
           <a href="<%= Docuseal::GITHUB_URL %>" target="_blank" class="btn btn-circle btn-primary btn-md">
             <%= svg_icon('brand_github', class: 'w-8 h-8') %>
           </a>
         </div>
-        <div class="tooltip" data-tip="<%= t('discord_community') %>">
+        <div class="tooltip tooltip-no-touch" data-tip="<%= t('discord_community') %>">
           <a href="<%= Docuseal::DISCORD_URL %>" target="_blank" class="btn btn-circle btn-primary btn-md">
             <%= svg_icon('brand_discord', class: 'w-8 h-8') %>
           </a>
         </div>
         <%= capture do %>
-          <div class="tooltip" data-tip="<%= t('ai_assistant') %>">
+          <div class="tooltip tooltip-no-touch" data-tip="<%= t('ai_assistant') %>">
             <a href="<%= Docuseal::CHATGPT_URL %>" target="_blank" class="btn btn-circle btn-primary btn-md">
               <%= svg_icon('message', class: 'w-8 h-8') %>
             </a>
diff --git a/app/views/submissions/_send_sms_button.html.erb b/app/views/submissions/_send_sms_button.html.erb
index b8df27cf..33862cf2 100644
--- a/app/views/submissions/_send_sms_button.html.erb
+++ b/app/views/submissions/_send_sms_button.html.erb
@@ -1,5 +1,5 @@
 <div class="mt-2 mb-1">
-  <div class="tooltip w-full" data-tip="<%= t('unlock_with_docuseal_pro') %>">
+  <div class="tooltip tooltip-no-touch w-full" data-tip="<%= t('unlock_with_docuseal_pro') %>">
     <%= link_to submitter.sent_at? ? t('re_send_sms') : t('send_sms'), Docuseal.multitenant? ? console_redirect_index_path(redir: "#{Docuseal::CONSOLE_URL}/plans") : "#{Docuseal::CLOUD_URL}/sign_up?#{{ redir: "#{Docuseal::CONSOLE_URL}/on_premises" }.to_query}", class: 'btn btn-sm btn-primary text-gray-400 w-full' %>
   </div>
 </div>
diff --git a/app/views/submissions/show.html.erb b/app/views/submissions/show.html.erb
index eb385fa1..89342cee 100644
--- a/app/views/submissions/show.html.erb
+++ b/app/views/submissions/show.html.erb
@@ -180,7 +180,7 @@
                 </span>
               </div>
               <% if signed_in? && can?(:update, @submission) && submitter && !submitter.completed_at? && !@submission.completed_at? && !submitter.declined_at? && !@submission.archived_at? && !@submission.template&.archived_at? && !@submission.expired? && !submitter.start_form_submission_events.any? %>
-                <span class="tooltip tooltip-left" data-tip="<%= t('edit') %>">
+                <span class="tooltip tooltip-left tooltip-no-touch" data-tip="<%= t('edit') %>">
                   <%= link_to edit_submitter_path(submitter), class: 'shrink-0 inline md:hidden md:group-hover:inline', data: { turbo_frame: 'modal' } do %>
                     <%= svg_icon('pencil', class: 'w-5 h-5') %>
                   <% end %>
diff --git a/app/views/submissions_filters/_applied_filters.html.erb b/app/views/submissions_filters/_applied_filters.html.erb
index 5924c042..773b111e 100644
--- a/app/views/submissions_filters/_applied_filters.html.erb
+++ b/app/views/submissions_filters/_applied_filters.html.erb
@@ -11,7 +11,7 @@
   </div>
 <% end %>
 <% if params[:folder].present? %>
-  <div class="tooltip tooltip-bottom flex h-10 px-2 py-1 text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl w-full md:w-36 border-neutral-700" data-tip="<%= t('folder') %>">
+  <div class="tooltip tooltip-no-touch tooltip-bottom flex h-10 px-2 py-1 text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl w-full md:w-36 border-neutral-700" data-tip="<%= t('folder') %>">
     <%= link_to submissions_filter_path('folder', query_params.merge(path: url_for, with_remove: true)), data: { turbo_frame: 'modal' }, class: 'flex items-center space-x-1 flex-1 min-w-0 pr-1' do %>
       <%= svg_icon('folder', class: 'w-5 h-5 shrink-0') %>
       <span class="font-normal truncate"><%= params[:folder] %></span>
@@ -22,7 +22,7 @@
   </div>
 <% end %>
 <% if params[:author].present? %>
-  <div class="tooltip tooltip-bottom flex h-10 px-2 py-1 text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl w-full md:w-36 border-neutral-700" data-tip="<%= t('author') %>">
+  <div class="tooltip tooltip-no-touch tooltip-bottom flex h-10 px-2 py-1 text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl w-full md:w-36 border-neutral-700" data-tip="<%= t('author') %>">
     <%= link_to submissions_filter_path('author', query_params.merge(path: url_for, with_remove: true)), data: { turbo_frame: 'modal' }, class: 'flex items-center space-x-1 flex-1 min-w-0 pr-1' do %>
       <%= svg_icon('user', class: 'w-5 h-5 shrink-0') %>
       <span class="font-normal truncate"><%= current_account.users.accessible_by(current_ability).where(account: current_account).find_by(email: params[:author])&.full_name || 'NA' %></span>
@@ -33,7 +33,7 @@
   </div>
 <% end %>
 <% if query_params[:completed_at_from].present? || query_params[:completed_at_to].present? %>
-  <div class="tooltip tooltip-bottom flex h-10 px-2 py-1 text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl w-full md:w-36 border-neutral-700" data-tip="<%= t('completed_at') %>">
+  <div class="tooltip tooltip-no-touch tooltip-bottom flex h-10 px-2 py-1 text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl w-full md:w-36 border-neutral-700" data-tip="<%= t('completed_at') %>">
     <%= link_to submissions_filter_path('completed_at', query_params.merge(path: url_for, with_remove: true)), data: { turbo_frame: 'modal' }, class: 'flex items-center space-x-1 flex-1 min-w-0 pr-1' do %>
       <%= svg_icon('calendar_check', class: 'w-5 h-5 shrink-0') %>
       <span class="flex flex-row md:flex-col font-normal text-left md:text-center md:text-xs">
@@ -52,7 +52,7 @@
   </div>
 <% end %>
 <% if query_params[:created_at_from].present? || query_params[:created_at_to].present? %>
-  <div class="tooltip tooltip-bottom flex h-10 px-2 py-1 text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl w-full md:w-36 border-neutral-700" data-tip="<%= t('created_at') %>">
+  <div class="tooltip tooltip-no-touch tooltip-bottom flex h-10 px-2 py-1 text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl w-full md:w-36 border-neutral-700" data-tip="<%= t('created_at') %>">
     <%= link_to submissions_filter_path('created_at', query_params.merge(path: url_for, with_remove: true)), data: { turbo_frame: 'modal' }, class: 'flex items-center space-x-1 flex-1 min-w-0 pr-1' do %>
       <%= svg_icon('calendar', class: 'w-5 h-5 shrink-0') %>
       <span class="flex flex-row md:flex-col font-normal text-left md:text-center md:text-xs">
diff --git a/app/views/templates/_submission.html.erb b/app/views/templates/_submission.html.erb
index 73fe8e75..829dd3ab 100644
--- a/app/views/templates/_submission.html.erb
+++ b/app/views/templates/_submission.html.erb
@@ -52,7 +52,7 @@
                 <%= submitter.name || submitter.email || submitter.phone %>
               </a>
               <% if !submitter.completed_at? && !submission.completed_at? && can?(:update, submission) && !submitter.start_form_submission_events.any? && !submission.archived_at? && !submission.expired? && !submitter.declined_at? %>
-                <span class="pl-0.5 tooltip tooltip-top md:opacity-0 md:hover:opacity-100 md:peer-hover:opacity-100" data-tip="<%= t('edit') %>">
+                <span class="pl-0.5 tooltip tooltip-top tooltip-no-touch md:opacity-0 md:hover:opacity-100 md:peer-hover:opacity-100" data-tip="<%= t('edit') %>">
                   <%= link_to edit_submitter_path(submitter), class: 'shrink-0', data: { turbo_frame: 'modal' } do %>
                     <%= svg_icon('pencil', class: 'w-5 h-5') %>
                   <% end %>
@@ -102,12 +102,12 @@
           </a>
         </div>
         <% if !submission.archived_at? && !template&.archived_at? && can?(:destroy, submission) %>
-          <span data-tip="<%= t('archive') %>" class="sm:tooltip tooltip-top">
+          <span data-tip="<%= t('archive') %>" class="sm:tooltip tooltip-top tooltip-no-touch">
             <%= button_to button_title(title: nil, disabled_with: nil, icon: svg_icon('archive', class: 'w-6 h-6'), icon_disabled: svg_icon('loader', class: 'w-6 h-6 animate-spin')), submission_path(submission), class: 'btn btn-outline btn-sm w-full md:w-fit', form: { class: 'flex' }, title: t('archive'), method: :delete %>
           </span>
         <% end %>
         <% if local_assigns[:archived] && can?(:destroy, submission) %>
-          <span data-tip="<%= t('remove') %>" class="sm:tooltip tooltip-top">
+          <span data-tip="<%= t('remove') %>" class="sm:tooltip tooltip-top tooltip-no-touch">
             <%= button_to button_title(title: nil, disabled_with: nil, icon: svg_icon('trash', class: 'w-6 h-6'), icon_disabled: svg_icon('loader', class: 'w-6 h-6 animate-spin')), submission_path(submission, permanently: true), class: 'btn btn-outline btn-sm w-full md:w-fit', form: { class: 'flex' }, title: t('remove'), method: :delete, data: { turbo_confirm: t('submission_deletion_is_irreversible_and_will_permanently_remove_all_associated_signed_documents_with_it_are_you_sure_') } %>
           </span>
         <% end %>
@@ -117,7 +117,7 @@
         <div class="flex flex-col md:flex-row md:items-center gap-3">
           <% if is_submission_completed %>
             <% latest_submitter = submitters.select(&:completed_at?).max_by(&:completed_at) %>
-            <a href="<%= submission_path(submission) %>" class="z-[1] tooltip flex" data-tip="<%= l(latest_submitter.status_event_at.in_time_zone(current_account.timezone), format: :short, locale: current_account.locale) %>">
+            <a href="<%= submission_path(submission) %>" class="z-[1] tooltip tooltip-no-touch flex" data-tip="<%= l(latest_submitter.status_event_at.in_time_zone(current_account.timezone), format: :short, locale: current_account.locale) %>">
               <span class="badge <%= status_badges[latest_submitter.status] %> md:w-32 bg-opacity-50 badge-lg uppercase text-sm font-semibold">
                 <%= t(latest_submitter.status) %>
               </span>
@@ -134,7 +134,7 @@
               <div class="relative flex justify-between items-start md:items-center space-x-3">
                 <span class="flex flex-col md:flex-row md:items-center gap-2">
                   <% if !is_submission_completed && !submission.expired? %>
-                    <a href="<%= submission_path(submission) %>" class="z-[1] tooltip flex" data-tip="<%= l(submitter.status_event_at.in_time_zone(current_account.timezone), format: :short, locale: current_account.locale) %>">
+                    <a href="<%= submission_path(submission) %>" class="z-[1] tooltip tooltip-no-touch flex" data-tip="<%= l(submitter.status_event_at.in_time_zone(current_account.timezone), format: :short, locale: current_account.locale) %>">
                       <span class="badge md:w-24 <%= status_badges[submitter.status] %> bg-opacity-50 uppercase text-xs font-semibold">
                         <%= t(submitter.status) %>
                       </span>
@@ -145,7 +145,7 @@
                       <%= submitter.name || submitter.email || submitter.phone %>
                     </a>
                     <% if !submitter.completed_at? && !submission.completed_at? && can?(:update, submission) && !submitter.start_form_submission_events.any? && !submission.archived_at? && !submission.expired? && !submitter.declined_at? %>
-                      <span class="pl-0.5 tooltip tooltip-top md:opacity-0 md:hover:opacity-100 md:peer-hover:opacity-100" data-tip="<%= t('edit') %>">
+                      <span class="pl-0.5 tooltip tooltip-top tooltip-no-touch md:opacity-0 md:hover:opacity-100 md:peer-hover:opacity-100" data-tip="<%= t('edit') %>">
                         <%= link_to edit_submitter_path(submitter), class: 'shrink-0', data: { turbo_frame: 'modal' } do %>
                           <%= svg_icon('pencil', class: 'w-5 h-5') %>
                         <% end %>
@@ -209,12 +209,12 @@
           </a>
         </div>
         <% if !submission.archived_at? && !template&.archived_at? %>
-          <span data-tip="<%= t('archive') %>" class="sm:tooltip tooltip-top">
+          <span data-tip="<%= t('archive') %>" class="sm:tooltip tooltip-top tooltip-no-touch">
             <%= button_to button_title(title: nil, disabled_with: nil, icon: svg_icon('archive', class: 'w-6 h-6'), icon_disabled: svg_icon('loader', class: 'w-6 h-6 animate-spin')), submission_path(submission), class: 'btn btn-outline btn-sm w-full md:w-fit', form: { class: 'flex' }, title: t('archive'), method: :delete %>
           </span>
         <% end %>
         <% if local_assigns[:archived] && can?(:destroy, submission) %>
-          <span data-tip="<%= t('remove') %>" class="sm:tooltip tooltip-top">
+          <span data-tip="<%= t('remove') %>" class="sm:tooltip tooltip-top tooltip-no-touch">
             <%= button_to button_title(title: nil, disabled_with: nil, icon: svg_icon('trash', class: 'w-6 h-6'), icon_disabled: svg_icon('loader', class: 'w-6 h-6 animate-spin')), submission_path(submission, permanently: true), class: 'btn btn-outline btn-sm w-full md:w-fit', form: { class: 'flex' }, title: t('remove'), method: :delete, data: { turbo_confirm: t('submission_deletion_is_irreversible_and_will_permanently_remove_all_associated_signed_documents_with_it_are_you_sure_') } %>
           </span>
         <% end %>
diff --git a/app/views/templates/_template.html.erb b/app/views/templates/_template.html.erb
index 5e705441..80f93c5c 100644
--- a/app/views/templates/_template.html.erb
+++ b/app/views/templates/_template.html.erb
@@ -31,35 +31,35 @@
   <div class="absolute top-0 bottom-0 w-0 items-center hidden md:group-hover:flex" style="right: 37px" data-targets="dashboard-dropzone.hiddenOnDrag">
     <div class="space-y-1">
       <% if can?(:update, template) && !template.archived_at? && template.account_id == current_account.id %>
-        <span class="tooltip tooltip-left" data-tip="<%= t('move') %>">
+        <span class="tooltip tooltip-left tooltip-no-touch" data-tip="<%= t('move') %>">
           <a href="<%= edit_template_folder_path(template.id) %>" data-turbo-frame="modal" class="btn btn-xs hover:btn-outline bg-base-200 btn-circle">
             <%= svg_icon('folder_share', class: 'w-4 h-4') %>
           </a>
         </span>
       <% end %>
       <% if template.archived_at? && can?(:destroy, template) %>
-        <span class="tooltip tooltip-left" data-tip="<%= t('restore') %>">
+        <span class="tooltip tooltip-left tooltip-no-touch" data-tip="<%= t('restore') %>">
           <%= button_to template_restore_index_path(template), class: 'btn btn-xs hover:btn-outline bg-base-200 btn-circle' do %>
             <%= svg_icon('rotate', class: 'w-4 h-4 enabled') %>
             <%= svg_icon('loader', class: 'w-4 h-4 animate-spin disabled') %>
           <% end %>
         </span>
       <% elsif !template.archived_at? && can?(:update, template) %>
-        <span class="tooltip tooltip-left" data-tip="<%= t('edit') %>">
+        <span class="tooltip tooltip-left tooltip-no-touch" data-tip="<%= t('edit') %>">
           <a href="<%= edit_template_path(template) %>" class="btn btn-xs hover:btn-outline bg-base-200 btn-circle">
             <%= svg_icon('pencil', class: 'w-4 h-4') %>
           </a>
         </span>
       <% end %>
       <% if can?(:create, template) %>
-        <span class="tooltip tooltip-left" data-tip="<%= t('clone') %>">
+        <span class="tooltip tooltip-left tooltip-no-touch" data-tip="<%= t('clone') %>">
           <a href="<%= new_template_clone_path(template) %>" data-turbo-frame="modal" class="btn btn-xs hover:btn-outline bg-base-200 btn-circle">
             <%= svg_icon('copy', class: 'w-4 h-4') %>
           </a>
         </span>
       <% end %>
       <% if can?(:destroy, template) %>
-        <span class="tooltip tooltip-left" data-tip="<%= template.archived_at? ? t('delete') : t('archive') %>">
+        <span class="tooltip tooltip-left tooltip-no-touch" data-tip="<%= template.archived_at? ? t('delete') : t('archive') %>">
           <%= button_to template_path(template), data: template.archived_at? ? { turbo_confirm: t('template_deletion_is_irreversible_and_will_permanently_remove_all_associated_signed_documents_with_it_are_you_sure_') } : {}, params: { permanently: template.archived_at? }.compact_blank, method: :delete, class: 'btn btn-xs hover:btn-outline bg-base-200 btn-circle', aria_label: t('restore') do %>
             <%= svg_icon(template.archived_at? ? 'trash' : 'archive', class: 'w-4 h-4 enabled') %>
             <%= svg_icon('loader', class: 'w-4 h-4 animate-spin disabled') %>
diff --git a/app/views/templates_share_link/show.html.erb b/app/views/templates_share_link/show.html.erb
index 0b948c71..31c90f79 100644
--- a/app/views/templates_share_link/show.html.erb
+++ b/app/views/templates_share_link/show.html.erb
@@ -26,7 +26,7 @@
         <div class="relative flex-grow">
           <input id="embedding_url" type="text" value="<%= start_form_url(slug: @template.slug, host: form_link_host) %>" class="base-input w-full pr-10" autocomplete="off" readonly>
           <% if @template.variables_schema.blank? && !@template.preferences&.dig('require_email_2fa') && !@template.preferences&.dig('require_phone_2fa') %>
-            <a href="<%= template_share_link_qr_path(@template) %>" target="_blank" rel="noopener" class="absolute top-1/2 -translate-y-1/2 right-2 flex items-center justify-center tooltip text-base-content/70 hover:text-base-content bg-white rounded px-1 py-0.5" data-tip="<%= t('qr_code') %>" aria-label="<%= t('qr_code') %>">
+            <a href="<%= template_share_link_qr_path(@template) %>" target="_blank" rel="noopener" class="absolute top-1/2 -translate-y-1/2 right-2 flex items-center justify-center tooltip tooltip-no-touch text-base-content/70 hover:text-base-content bg-white rounded px-1 py-0.5" data-tip="<%= t('qr_code') %>" aria-label="<%= t('qr_code') %>">
               <%= svg_icon('qrcode', class: 'w-6 h-6') %>
             </a>
           <% end %>
diff --git a/app/views/webhook_settings/show.html.erb b/app/views/webhook_settings/show.html.erb
index 7987b885..920d31d4 100644
--- a/app/views/webhook_settings/show.html.erb
+++ b/app/views/webhook_settings/show.html.erb
@@ -25,7 +25,7 @@
                 <%= svg_icon('lock', class: 'w-4 h-4') %>
                 <span><%= t('security') %></span>
               <% end %>
-              <div class="tooltip tooltip-left md:tooltip-top" data-tip="<%= t('delete_webhook') %>">
+              <div class="tooltip tooltip-left md:tooltip-top tooltip-no-touch" data-tip="<%= t('delete_webhook') %>">
                 <%= button_to settings_webhook_path(@webhook_url), class: 'btn btn-warning btn-sm', method: :delete, data: { turbo_confirm: t('are_you_sure_') } do %>
                   <span><%= t('delete') %></span>
                 <% end %>

From 9074d23b3c805d209b7c6ee5e617fed13ed088e3 Mon Sep 17 00:00:00 2001
From: Alex Turchyn <alex@docuseal.com>
Date: Wed, 22 Jul 2026 18:29:23 +0300
Subject: [PATCH 06/42] fix uneven template action buttons

---
 app/views/templates/_title.html.erb | 58 ++++++++++++++++-------------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/app/views/templates/_title.html.erb b/app/views/templates/_title.html.erb
index c694bb30..df2ac0de 100644
--- a/app/views/templates/_title.html.erb
+++ b/app/views/templates/_title.html.erb
@@ -66,40 +66,48 @@
       <%= button_to button_title(title: t('archive'), disabled_with: t('archiving')[..-4], title_class: 'inline', icon: svg_icon('archive', class: 'w-6 h-6')), template_path(template), class: 'btn btn-outline btn-sm w-full', form_class: 'flex-1', method: :delete %>
     <% end %>
     <% if can?(:create, current_account.templates.new(author: current_user)) %>
-      <%= link_to new_template_clone_path(template), class: 'btn btn-outline btn-sm flex-1', data: { turbo_frame: :modal } do %>
-        <span class="flex items-center justify-center space-x-2">
-          <%= svg_icon('copy', class: 'w-6 h-6') %>
-          <span class="inline"><%= t('clone') %></span>
-        </span>
-      <% end %>
-    <% end %>
-    <% if !template.archived_at? %>
-      <% if can?(:update, template) %>
-        <%= link_to edit_template_path(template), class: 'btn btn-outline btn-sm flex-1' do %>
+      <div class="flex-1">
+        <%= link_to new_template_clone_path(template), class: 'btn btn-outline btn-sm w-full', data: { turbo_frame: :modal } do %>
           <span class="flex items-center justify-center space-x-2">
-            <%= svg_icon('pencil', class: 'w-6 h-6') %>
-            <span><%= t('edit') %></span>
+            <%= svg_icon('copy', class: 'w-6 h-6') %>
+            <span class="inline"><%= t('clone') %></span>
           </span>
         <% end %>
+      </div>
+    <% end %>
+    <% if !template.archived_at? %>
+      <% if can?(:update, template) %>
+        <div class="flex-1">
+          <%= link_to edit_template_path(template), class: 'btn btn-outline btn-sm w-full' do %>
+            <span class="flex items-center justify-center space-x-2">
+              <%= svg_icon('pencil', class: 'w-6 h-6') %>
+              <span><%= t('edit') %></span>
+            </span>
+          <% end %>
+        </div>
       <% elsif can?(:read, template) && !template.archived_at? %>
-        <%= link_to template_preview_path(template), class: 'btn btn-outline btn-sm flex-1' do %>
-          <span class="flex items-center justify-center space-x-2">
-            <%= svg_icon('file_text', class: 'w-6 h-6') %>
-            <span><%= t('preview') %></span>
-          </span>
-        <% end %>
+        <div class="flex-1">
+          <%= link_to template_preview_path(template), class: 'btn btn-outline btn-sm w-full' do %>
+            <span class="flex items-center justify-center space-x-2">
+              <%= svg_icon('file_text', class: 'w-6 h-6') %>
+              <span><%= t('preview') %></span>
+            </span>
+          <% end %>
+        </div>
       <% end %>
     <% end %>
     <% if template.archived_at? %>
       <% if can?(:destroy, template) %>
-        <%= button_to button_title(title: t('restore'), disabled_with: t('restoring')[..-4], icon: svg_icon('rotate', class: 'w-6 h-6')), template_restore_index_path(template), class: 'btn btn-outline btn-sm flex-1' %>
-      <% end %>
-      <%= link_to template_preview_path(template), class: 'btn btn-outline btn-sm flex-1' do %>
-        <span class="flex items-center justify-center space-x-2">
-          <%= svg_icon('file_text', class: 'w-6 h-6') %>
-          <span><%= t('preview') %></span>
-        </span>
+        <%= button_to button_title(title: t('restore'), disabled_with: t('restoring')[..-4], icon: svg_icon('rotate', class: 'w-6 h-6')), template_restore_index_path(template), class: 'btn btn-outline btn-sm w-full', form_class: 'flex-1' %>
       <% end %>
+      <div class="flex-1">
+        <%= link_to template_preview_path(template), class: 'btn btn-outline btn-sm w-full' do %>
+          <span class="flex items-center justify-center space-x-2">
+            <%= svg_icon('file_text', class: 'w-6 h-6') %>
+            <span><%= t('preview') %></span>
+          </span>
+        <% end %>
+      </div>
     <% end %>
   </div>
 </div>

From ce6823ed381308b4abf9dcb1d8e4393aa1e03db1 Mon Sep 17 00:00:00 2001
From: Alex Turchyn <alex@docuseal.com>
Date: Thu, 23 Jul 2026 00:27:53 +0300
Subject: [PATCH 07/42] hide tooltip wrappers with hidden content

---
 app/views/accounts/show.html.erb              | 24 +++++++++----------
 app/views/mcp_settings/index.html.erb         |  2 +-
 .../notifications_settings/_bcc_form.html.erb |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/views/accounts/show.html.erb b/app/views/accounts/show.html.erb
index d6d2fec1..ab65d57d 100644
--- a/app/views/accounts/show.html.erb
+++ b/app/views/accounts/show.html.erb
@@ -53,7 +53,7 @@
             <div class="flex items-center justify-between gap-4 py-2.5">
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('force_2fa_with_authenticator_app') %></span>
-                <span class="tooltip tooltip-top flex cursor-pointer" data-tip="<%= t('require_two_factor_authentication_2fa_with_an_authenticator_app_e_g_google_authenticator_authy_all_users_signing_documents_must_pass_the_second_factor_verification_using_a_secure_code_in_addition_to_their_password') %>">
+                <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('require_two_factor_authentication_2fa_with_an_authenticator_app_e_g_google_authenticator_authy_all_users_signing_documents_must_pass_the_second_factor_verification_using_a_secure_code_in_addition_to_their_password') %>">
                   <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
                 </span>
               </div>
@@ -70,7 +70,7 @@
             <div class="flex items-center justify-between gap-4 py-2.5">
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('add_signature_id_to_the_documents') %></span>
-                <span class="tooltip tooltip-top flex cursor-pointer" data-tip="<%= t('add_a_unique_signature_id_and_timestamp_to_each_signature_for_audit_and_traceability_purposes_along_with_the_timestamp_part_of_docuseals_21_cfr_part_11_compliance_settings') %>">
+                <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('add_a_unique_signature_id_and_timestamp_to_each_signature_for_audit_and_traceability_purposes_along_with_the_timestamp_part_of_docuseals_21_cfr_part_11_compliance_settings') %>">
                   <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
                 </span>
               </div>
@@ -87,7 +87,7 @@
             <div class="flex items-center justify-between gap-4 py-2.5">
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('require_signing_reason') %></span>
-                <span class="tooltip tooltip-top flex cursor-pointer" data-tip="<%= t('require_signer_to_provide_a_reason_for_signing_before_completing_their_signature_e_g_approvals_certifications_part_of_docuseals_21_cfr_part_11_compliance_settings') %>">
+                <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('require_signer_to_provide_a_reason_for_signing_before_completing_their_signature_e_g_approvals_certifications_part_of_docuseals_21_cfr_part_11_compliance_settings') %>">
                   <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
                 </span>
               </div>
@@ -104,7 +104,7 @@
             <div class="flex items-center justify-between gap-4 py-2.5">
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('allow_typed_text_signatures') %></span>
-                <span class="tooltip tooltip-top flex cursor-pointer" data-tip="<%= t('allow_signers_to_create_signatures_by_typing_their_name_instead_of_drawing_or_uploading_one') %>">
+                <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('allow_signers_to_create_signatures_by_typing_their_name_instead_of_drawing_or_uploading_one') %>">
                   <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
                 </span>
               </div>
@@ -121,7 +121,7 @@
             <div class="flex items-center justify-between gap-4 py-2.5">
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('allow_to_resubmit_completed_forms') %></span>
-                <span class="tooltip tooltip-top flex cursor-pointer" data-tip="<%= t('allow_signers_to_resubmit_forms_after_completion_useful_when_corrections_or_multiple_submissions_are_needed') %>">
+                <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('allow_signers_to_resubmit_forms_after_completion_useful_when_corrections_or_multiple_submissions_are_needed') %>">
                   <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
                 </span>
               </div>
@@ -138,7 +138,7 @@
             <div class="flex items-center justify-between gap-4 py-2.5">
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('allow_to_decline_documents') %></span>
-                <span class="tooltip tooltip-top flex cursor-pointer" data-tip="<%= t('allow_recipients_to_decline_signing_a_document_the_decline_reason_notification_will_be_sent_to_the_signature_requester') %>">
+                <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('allow_recipients_to_decline_signing_a_document_the_decline_reason_notification_will_be_sent_to_the_signature_requester') %>">
                   <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
                 </span>
               </div>
@@ -161,7 +161,7 @@
             <div class="flex items-center justify-between gap-4 py-2.5">
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('allow_to_delegate_documents') %></span>
-                <span class="tooltip tooltip-top flex cursor-pointer" data-tip="<%= t('allow_recipients_to_delegate_documents') %>">
+                <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('allow_recipients_to_delegate_documents') %>">
                   <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
                 </span>
               </div>
@@ -184,7 +184,7 @@
             <div class="flex items-center justify-between gap-4 py-2.5">
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('remember_and_pre_fill_signatures') %></span>
-                <span class="tooltip tooltip-top flex cursor-pointer" data-tip="<%= t('save_a_users_signature_and_automatically_pre_fill_it_in_future_signing_sessions') %>">
+                <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('save_a_users_signature_and_automatically_pre_fill_it_in_future_signing_sessions') %>">
                   <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
                 </span>
               </div>
@@ -201,7 +201,7 @@
             <div class="flex items-center justify-between gap-4 py-2.5">
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('expirable_file_download_links') %></span>
-                <span class="tooltip tooltip-top flex cursor-pointer" data-tip="<%= t('make_document_download_links_expire_after_40_minutes_to_prevent_long_term_access_and_enhance_security') %>">
+                <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('make_document_download_links_expire_after_40_minutes_to_prevent_long_term_access_and_enhance_security') %>">
                   <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
                 </span>
               </div>
@@ -218,7 +218,7 @@
             <div class="flex items-center justify-between gap-4 py-2.5">
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('require_authentication_for_file_download_links') %></span>
-                <span class="tooltip tooltip-top flex cursor-pointer" data-tip="<%= t('require_authentication_with_user_login_or_api_key_to_access_the_document_download_links') %>">
+                <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('require_authentication_with_user_login_or_api_key_to_access_the_document_download_links') %>">
                   <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
                 </span>
               </div>
@@ -235,7 +235,7 @@
             <div class="flex items-center justify-between gap-4 py-2.5">
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('combine_completed_documents_and_audit_log') %></span>
-                <span class="tooltip tooltip-top flex cursor-pointer" data-tip="<%= t('combine_signed_documents_and_the_audit_log_into_a_single_pdf_file_for_easier_recordkeeping_and_compliance') %>">
+                <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('combine_signed_documents_and_the_audit_log_into_a_single_pdf_file_for_easier_recordkeeping_and_compliance') %>">
                   <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
                 </span>
               </div>
@@ -253,7 +253,7 @@
               <div class="flex items-center justify-between gap-4 py-2.5">
                 <div class="flex items-center space-x-1">
                   <span class="text-left"><%= t('always_enforce_signing_order') %></span>
-                  <span class="tooltip tooltip-top flex cursor-pointer" data-tip="<%= t('make_the_recipients_signing_order_always_enforced_so_that_the_second_signer_can_start_signing_their_part_only_after_the_first_signer_has_completed_signing') %>">
+                  <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('make_the_recipients_signing_order_always_enforced_so_that_the_second_signer_can_start_signing_their_part_only_after_the_first_signer_has_completed_signing') %>">
                     <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
                   </span>
                 </div>
diff --git a/app/views/mcp_settings/index.html.erb b/app/views/mcp_settings/index.html.erb
index 736f011b..20c8fc6b 100644
--- a/app/views/mcp_settings/index.html.erb
+++ b/app/views/mcp_settings/index.html.erb
@@ -98,7 +98,7 @@
         <div class="flex items-center gap-4 py-2.5">
           <div class="flex items-center space-x-1">
             <span class="text-left"><%= t('enable_mcp_server') %></span>
-            <span class="tooltip tooltip-top flex cursor-pointer" data-tip="<%= t('all_existing_mcp_connections_will_be_stopped_immediately_when_this_setting_is_disabled') %>">
+            <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('all_existing_mcp_connections_will_be_stopped_immediately_when_this_setting_is_disabled') %>">
               <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
             </span>
           </div>
diff --git a/app/views/notifications_settings/_bcc_form.html.erb b/app/views/notifications_settings/_bcc_form.html.erb
index 4c54fae9..2cbc1cd5 100644
--- a/app/views/notifications_settings/_bcc_form.html.erb
+++ b/app/views/notifications_settings/_bcc_form.html.erb
@@ -6,7 +6,7 @@
         <span>
           <%= t('completed_documents_notification_bcc_address') %>
         </span>
-        <span class="tooltip" data-tip="<%= t('send_email_copy_with_completed_documents_to_a_specified_bcc_address') %>">
+        <span class="tooltip hidden md:inline-flex" data-tip="<%= t('send_email_copy_with_completed_documents_to_a_specified_bcc_address') %>">
           <%= svg_icon('info_circle', class: 'w-4 h-4') %>
         </span>
       </span>

From 88612913a68846ced1249ad2446bf9b73f0629aa Mon Sep 17 00:00:00 2001
From: Alex Turchyn <alex@docuseal.com>
Date: Thu, 23 Jul 2026 00:28:09 +0300
Subject: [PATCH 08/42] wrap smtp security radios on small screens

---
 app/views/email_smtp_settings/index.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/email_smtp_settings/index.html.erb b/app/views/email_smtp_settings/index.html.erb
index 378551ed..3407b0ef 100644
--- a/app/views/email_smtp_settings/index.html.erb
+++ b/app/views/email_smtp_settings/index.html.erb
@@ -1,6 +1,6 @@
 <div class="flex flex-wrap space-y-4 md:flex-nowrap md:space-y-0">
   <%= render 'shared/settings_nav' %>
-  <div class="flex-grow max-w-xl mx-auto">
+  <div class="flex-grow max-w-xl mx-auto min-w-0">
     <h1 class="text-4xl font-bold mb-4">Email SMTP</h1>
     <% value = @encrypted_config.value || {} %>
     <%= form_for @encrypted_config, url: settings_email_index_path, method: :post, html: { autocomplete: 'off', class: 'space-y-4' } do |f| %>
@@ -38,7 +38,7 @@
         <% if !Docuseal.multitenant? || can?(:manage, :personalization_advanced) %>
           <div class="form-control">
             <%= ff.label :security_label, 'SMTP Security', class: 'label' %>
-            <div class="flex items-center space-x-6">
+            <div class="flex flex-wrap items-center gap-x-6">
               <% [%w[STARTTLS none], %w[TLS tls], %w[SSL ssl], %w[Noverify noverify]].each do |(label, val)| %>
                 <%= ff.label :security, value: val, for: "#{val}_radio", class: 'label' do %>
                   <%= ff.radio_button :security, val, checked: (value['security'].blank? && val == 'none') || value['security'] == val, id: "#{val}_radio", class: 'base-radio mr-2' %>

From 704893ee1d04de743a7b15cb5b20a709ba233074 Mon Sep 17 00:00:00 2001
From: Alex Turchyn <alex@docuseal.com>
Date: Thu, 23 Jul 2026 00:42:28 +0300
Subject: [PATCH 09/42] show view archived link in mobile pagination

---
 app/views/shared/_pagination.html.erb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/shared/_pagination.html.erb b/app/views/shared/_pagination.html.erb
index 25fd7b3e..4e3fcad3 100644
--- a/app/views/shared/_pagination.html.erb
+++ b/app/views/shared/_pagination.html.erb
@@ -1,12 +1,13 @@
 <% if pagy.pages > 1 %>
-  <div class="flex my-6 justify-center md:justify-between">
-    <div class="hidden md:block text-sm">
+  <% left_additional_html = local_assigns[:left_additional_html] %>
+  <div class="flex my-6 items-center <%= left_additional_html.present? ? 'justify-between' : 'justify-center md:justify-between' %>">
+    <div class="text-sm <%= 'hidden md:block' if left_additional_html.blank? %>">
       <% if pagy.count.nil? %>
         <%= t("pagination.#{local_assigns.fetch(:items_name, 'items')}.range_without_total", from: local_assigns.fetch(:from, pagy.from), to: local_assigns.fetch(:to, pagy.to)) %>
       <% else %>
         <%= t("pagination.#{local_assigns.fetch(:items_name, 'items')}.range_with_total", from: local_assigns.fetch(:from, pagy.from), to: local_assigns.fetch(:to, pagy.to), count: local_assigns.fetch(:count, pagy.count)) %>
       <% end %>
-      <%= local_assigns[:left_additional_html] %>
+      <%= left_additional_html %>
     </div>
     <div class="flex items-center space-x-1.5">
       <%= local_assigns[:right_additional_html] %>

From 2d510081be298112e9c9030fca5197a16e6b4206 Mon Sep 17 00:00:00 2001
From: Alex Turchyn <alex@docuseal.com>
Date: Thu, 23 Jul 2026 00:55:42 +0300
Subject: [PATCH 10/42] fix esign signature row layout

---
 .../esign_settings/_default_signature_row.html.erb     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/esign_settings/_default_signature_row.html.erb b/app/views/esign_settings/_default_signature_row.html.erb
index 899f99b3..46e86e4c 100644
--- a/app/views/esign_settings/_default_signature_row.html.erb
+++ b/app/views/esign_settings/_default_signature_row.html.erb
@@ -1,15 +1,15 @@
 <tr scope="row" class="group">
   <td class="flex items-center space-x-1">
-    <%= svg_icon('discount_check_filled', class: 'w-6 h-6 text-green-500') %>
-    <span class="flex items-center">
+    <%= svg_icon('discount_check_filled', class: 'w-6 h-6 shrink-0 text-green-500') %>
+    <span class="flex items-center whitespace-nowrap">
       <%= t('docuseal_trusted_signature') %>
-      <div class="tooltip ml-1" data-tip="<%= t('sign_documents_with_trusted_certificate_provided_by_docu_seal_your_documents_and_data_are_never_shared_with_docu_seal_p_d_f_checksum_is_provided_to_generate_a_trusted_signature') %>">
-        <%= svg_icon('circle_question', class: 'w-4 h-4 stroke-1') %>
+      <div class="tooltip ml-1 shrink-0" data-tip="<%= t('sign_documents_with_trusted_certificate_provided_by_docu_seal_your_documents_and_data_are_never_shared_with_docu_seal_p_d_f_checksum_is_provided_to_generate_a_trusted_signature') %>">
+        <%= svg_icon('circle_question', class: 'w-4 h-4 stroke-1 shrink-0') %>
       </div>
     </span>
   </td>
   <td>
-    <a href="<%= "#{Docuseal::CLOUD_URL}/sign_up?#{{ redir: "#{Docuseal::CONSOLE_URL}/on_premises" }.to_query}" %>" class="btn btn-neutral btn-sm text-white">
+    <a href="<%= "#{Docuseal::CLOUD_URL}/sign_up?#{{ redir: "#{Docuseal::CONSOLE_URL}/on_premises" }.to_query}" %>" class="btn btn-neutral btn-sm text-white whitespace-nowrap">
       <%= t('unlock_with_docuseal_pro') %>
     </a>
   </td>

From cbbbfdda802dc2d4458743936563d334eb31ec00 Mon Sep 17 00:00:00 2001
From: Alex Turchyn <alex@docuseal.com>
Date: Thu, 23 Jul 2026 14:31:53 +0300
Subject: [PATCH 11/42] add mobile settings navigation

---
 app/controllers/settings_index_controller.rb  |  7 ++++++
 app/views/accounts/show.html.erb              |  2 +-
 app/views/email_smtp_settings/index.html.erb  |  2 +-
 .../notifications_settings/index.html.erb     |  2 +-
 .../personalization_settings/show.html.erb    |  2 +-
 app/views/profile/index.html.erb              |  2 +-
 app/views/settings_index/index.html.erb       |  7 ++++++
 app/views/shared/_navbar.html.erb             |  8 ++++++-
 app/views/shared/_settings_nav.html.erb       | 22 ++++++++++++++++---
 app/views/sms_settings/index.html.erb         |  2 +-
 app/views/sso_settings/index.html.erb         |  2 +-
 app/views/storage_settings/index.html.erb     |  2 +-
 config/routes.rb                              |  2 ++
 13 files changed, 50 insertions(+), 12 deletions(-)
 create mode 100644 app/controllers/settings_index_controller.rb
 create mode 100644 app/views/settings_index/index.html.erb

diff --git a/app/controllers/settings_index_controller.rb b/app/controllers/settings_index_controller.rb
new file mode 100644
index 00000000..1feed012
--- /dev/null
+++ b/app/controllers/settings_index_controller.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class SettingsIndexController < ApplicationController
+  skip_authorization_check
+
+  def index; end
+end
diff --git a/app/views/accounts/show.html.erb b/app/views/accounts/show.html.erb
index ab65d57d..31c7f9aa 100644
--- a/app/views/accounts/show.html.erb
+++ b/app/views/accounts/show.html.erb
@@ -1,6 +1,6 @@
 <div class="flex flex-wrap space-y-4 md:flex-nowrap md:space-y-0">
   <%= render 'shared/settings_nav' %>
-  <div class="flex-grow max-w-xl mx-auto">
+  <div class="flex-grow md:max-w-xl md:mx-auto">
     <h1 class="text-4xl font-bold mb-4">
       <%= t('account') %>
     </h1>
diff --git a/app/views/email_smtp_settings/index.html.erb b/app/views/email_smtp_settings/index.html.erb
index 3407b0ef..90799b9f 100644
--- a/app/views/email_smtp_settings/index.html.erb
+++ b/app/views/email_smtp_settings/index.html.erb
@@ -1,6 +1,6 @@
 <div class="flex flex-wrap space-y-4 md:flex-nowrap md:space-y-0">
   <%= render 'shared/settings_nav' %>
-  <div class="flex-grow max-w-xl mx-auto min-w-0">
+  <div class="flex-grow md:max-w-xl md:mx-auto min-w-0">
     <h1 class="text-4xl font-bold mb-4">Email SMTP</h1>
     <% value = @encrypted_config.value || {} %>
     <%= form_for @encrypted_config, url: settings_email_index_path, method: :post, html: { autocomplete: 'off', class: 'space-y-4' } do |f| %>
diff --git a/app/views/notifications_settings/index.html.erb b/app/views/notifications_settings/index.html.erb
index b163e8e8..269feee4 100644
--- a/app/views/notifications_settings/index.html.erb
+++ b/app/views/notifications_settings/index.html.erb
@@ -1,6 +1,6 @@
 <div class="flex flex-wrap space-y-4 md:flex-nowrap md:space-y-0">
   <%= render 'shared/settings_nav' %>
-  <div class="flex-grow max-w-xl mx-auto">
+  <div class="flex-grow md:max-w-xl md:mx-auto">
     <h1 class="text-4xl font-bold mb-4">
       <%= t('email_notifications') %>
     </h1>
diff --git a/app/views/personalization_settings/show.html.erb b/app/views/personalization_settings/show.html.erb
index 438da311..64a95490 100644
--- a/app/views/personalization_settings/show.html.erb
+++ b/app/views/personalization_settings/show.html.erb
@@ -1,6 +1,6 @@
 <div class="flex flex-wrap space-y-4 md:flex-nowrap md:space-y-0">
   <%= render 'shared/settings_nav' %>
-  <div class="flex-grow max-w-xl mx-auto">
+  <div class="flex-grow md:max-w-xl md:mx-auto">
     <p class="text-4xl font-bold mb-4">
       <%= t('email_templates') %>
     </p>
diff --git a/app/views/profile/index.html.erb b/app/views/profile/index.html.erb
index b1880c22..3c726b4b 100644
--- a/app/views/profile/index.html.erb
+++ b/app/views/profile/index.html.erb
@@ -1,6 +1,6 @@
 <div class="flex flex-wrap space-y-4 md:flex-nowrap md:space-y-0">
   <%= render 'shared/settings_nav' %>
-  <div class="flex-grow max-w-xl mx-auto">
+  <div class="flex-grow md:max-w-xl md:mx-auto">
     <h1 class="text-4xl font-bold mb-4">
       <%= t('profile') %>
     </h1>
diff --git a/app/views/settings_index/index.html.erb b/app/views/settings_index/index.html.erb
new file mode 100644
index 00000000..32973ea7
--- /dev/null
+++ b/app/views/settings_index/index.html.erb
@@ -0,0 +1,7 @@
+<div class="mb-2 w-full">
+  <a href="<%= root_path %>" class="flex items-center space-x-0.5 font-medium">
+    <%= svg_icon('arrow_left', class: 'w-4 h-4 stroke-2') %>
+    <span><%= t('back') %></span>
+  </a>
+</div>
+<%= render 'shared/settings_nav', expanded: true %>
diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb
index ba406f71..cd5f4951 100644
--- a/app/views/shared/_navbar.html.erb
+++ b/app/views/shared/_navbar.html.erb
@@ -28,7 +28,13 @@
           <span class="text-sm align-text-top"><%= current_user.initials %></span>
         </label>
         <ul tabindex="0" class="z-10 dropdown-content p-2 mt-2 shadow menu text-base bg-base-100 rounded-box min-w-[160px] text-right">
-          <li>
+          <li class="md:hidden">
+            <%= link_to settings_index_path, class: 'flex items-center' do %>
+              <%= svg_icon('settings', class: 'w-5 h-5 flex-shrink-0 stroke-2') %>
+              <span class="mr-1"><%= t('settings') %></span>
+            <% end %>
+          </li>
+          <li class="max-md:hidden">
             <%= link_to settings_profile_index_path, class: 'flex items-center' do %>
               <%= svg_icon('adjustments', class: 'w-5 h-5 flex-shrink-0 stroke-2') %>
               <span class="mr-1"><%= t('profile') %></span>
diff --git a/app/views/shared/_settings_nav.html.erb b/app/views/shared/_settings_nav.html.erb
index 4dde21bf..12deef0f 100644
--- a/app/views/shared/_settings_nav.html.erb
+++ b/app/views/shared/_settings_nav.html.erb
@@ -1,7 +1,23 @@
-<div class="block w-full md:w-52 flex-none">
+<% expanded = local_assigns[:expanded] %>
+<% unless expanded %>
+  <div class="md:hidden w-full">
+    <a href="<%= settings_index_path %>" class="flex items-center space-x-0.5 font-medium">
+      <%= svg_icon('arrow_left', class: 'w-4 h-4 stroke-2') %>
+      <span><%= t('settings') %></span>
+    </a>
+  </div>
+<% end %>
+<div class="<%= expanded ? 'block max-md:-mx-3' : 'hidden md:block w-full md:w-52 flex-none' %>">
   <menu-active>
     <ul id="account_settings_menu" class="menu px-0">
-      <li class="menu-title py-0 !bg-transparent mb-3 -mt-5"><a href="<%= '/' %>" class="!bg-transparent !text-neutral font-medium flex items-center space-x-0.5"><%= svg_icon('arrow_left', class: 'w-4 h-4 stroke-2') %><span><%= t('back') %></span></a></li>
+      <% unless expanded %>
+        <li class="menu-title py-0 !bg-transparent mb-3 -mt-5">
+          <a href="<%= root_path %>" class="!bg-transparent !text-neutral font-medium flex items-center space-x-0.5">
+            <%= svg_icon('arrow_left', class: 'w-4 h-4 stroke-2') %>
+            <span><%= t('back') %></span>
+          </a>
+        </li>
+      <% end %>
       <li class="menu-title py-0 !bg-transparent">
         <span class="!bg-transparent"><%= t('settings') %></span>
       </li>
@@ -114,7 +130,7 @@
     </ul>
   </menu-active>
   <% if Docuseal.multitenant? || cannot?(:manage, :tenants) %>
-    <div id="support_channels" class="mx-4 border-t border-base-300 hidden md:block">
+    <div id="support_channels" class="mx-4 border-t border-base-300 <%= 'hidden md:block' unless expanded %>">
       <div class="text-sm mt-3">
         <%= t('need_help_ask_a_question_') %>
       </div>
diff --git a/app/views/sms_settings/index.html.erb b/app/views/sms_settings/index.html.erb
index ce3d516c..440d6fe1 100644
--- a/app/views/sms_settings/index.html.erb
+++ b/app/views/sms_settings/index.html.erb
@@ -1,6 +1,6 @@
 <div class="flex flex-wrap space-y-4 md:flex-nowrap md:space-y-0">
   <%= render 'shared/settings_nav' %>
-  <div class="flex-grow max-w-xl mx-auto">
+  <div class="flex-grow md:max-w-xl md:mx-auto">
     <h1 class="text-4xl font-bold mb-4">SMS</h1>
     <%= render 'placeholder' %>
   </div>
diff --git a/app/views/sso_settings/index.html.erb b/app/views/sso_settings/index.html.erb
index a0ebddba..93d8eaf3 100644
--- a/app/views/sso_settings/index.html.erb
+++ b/app/views/sso_settings/index.html.erb
@@ -1,6 +1,6 @@
 <div class="flex flex-wrap space-y-4 md:flex-nowrap md:space-y-0">
   <%= render 'shared/settings_nav' %>
-  <div class="flex-grow max-w-xl mx-auto">
+  <div class="flex-grow md:max-w-xl md:mx-auto">
     <h1 class="text-4xl font-bold mb-4">SAML SSO</h1>
     <%= render 'placeholder' %>
   </div>
diff --git a/app/views/storage_settings/index.html.erb b/app/views/storage_settings/index.html.erb
index 9a53e79a..201fd387 100644
--- a/app/views/storage_settings/index.html.erb
+++ b/app/views/storage_settings/index.html.erb
@@ -1,6 +1,6 @@
 <div class="flex flex-wrap space-y-4 md:flex-nowrap md:space-y-0">
   <%= render 'shared/settings_nav' %>
-  <div class="flex-grow max-w-xl mx-auto">
+  <div class="flex-grow md:max-w-xl md:mx-auto">
     <h1 class="text-4xl font-bold mb-4">
       <%= t('storage') %>
     </h1>
diff --git a/config/routes.rb b/config/routes.rb
index b31db369..24fb8705 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -178,6 +178,8 @@ Rails.application.routes.draw do
     resources :send_email, only: %i[create], controller: 'submitters_send_email'
   end
 
+  get 'settings' => 'settings_index#index', as: :settings_index
+
   scope '/settings', as: :settings do
     unless Docuseal.multitenant?
       resources :storage, only: %i[index create], controller: 'storage_settings'

From 1421bc2bce26f18aff01b0246067e815c4403893 Mon Sep 17 00:00:00 2001
From: Alex Turchyn <alex@docuseal.com>
Date: Thu, 23 Jul 2026 17:36:19 +0300
Subject: [PATCH 12/42] fix horizontal scroll from preferences tooltip

---
 app/views/templates/_title.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/templates/_title.html.erb b/app/views/templates/_title.html.erb
index df2ac0de..905fb871 100644
--- a/app/views/templates/_title.html.erb
+++ b/app/views/templates/_title.html.erb
@@ -44,7 +44,7 @@
     <% if !template.archived_at? %>
       <div class="flex items-center space-x-2">
         <% if can?(:update, template) %>
-          <div class="tooltip" data-tip="<%= t('preferences') %>">
+          <div class="tooltip hidden md:block" data-tip="<%= t('preferences') %>">
             <%= link_to template_preferences_path(template), class: 'btn border border-base-200 bg-base-200 hover:bg-base-300 hover:border-base-300 btn-sm flex-1 hidden md:flex', data: { turbo_frame: :modal } do %>
               <span class="flex items-center justify-center space-x-2">
                 <%= svg_icon('adjustments_horizontal', class: 'w-6 h-6') %>

From e77998e53cd3a54a467368c5295672c22892afd2 Mon Sep 17 00:00:00 2001
From: Alex Turchyn <alex@docuseal.com>
Date: Thu, 23 Jul 2026 19:51:36 +0300
Subject: [PATCH 13/42] scale down settings titles on mobile

---
 app/views/accounts/show.html.erb                 | 2 +-
 app/views/api_settings/index.html.erb            | 2 +-
 app/views/email_smtp_settings/index.html.erb     | 2 +-
 app/views/esign_settings/show.html.erb           | 8 ++++----
 app/views/mcp_settings/index.html.erb            | 2 +-
 app/views/notifications_settings/index.html.erb  | 4 ++--
 app/views/personalization_settings/show.html.erb | 6 +++---
 app/views/profile/index.html.erb                 | 2 +-
 app/views/sms_settings/index.html.erb            | 2 +-
 app/views/sso_settings/index.html.erb            | 2 +-
 app/views/storage_settings/index.html.erb        | 2 +-
 app/views/template_folders/show.html.erb         | 2 +-
 app/views/users/index.html.erb                   | 2 +-
 app/views/webhook_settings/index.html.erb        | 2 +-
 app/views/webhook_settings/show.html.erb         | 4 ++--
 15 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/app/views/accounts/show.html.erb b/app/views/accounts/show.html.erb
index 31c7f9aa..7a79c0cf 100644
--- a/app/views/accounts/show.html.erb
+++ b/app/views/accounts/show.html.erb
@@ -1,7 +1,7 @@
 <div class="flex flex-wrap space-y-4 md:flex-nowrap md:space-y-0">
   <%= render 'shared/settings_nav' %>
   <div class="flex-grow md:max-w-xl md:mx-auto">
-    <h1 class="text-4xl font-bold mb-4">
+    <h1 class="text-3xl md:text-4xl font-bold mb-4">
       <%= t('account') %>
     </h1>
     <%= form_for '', url: settings_account_path, method: :patch, html: { autocomplete: 'off', class: 'space-y-4' } do |f| %>
diff --git a/app/views/api_settings/index.html.erb b/app/views/api_settings/index.html.erb
index 6c15c755..710fe7f8 100644
--- a/app/views/api_settings/index.html.erb
+++ b/app/views/api_settings/index.html.erb
@@ -2,7 +2,7 @@
   <%= render 'shared/settings_nav' %>
   <div class="flex-grow">
     <div class="flex flex-col gap-2 md:flex-row md:justify-between md:items-end mb-4">
-      <h1 class="text-4xl font-bold">API</h1>
+      <h1 class="text-3xl md:text-4xl font-bold">API</h1>
       <%= render 'shared/test_mode_toggle' %>
     </div>
     <div class="card bg-base-200">
diff --git a/app/views/email_smtp_settings/index.html.erb b/app/views/email_smtp_settings/index.html.erb
index 90799b9f..80c7eb3b 100644
--- a/app/views/email_smtp_settings/index.html.erb
+++ b/app/views/email_smtp_settings/index.html.erb
@@ -1,7 +1,7 @@
 <div class="flex flex-wrap space-y-4 md:flex-nowrap md:space-y-0">
   <%= render 'shared/settings_nav' %>
   <div class="flex-grow md:max-w-xl md:mx-auto min-w-0">
-    <h1 class="text-4xl font-bold mb-4">Email SMTP</h1>
+    <h1 class="text-3xl md:text-4xl font-bold mb-4">Email SMTP</h1>
     <% value = @encrypted_config.value || {} %>
     <%= form_for @encrypted_config, url: settings_email_index_path, method: :post, html: { autocomplete: 'off', class: 'space-y-4' } do |f| %>
       <%= f.fields_for :value do |ff| %>
diff --git a/app/views/esign_settings/show.html.erb b/app/views/esign_settings/show.html.erb
index f22700b8..bf9bf4a8 100644
--- a/app/views/esign_settings/show.html.erb
+++ b/app/views/esign_settings/show.html.erb
@@ -2,7 +2,7 @@
   <%= render 'shared/settings_nav' %>
   <div class="md:flex-grow">
     <div class="max-w-xl">
-      <h1 class="text-4xl font-bold mb-4">
+      <h1 class="text-3xl md:text-4xl font-bold mb-4">
         <%= t('pdf_signature') %>
       </h1>
       <div id="result">
@@ -41,7 +41,7 @@
       <% end %>
     </div>
     <div class="flex flex-col md:flex-row gap-2 md:justify-between md:items-end mb-4 mt-8">
-      <h2 class="text-3xl font-bold">
+      <h2 class="text-2xl md:text-3xl font-bold">
         <%= t('signing_certificates') %>
       </h2>
       <% if can?(:create, @encrypted_config) %>
@@ -109,7 +109,7 @@
     <% if !Docuseal.multitenant? && can?(:manage, encrypted_config) %>
       <div class="flex-grow max-w-xl">
         <div class="flex justify-between items-end mb-4 mt-8">
-          <h2 class="text-3xl font-bold">
+          <h2 class="text-2xl md:text-3xl font-bold">
             <%= t('timestamp_server') %>
           </h2>
         </div>
@@ -137,7 +137,7 @@
     <% if can?(:manage, account_config) %>
       <div class="px-1 mt-8 max-w-xl">
         <div class="flex justify-between items-end mb-4 mt-8">
-          <h2 class="text-3xl font-bold">
+          <h2 class="text-2xl md:text-3xl font-bold">
             <%= t('preferences') %>
           </h2>
         </div>
diff --git a/app/views/mcp_settings/index.html.erb b/app/views/mcp_settings/index.html.erb
index 20c8fc6b..7896a4e6 100644
--- a/app/views/mcp_settings/index.html.erb
+++ b/app/views/mcp_settings/index.html.erb
@@ -2,7 +2,7 @@
   <%= render 'shared/settings_nav' %>
   <div class="md:flex-grow">
     <div class="flex flex-col md:flex-row md:flex-wrap gap-2 md:justify-between md:items-end mb-4 min-h-12">
-      <h1 class="text-4xl font-bold">
+      <h1 class="text-3xl md:text-4xl font-bold">
         <%= t('mcp_server') %>
       </h1>
       <div class="flex flex-col md:flex-row gap-y-2 gap-x-4 md:items-center">
diff --git a/app/views/notifications_settings/index.html.erb b/app/views/notifications_settings/index.html.erb
index 269feee4..7f408c52 100644
--- a/app/views/notifications_settings/index.html.erb
+++ b/app/views/notifications_settings/index.html.erb
@@ -1,7 +1,7 @@
 <div class="flex flex-wrap space-y-4 md:flex-nowrap md:space-y-0">
   <%= render 'shared/settings_nav' %>
   <div class="flex-grow md:max-w-xl md:mx-auto">
-    <h1 class="text-4xl font-bold mb-4">
+    <h1 class="text-3xl md:text-4xl font-bold mb-4">
       <%= t('email_notifications') %>
     </h1>
     <div class="mt-2 mb-1">
@@ -22,7 +22,7 @@
     </div>
     <%= render 'bcc_form', config: @bcc_config %>
     <div class="flex justify-between items-end mb-4 mt-8">
-      <h2 class="text-3xl font-bold">
+      <h2 class="text-2xl md:text-3xl font-bold">
         <%= t('sign_request_email_reminders') %>
       </h2>
     </div>
diff --git a/app/views/personalization_settings/show.html.erb b/app/views/personalization_settings/show.html.erb
index 64a95490..3ea5d1db 100644
--- a/app/views/personalization_settings/show.html.erb
+++ b/app/views/personalization_settings/show.html.erb
@@ -1,7 +1,7 @@
 <div class="flex flex-wrap space-y-4 md:flex-nowrap md:space-y-0">
   <%= render 'shared/settings_nav' %>
   <div class="flex-grow md:max-w-xl md:mx-auto">
-    <p class="text-4xl font-bold mb-4">
+    <p class="text-3xl md:text-4xl font-bold mb-4">
       <%= t('email_templates') %>
     </p>
     <div class="space-y-4">
@@ -9,11 +9,11 @@
       <%= render 'documents_copy_email_form' %>
       <%= render 'submitter_completed_email_form' %>
     </div>
-    <p class="text-4xl font-bold mb-4 mt-8">
+    <p class="text-3xl md:text-4xl font-bold mb-4 mt-8">
       <%= t('company_logo') %>
     </p>
     <%= render 'logo_form' %>
-    <p class="text-4xl font-bold mb-4 mt-8">
+    <p class="text-3xl md:text-4xl font-bold mb-4 mt-8">
       <%= t('submission_form') %>
     </p>
     <div class="space-y-4">
diff --git a/app/views/profile/index.html.erb b/app/views/profile/index.html.erb
index 3c726b4b..f5945d7f 100644
--- a/app/views/profile/index.html.erb
+++ b/app/views/profile/index.html.erb
@@ -1,7 +1,7 @@
 <div class="flex flex-wrap space-y-4 md:flex-nowrap md:space-y-0">
   <%= render 'shared/settings_nav' %>
   <div class="flex-grow md:max-w-xl md:mx-auto">
-    <h1 class="text-4xl font-bold mb-4">
+    <h1 class="text-3xl md:text-4xl font-bold mb-4">
       <%= t('profile') %>
     </h1>
     <%= form_for current_user, url: update_contact_settings_profile_index_path, method: :patch, html: { autocomplete: 'off', class: 'space-y-4' } do |f| %>
diff --git a/app/views/sms_settings/index.html.erb b/app/views/sms_settings/index.html.erb
index 440d6fe1..58051458 100644
--- a/app/views/sms_settings/index.html.erb
+++ b/app/views/sms_settings/index.html.erb
@@ -1,7 +1,7 @@
 <div class="flex flex-wrap space-y-4 md:flex-nowrap md:space-y-0">
   <%= render 'shared/settings_nav' %>
   <div class="flex-grow md:max-w-xl md:mx-auto">
-    <h1 class="text-4xl font-bold mb-4">SMS</h1>
+    <h1 class="text-3xl md:text-4xl font-bold mb-4">SMS</h1>
     <%= render 'placeholder' %>
   </div>
   <div class="w-0 md:w-52"></div>
diff --git a/app/views/sso_settings/index.html.erb b/app/views/sso_settings/index.html.erb
index 93d8eaf3..dd3e4fb6 100644
--- a/app/views/sso_settings/index.html.erb
+++ b/app/views/sso_settings/index.html.erb
@@ -1,7 +1,7 @@
 <div class="flex flex-wrap space-y-4 md:flex-nowrap md:space-y-0">
   <%= render 'shared/settings_nav' %>
   <div class="flex-grow md:max-w-xl md:mx-auto">
-    <h1 class="text-4xl font-bold mb-4">SAML SSO</h1>
+    <h1 class="text-3xl md:text-4xl font-bold mb-4">SAML SSO</h1>
     <%= render 'placeholder' %>
   </div>
   <div class="w-0 md:w-52"></div>
diff --git a/app/views/storage_settings/index.html.erb b/app/views/storage_settings/index.html.erb
index 201fd387..b2cc9a6d 100644
--- a/app/views/storage_settings/index.html.erb
+++ b/app/views/storage_settings/index.html.erb
@@ -1,7 +1,7 @@
 <div class="flex flex-wrap space-y-4 md:flex-nowrap md:space-y-0">
   <%= render 'shared/settings_nav' %>
   <div class="flex-grow md:max-w-xl md:mx-auto">
-    <h1 class="text-4xl font-bold mb-4">
+    <h1 class="text-3xl md:text-4xl font-bold mb-4">
       <%= t('storage') %>
     </h1>
     <% value = @encrypted_config.value || { 'service' => 'disk' } %>
diff --git a/app/views/template_folders/show.html.erb b/app/views/template_folders/show.html.erb
index 9120dc92..ec03c144 100644
--- a/app/views/template_folders/show.html.erb
+++ b/app/views/template_folders/show.html.erb
@@ -1,5 +1,5 @@
 <div>
-  <%= link_to @template_folder.parent_folder ? folder_path(@template_folder.parent_folder) : root_path, class: 'flex items-center' do %>
+  <%= link_to @template_folder.parent_folder ? folder_path(@template_folder.parent_folder) : root_path, class: 'flex items-center mb-1 md:mb-0' do %>
     <%= svg_icon('chevron_left', class: 'w-5 h-5') %>
     <span style="margin-left: 3px"><%= @template_folder.parent_folder&.name || t('home') %></span>
   <% end %>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 33e7eb2c..7b0ac011 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -2,7 +2,7 @@
   <%= render 'shared/settings_nav' %>
   <div class="md:flex-grow">
     <div class="flex flex-col md:flex-row md:flex-wrap gap-2 md:justify-between md:items-end mb-4 min-h-12">
-      <h1 class="text-4xl font-bold">
+      <h1 class="text-3xl md:text-4xl font-bold">
         <% if params[:status] == 'archived' %>
           <%= t('archived_users') %>
         <% elsif params[:status] == 'integration' %>
diff --git a/app/views/webhook_settings/index.html.erb b/app/views/webhook_settings/index.html.erb
index c9626016..7448e57f 100644
--- a/app/views/webhook_settings/index.html.erb
+++ b/app/views/webhook_settings/index.html.erb
@@ -2,7 +2,7 @@
   <%= render 'shared/settings_nav' %>
   <div class="flex-grow min-w-0">
     <div class="flex flex-col gap-2 md:flex-row md:justify-between md:items-end mb-4">
-      <h1 class="text-4xl font-bold">Webhooks</h1>
+      <h1 class="text-3xl md:text-4xl font-bold">Webhooks</h1>
       <div class="flex flex-col gap-2 md:flex-row md:justify-between md:items-center">
         <%= render 'shared/test_mode_toggle' %>
         <% if @webhook_url.persisted? %>
diff --git a/app/views/webhook_settings/show.html.erb b/app/views/webhook_settings/show.html.erb
index 920d31d4..49f4f1c6 100644
--- a/app/views/webhook_settings/show.html.erb
+++ b/app/views/webhook_settings/show.html.erb
@@ -2,7 +2,7 @@
   <%= render 'shared/settings_nav' %>
   <div class="flex-grow">
     <div class="flex flex-col gap-2 md:flex-row md:justify-between md:items-end mb-4">
-      <h1 class="text-4xl font-bold">Webhook</h1>
+      <h1 class="text-3xl md:text-4xl font-bold">Webhook</h1>
       <div class="flex flex-col gap-2 md:flex-row md:justify-between md:items-center">
         <% if params[:action] == 'index' && (current_user == true_user || current_account.testing?) %>
           <%= render 'shared/test_mode_toggle' %>
@@ -83,7 +83,7 @@
     </div>
     <% if @webhook_events.present? || params[:status].present? %>
       <div class="mt-6">
-        <h2 id="log" class="text-3xl font-bold"><%= t('events_log') %></h2>
+        <h2 id="log" class="text-2xl md:text-3xl font-bold"><%= t('events_log') %></h2>
         <div class="tabs border-b mt-4">
           <%= link_to t('all'), url_for(params: request.query_parameters.except('status', 'page')), style: 'margin-bottom: -1px', class: "tab h-10 text-base #{params[:status].blank? ? 'tab-active tab-bordered' : 'pb-[3px]'}" %>
           <%= link_to t('succeeded'), url_for(params: request.query_parameters.except('page').merge('status' => 'success')), style: 'margin-bottom: -1px', class: "tab h-10 text-base #{params[:status] == 'success' ? 'tab-active tab-bordered' : 'pb-[3px]'}" %>

From 3edd1ab32d9a81e2b2a709ec3eecb02e202b588b Mon Sep 17 00:00:00 2001
From: Alex Turchyn <alex@docuseal.com>
Date: Thu, 23 Jul 2026 21:20:22 +0300
Subject: [PATCH 14/42] fix invalid classes and html attributes

---
 app/views/esign_settings/_default_signature_row.html.erb | 2 +-
 app/views/esign_settings/show.html.erb                   | 2 +-
 app/views/icons/_brand_gdrive.html.erb                   | 2 +-
 app/views/mcp_settings/index.html.erb                    | 2 +-
 app/views/templates/_submission.html.erb                 | 2 +-
 app/views/templates/_template.html.erb                   | 2 +-
 app/views/templates_folders/edit.html.erb                | 4 +---
 app/views/templates_preferences/show.html.erb            | 2 +-
 app/views/user_initials/edit.html.erb                    | 2 +-
 app/views/user_signatures/edit.html.erb                  | 2 +-
 app/views/users/index.html.erb                           | 2 +-
 app/views/webhook_events/_drawer_events.html.erb         | 2 +-
 12 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/app/views/esign_settings/_default_signature_row.html.erb b/app/views/esign_settings/_default_signature_row.html.erb
index 46e86e4c..1cb2148c 100644
--- a/app/views/esign_settings/_default_signature_row.html.erb
+++ b/app/views/esign_settings/_default_signature_row.html.erb
@@ -1,4 +1,4 @@
-<tr scope="row" class="group">
+<tr class="group">
   <td class="flex items-center space-x-1">
     <%= svg_icon('discount_check_filled', class: 'w-6 h-6 shrink-0 text-green-500') %>
     <span class="flex items-center whitespace-nowrap">
diff --git a/app/views/esign_settings/show.html.erb b/app/views/esign_settings/show.html.erb
index bf9bf4a8..82a5a10e 100644
--- a/app/views/esign_settings/show.html.erb
+++ b/app/views/esign_settings/show.html.erb
@@ -72,7 +72,7 @@
         <tbody>
           <% @pkcs_list.each do |item| %>
             <% next if item['pkcs'].blank? %>
-            <tr scope="row" class="group">
+            <tr class="group">
               <td>
                 <%= item['name'] %>
               </td>
diff --git a/app/views/icons/_brand_gdrive.html.erb b/app/views/icons/_brand_gdrive.html.erb
index 2a9bffbb..d5059f45 100644
--- a/app/views/icons/_brand_gdrive.html.erb
+++ b/app/views/icons/_brand_gdrive.html.erb
@@ -1 +1 @@
-<svg class="<%= local_assigns[:class] %>" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-brand-google-drive"><path stroke="none" d="M0 0h24v24H0z" fill="none" /><path d="M12 10l-6 10l-3 -5l6 -10z" /><path d="M9 15h12l-3 5h-12" /><path d="M15 15l-6 -10h6l6 10z" /></svg>
+<svg class="<%= local_assigns[:class] %>" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none" /><path d="M12 10l-6 10l-3 -5l6 -10z" /><path d="M9 15h12l-3 5h-12" /><path d="M15 15l-6 -10h6l6 10z" /></svg>
diff --git a/app/views/mcp_settings/index.html.erb b/app/views/mcp_settings/index.html.erb
index 7896a4e6..d0e5c46b 100644
--- a/app/views/mcp_settings/index.html.erb
+++ b/app/views/mcp_settings/index.html.erb
@@ -67,7 +67,7 @@
         </thead>
         <tbody>
           <% @mcp_tokens.each do |mcp_token| %>
-            <tr scope="row">
+            <tr>
               <td>
                 <%= mcp_token.name %>
               </td>
diff --git a/app/views/templates/_submission.html.erb b/app/views/templates/_submission.html.erb
index 829dd3ab..8ac88786 100644
--- a/app/views/templates/_submission.html.erb
+++ b/app/views/templates/_submission.html.erb
@@ -1,5 +1,5 @@
 <% status_badges = { 'awaiting' => 'badge-info', 'sent' => 'badge-info', 'completed' => 'badge-success', 'opened' => 'badge-warning', 'declined' => 'badge-error' } %>
-<div class="bg-base-200 rounded-2xl flex flex-col sm:flex-row items-strech">
+<div class="bg-base-200 rounded-2xl flex flex-col sm:flex-row">
   <% if local_assigns[:with_template] %>
     <% template = submission.template %>
     <a href="<%= template ? template_path(template) : submission_path(submission) %>" class="px-5 sm:pr-3 py-3 group sm:rounded-l-2xl sm:rounded-tr-none rounded-t-2xl flex sm:flex-col justify-between sm:w-52 w-full flex-shrink-0 bg-base-300/60 space-x-2 sm:space-x-0">
diff --git a/app/views/templates/_template.html.erb b/app/views/templates/_template.html.erb
index 80f93c5c..79985645 100644
--- a/app/views/templates/_template.html.erb
+++ b/app/views/templates/_template.html.erb
@@ -60,7 +60,7 @@
       <% end %>
       <% if can?(:destroy, template) %>
         <span class="tooltip tooltip-left tooltip-no-touch" data-tip="<%= template.archived_at? ? t('delete') : t('archive') %>">
-          <%= button_to template_path(template), data: template.archived_at? ? { turbo_confirm: t('template_deletion_is_irreversible_and_will_permanently_remove_all_associated_signed_documents_with_it_are_you_sure_') } : {}, params: { permanently: template.archived_at? }.compact_blank, method: :delete, class: 'btn btn-xs hover:btn-outline bg-base-200 btn-circle', aria_label: t('restore') do %>
+          <%= button_to template_path(template), data: template.archived_at? ? { turbo_confirm: t('template_deletion_is_irreversible_and_will_permanently_remove_all_associated_signed_documents_with_it_are_you_sure_') } : {}, params: { permanently: template.archived_at? }.compact_blank, method: :delete, class: 'btn btn-xs hover:btn-outline bg-base-200 btn-circle', aria: { label: template.archived_at? ? t('delete') : t('archive') } do %>
             <%= svg_icon(template.archived_at? ? 'trash' : 'archive', class: 'w-4 h-4 enabled') %>
             <%= svg_icon('loader', class: 'w-4 h-4 animate-spin disabled') %>
           <% end %>
diff --git a/app/views/templates_folders/edit.html.erb b/app/views/templates_folders/edit.html.erb
index b9bea18c..cd2a83ee 100644
--- a/app/views/templates_folders/edit.html.erb
+++ b/app/views/templates_folders/edit.html.erb
@@ -10,9 +10,7 @@
             <span class="flex items-center mt-1">
               <%= svg_icon('folder', class: 'w-5 h-5 flex-shrink-0 group-hover:hidden mr-1') %>
               <%= svg_icon('folder_share', class: 'w-5 h-5 flex-shrink-0 hidden group-hover:inline mr-1') %>
-              <span class="text-md">
-                <%= @template.folder.parent_folder&.name || @template.folder.name %>
-              </span>
+              <span><%= @template.folder.parent_folder&.name || @template.folder.name %></span>
             </span>
           </label>
         </div>
diff --git a/app/views/templates_preferences/show.html.erb b/app/views/templates_preferences/show.html.erb
index 15fdb14d..df67e61b 100644
--- a/app/views/templates_preferences/show.html.erb
+++ b/app/views/templates_preferences/show.html.erb
@@ -10,7 +10,7 @@
         <% options.each_with_index do |(label, value), index| %>
           <span>
             <%= radio_button_tag 'option', value, value == 'general', class: 'peer hidden', data: { action: 'change:toggle-visible#trigger' } %>
-            <label for="option_<%= value %>" class="<%= '!rounded-s-full' if index.zero? %> btn btn-focus btn-sm join-item peer-checked:btn-active normal-case <%= 'px-8 md:px-0' if value.in?(%w[general recipients]) %> <%= options.size > 2 ? 'md:w-44' : 'md:w-48' %>">
+            <label for="option_<%= value %>" class="<%= '!rounded-s-full' if index.zero? %> btn btn-sm join-item peer-checked:btn-active normal-case <%= 'px-8 md:px-0' if value.in?(%w[general recipients]) %> <%= options.size > 2 ? 'md:w-44' : 'md:w-48' %>">
               <%= label %>
             </label>
           </span>
diff --git a/app/views/user_initials/edit.html.erb b/app/views/user_initials/edit.html.erb
index 512b81a2..584cc274 100644
--- a/app/views/user_initials/edit.html.erb
+++ b/app/views/user_initials/edit.html.erb
@@ -5,7 +5,7 @@
       <% options.each_with_index do |(label, value), index| %>
         <span>
           <%= radio_button_tag 'option', value, value == 'draw', class: 'peer hidden', data: { action: 'change:toggle-visible#trigger' } %>
-          <label for="option_<%= value %>" class="<%= '!rounded-s-full' if index.zero? %> btn btn-focus btn-sm join-item md:w-28 peer-checked:btn-active normal-case">
+          <label for="option_<%= value %>" class="<%= '!rounded-s-full' if index.zero? %> btn btn-sm join-item md:w-28 peer-checked:btn-active normal-case">
             <%= label %>
           </label>
         </span>
diff --git a/app/views/user_signatures/edit.html.erb b/app/views/user_signatures/edit.html.erb
index 307fc0b0..ebfffbfd 100644
--- a/app/views/user_signatures/edit.html.erb
+++ b/app/views/user_signatures/edit.html.erb
@@ -5,7 +5,7 @@
       <% options.each_with_index do |(label, value), index| %>
         <span>
           <%= radio_button_tag 'option', value, value == 'draw', class: 'peer hidden', data: { action: 'change:toggle-visible#trigger' } %>
-          <label for="option_<%= value %>" class="<%= '!rounded-s-full' if index.zero? %> btn btn-focus btn-sm join-item md:w-28 peer-checked:btn-active normal-case">
+          <label for="option_<%= value %>" class="<%= '!rounded-s-full' if index.zero? %> btn btn-sm join-item md:w-28 peer-checked:btn-active normal-case">
             <%= label %>
           </label>
         </span>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 7b0ac011..89ac36b9 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -56,7 +56,7 @@
         </thead>
         <tbody>
           <% @users.each do |user| %>
-            <tr scope="row">
+            <tr>
               <td>
                 <%= user.full_name %>
               </td>
diff --git a/app/views/webhook_events/_drawer_events.html.erb b/app/views/webhook_events/_drawer_events.html.erb
index 1f79804f..461ce0cb 100644
--- a/app/views/webhook_events/_drawer_events.html.erb
+++ b/app/views/webhook_events/_drawer_events.html.erb
@@ -6,7 +6,7 @@
       <% next_attempt_at = last_attempt.created_at + (2**last_attempt.attempt).minutes %>
       <% if webhook_event.webhook_attempts.none?(&:success?) && last_attempt.attempt <= 10 && next_attempt_at > 30.seconds.ago %>
         <li class="ml-7">
-          <span class="btn btn-outline btn-xs btn-circle pointer-events-none absolute justify-center border-base-content-/60 text-base-content/60 bg-base-100" style="left: -12px;">
+          <span class="btn btn-outline btn-xs btn-circle pointer-events-none absolute justify-center text-base-content/60 bg-base-100" style="left: -12px;">
             <%= svg_icon('clock', class: 'w-4 h-4 shrink-0') %>
           </span>
           <p class="leading-none text-base-content/90 pt-1">

From 270461ad3b3d14f2c0af3781adb335d31e49ab8e Mon Sep 17 00:00:00 2001
From: Alex Turchyn <alex@docuseal.com>
Date: Fri, 24 Jul 2026 17:48:45 +0300
Subject: [PATCH 15/42] add mobile filters

---
 app/javascript/application.js                 |   2 +
 app/javascript/elements/scroll_fade.js        |  40 +++++
 app/views/shared/_classes.html.erb            |   2 +-
 app/views/submissions_archived/index.html.erb |   2 +-
 .../submissions_dashboard/index.html.erb      |   6 +-
 .../_applied_filters.html.erb                 | 155 ++++++++++--------
 .../_filter_button.html.erb                   |   9 +-
 app/views/template_folders/show.html.erb      |   2 +-
 app/views/templates/show.html.erb             |   6 +-
 .../index.html.erb                            |   4 +-
 10 files changed, 142 insertions(+), 86 deletions(-)
 create mode 100644 app/javascript/elements/scroll_fade.js

diff --git a/app/javascript/application.js b/app/javascript/application.js
index d834182a..647378b0 100644
--- a/app/javascript/application.js
+++ b/app/javascript/application.js
@@ -56,6 +56,7 @@ import OpenModal from './elements/open_modal'
 import BarChart from './elements/bar_chart'
 import FieldCondition from './elements/field_condition'
 import ConfirmUpload from './elements/confirm_upload'
+import ScrollFade from './elements/scroll_fade'
 
 import * as TurboInstantClick from './lib/turbo_instant_click'
 
@@ -150,6 +151,7 @@ safeRegisterElement('open-modal', OpenModal)
 safeRegisterElement('bar-chart', BarChart)
 safeRegisterElement('field-condition', FieldCondition)
 safeRegisterElement('confirm-upload', ConfirmUpload)
+safeRegisterElement('scroll-fade', ScrollFade)
 
 safeRegisterElement('template-builder', class extends HTMLElement {
   connectedCallback () {
diff --git a/app/javascript/elements/scroll_fade.js b/app/javascript/elements/scroll_fade.js
new file mode 100644
index 00000000..20c4906a
--- /dev/null
+++ b/app/javascript/elements/scroll_fade.js
@@ -0,0 +1,40 @@
+export default class extends HTMLElement {
+  connectedCallback () {
+    this.addEventListener('scroll', this.updateFade, { passive: true })
+    window.addEventListener('resize', this.updateFade)
+
+    this.updateFade()
+  }
+
+  disconnectedCallback () {
+    window.removeEventListener('resize', this.updateFade)
+  }
+
+  updateFade = () => {
+    const maxScroll = this.scrollWidth - this.clientWidth
+    const fadeGradient = {
+      right: 'linear-gradient(to right, black calc(100% - 24px), transparent)',
+      left: 'linear-gradient(to right, transparent, black 24px)',
+      both: 'linear-gradient(to right, transparent, black 24px, black calc(100% - 24px), transparent)'
+    }
+
+    let state = 'none'
+
+    if (maxScroll > 4) {
+      if (this.scrollLeft <= 4) {
+        state = 'right'
+      } else if (this.scrollLeft >= maxScroll - 4) {
+        state = 'left'
+      } else {
+        state = 'both'
+      }
+    }
+
+    this.applyFade(fadeGradient[state] || '')
+  }
+
+  applyFade (gradient) {
+    this.style.maskImage = gradient
+    this.style.webkitMaskImage = gradient
+  }
+}
diff --git a/app/views/shared/_classes.html.erb b/app/views/shared/_classes.html.erb
index 7069b153..f4858dca 100644
--- a/app/views/shared/_classes.html.erb
+++ b/app/views/shared/_classes.html.erb
@@ -1 +1 @@
-<% 'stats stat stat-figure stat-title stat-value text-accent w-fit hover:bg-white dropdown-open border-base-content/30 before:border-base-content/30' %>
+<% 'stats stat stat-figure stat-title stat-value text-accent w-fit hover:bg-white dropdown-open border-base-content/30 before:border-base-content/30 order-none order-1 order-2 order-3 order-4 order-5' %>
diff --git a/app/views/submissions_archived/index.html.erb b/app/views/submissions_archived/index.html.erb
index 73bb402b..67380d50 100644
--- a/app/views/submissions_archived/index.html.erb
+++ b/app/views/submissions_archived/index.html.erb
@@ -16,7 +16,7 @@
       <% end %>
     </div>
   </div>
-  <div class="flex flex-col items-end md:flex-row gap-2">
+  <div class="flex items-center md:items-end gap-2">
     <%= render 'submissions_filters/applied_filters', filter_params: %>
     <%= render 'submissions_filters/filter_button', filter_params: %>
   </div>
diff --git a/app/views/submissions_dashboard/index.html.erb b/app/views/submissions_dashboard/index.html.erb
index 43d5cfd4..dc7580c2 100644
--- a/app/views/submissions_dashboard/index.html.erb
+++ b/app/views/submissions_dashboard/index.html.erb
@@ -34,7 +34,7 @@
 <% end %>
 <% if is_show_tabs %>
   <div class="flex items-center flex-col md:flex-row md:flex-wrap gap-2 mb-4">
-    <div class="flex items-center md:items-end flex-col md:flex-row gap-2 w-full md:w-fit">
+    <div class="hidden md:flex md:items-end gap-2 md:w-fit">
       <a href="<%= url_for(params: request.query_parameters.except('status')) %>" class="<%= params[:status].blank? ? 'border-neutral-700' : 'border-neutral-300' %> flex h-10 px-2 py-1 text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl w-full md:w-48 hover:border-neutral-600">
         <div class="flex items-center space-x-1">
           <%= svg_icon('list', class: 'w-5 h-5') %>
@@ -54,8 +54,8 @@
         </div>
       </a>
     </div>
-    <div class="flex items-end flex-col md:flex-row gap-2 w-full md:w-fit">
-      <%= render 'submissions_filters/applied_filters', filter_params: %>
+    <div class="flex items-center md:items-end gap-2 w-full md:w-fit">
+      <%= render 'submissions_filters/applied_filters', filter_params:, with_status: true %>
       <%= render 'submissions_filters/filter_button', filter_params: %>
       <%= render 'submissions_filters/actions', filter_params: %>
     </div>
diff --git a/app/views/submissions_filters/_applied_filters.html.erb b/app/views/submissions_filters/_applied_filters.html.erb
index 773b111e..07cc0049 100644
--- a/app/views/submissions_filters/_applied_filters.html.erb
+++ b/app/views/submissions_filters/_applied_filters.html.erb
@@ -1,72 +1,85 @@
 <% query_params = params.permit(:q).merge(filter_params) %>
-<% if icon = { 'declined' => 'x_circle', 'expired' => 'clock_cancel', 'partially_completed' => 'clock_edit', 'sent' => 'send', 'opened' => 'mail_opened' }[params[:status]] %>
-  <div class="flex h-10 px-2 py-1 text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl w-full md:w-36 border-neutral-700">
-    <%= link_to submissions_filter_path('status', query_params.merge(path: url_for, with_remove: true)), data: { turbo_frame: 'modal' }, class: 'flex items-center space-x-1 flex-1 min-w-0 pr-1' do %>
-      <%= svg_icon(icon, class: 'w-5 h-5 shrink-0') %>
-      <span class="font-normal truncate"><%= t(params[:status]) %></span>
-    <% end %>
-    <%= link_to url_for(params: request.query_parameters.except('status')), class: 'rounded-lg ml-1 shrink-0 hover:bg-base-content hover:text-white' do %>
-      <%= svg_icon('x', class: 'w-5 h-5') %>
-    <% end %>
-  </div>
-<% end %>
-<% if params[:folder].present? %>
-  <div class="tooltip tooltip-no-touch tooltip-bottom flex h-10 px-2 py-1 text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl w-full md:w-36 border-neutral-700" data-tip="<%= t('folder') %>">
-    <%= link_to submissions_filter_path('folder', query_params.merge(path: url_for, with_remove: true)), data: { turbo_frame: 'modal' }, class: 'flex items-center space-x-1 flex-1 min-w-0 pr-1' do %>
-      <%= svg_icon('folder', class: 'w-5 h-5 shrink-0') %>
-      <span class="font-normal truncate"><%= params[:folder] %></span>
-    <% end %>
-    <%= link_to url_for(params: request.query_parameters.except('folder')), class: 'rounded-lg ml-1 shrink-0 hover:bg-base-content hover:text-white' do %>
-      <%= svg_icon('x', class: 'w-5 h-5') %>
-    <% end %>
-  </div>
-<% end %>
-<% if params[:author].present? %>
-  <div class="tooltip tooltip-no-touch tooltip-bottom flex h-10 px-2 py-1 text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl w-full md:w-36 border-neutral-700" data-tip="<%= t('author') %>">
-    <%= link_to submissions_filter_path('author', query_params.merge(path: url_for, with_remove: true)), data: { turbo_frame: 'modal' }, class: 'flex items-center space-x-1 flex-1 min-w-0 pr-1' do %>
-      <%= svg_icon('user', class: 'w-5 h-5 shrink-0') %>
-      <span class="font-normal truncate"><%= current_account.users.accessible_by(current_ability).where(account: current_account).find_by(email: params[:author])&.full_name || 'NA' %></span>
-    <% end %>
-    <%= link_to url_for(params: request.query_parameters.except('author')), class: 'rounded-lg ml-1 shrink-0 hover:bg-base-content hover:text-white' do %>
-      <%= svg_icon('x', class: 'w-5 h-5') %>
-    <% end %>
-  </div>
-<% end %>
-<% if query_params[:completed_at_from].present? || query_params[:completed_at_to].present? %>
-  <div class="tooltip tooltip-no-touch tooltip-bottom flex h-10 px-2 py-1 text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl w-full md:w-36 border-neutral-700" data-tip="<%= t('completed_at') %>">
-    <%= link_to submissions_filter_path('completed_at', query_params.merge(path: url_for, with_remove: true)), data: { turbo_frame: 'modal' }, class: 'flex items-center space-x-1 flex-1 min-w-0 pr-1' do %>
-      <%= svg_icon('calendar_check', class: 'w-5 h-5 shrink-0') %>
-      <span class="flex flex-row md:flex-col font-normal text-left md:text-center md:text-xs">
-        <% if query_params[:completed_at_from] == query_params[:completed_at_to] %>
-          <span><%= l(Date.parse(query_params[:completed_at_from]), locale: current_account.locale) %></span>
-        <% else %>
-          <span><%= query_params[:completed_at_from].present? ? l(Date.parse(query_params[:completed_at_from]), locale: current_account.locale) : '∞' %></span>
-          <span class="px-1 md:px-0 md:hidden">-</span>
-          <span><%= query_params[:completed_at_to].present? ? l(Date.parse(query_params[:completed_at_to]), locale: current_account.locale) : t('today') %></span>
-        <% end %>
-      </span>
-    <% end %>
-    <%= link_to url_for(params: request.query_parameters.except('completed_at_from', 'completed_at_to')), class: 'rounded-lg ml-1 shrink-0 hover:bg-base-content hover:text-white' do %>
-      <%= svg_icon('x', class: 'w-5 h-5') %>
-    <% end %>
-  </div>
-<% end %>
-<% if query_params[:created_at_from].present? || query_params[:created_at_to].present? %>
-  <div class="tooltip tooltip-no-touch tooltip-bottom flex h-10 px-2 py-1 text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl w-full md:w-36 border-neutral-700" data-tip="<%= t('created_at') %>">
-    <%= link_to submissions_filter_path('created_at', query_params.merge(path: url_for, with_remove: true)), data: { turbo_frame: 'modal' }, class: 'flex items-center space-x-1 flex-1 min-w-0 pr-1' do %>
-      <%= svg_icon('calendar', class: 'w-5 h-5 shrink-0') %>
-      <span class="flex flex-row md:flex-col font-normal text-left md:text-center md:text-xs">
-        <% if query_params[:created_at_from] == query_params[:created_at_to] %>
-          <span><%= l(Date.parse(query_params[:created_at_from]), locale: current_account.locale) %></span>
-        <% else %>
-          <span><%= query_params[:created_at_from].present? ? l(Date.parse(query_params[:created_at_from]), locale: current_account.locale) : '∞' %></span>
-          <span class="px-1 md:px-0 md:hidden">-</span>
-          <span><%= query_params[:created_at_to].present? ? l(Date.parse(query_params[:created_at_to]), locale: current_account.locale) : t('today') %></span>
-        <% end %>
-      </span>
-    <% end %>
-    <%= link_to url_for(params: request.query_parameters.except('created_at_to', 'created_at_from')), class: 'rounded-lg ml-1 shrink-0 hover:bg-base-content hover:text-white' do %>
-      <%= svg_icon('x', class: 'w-5 h-5') %>
-    <% end %>
-  </div>
-<% end %>
+<% filter_names = %w[status folder author completed_at created_at] %>
+<% ordered_filters = request.query_parameters.keys.filter_map { |key| filter_names.find { |name| key.start_with?(name) } }.uniq %>
+<% chip_order = ordered_filters.reverse.each_with_index.to_h { |name, index| [name, index + 1] } %>
+<% chip_order.default = ordered_filters.size + 1 %>
+<scroll-fade class="flex items-center gap-2 overflow-x-auto flex-1 min-w-0 [scrollbar-width:none] [&::-webkit-scrollbar]:hidden [&::-webkit-scrollbar]:h-0 [&::-webkit-scrollbar]:w-0 md:contents">
+  <% if local_assigns[:with_status] %>
+    <% status_icons = { 'all' => 'list', 'pending' => 'clock', 'completed' => 'circle_check', 'partially_completed' => 'clock_edit', 'sent' => 'send', 'opened' => 'mail_opened', 'declined' => 'x_circle', 'expired' => 'clock_cancel' } %>
+    <% current_status = status_icons.key?(params[:status].to_s) ? params[:status] : 'all' %>
+    <a href="<%= submissions_filter_path('status', query_params.merge(path: url_for)) %>" data-turbo-frame="modal" class="order-<%= current_status == 'all' ? 'none' : chip_order['status'] %> md:hidden flex h-10 px-2 py-1 space-x-1 text-base items-center border text-neutral rounded-xl shrink-0 <%= current_status == 'all' ? 'border-neutral-300' : 'border-neutral-700' %>">
+      <%= svg_icon(status_icons[current_status], class: 'w-5 h-5 shrink-0') %>
+      <span><%= t(current_status) %></span>
+      <%= svg_icon('chevron_down', class: 'w-4 h-4 shrink-0') %>
+    </a>
+  <% end %>
+  <% if icon = { 'declined' => 'x_circle', 'expired' => 'clock_cancel', 'partially_completed' => 'clock_edit', 'sent' => 'send', 'opened' => 'mail_opened' }[params[:status]] %>
+    <div class="order-<%= chip_order['status'] %> md:order-none <%= 'hidden md:flex' if local_assigns[:with_status] %> flex h-10 px-2 py-1 text-base md:text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl shrink-0 max-w-[60vw] md:w-36 border-neutral-700">
+      <%= link_to submissions_filter_path('status', query_params.merge(path: url_for, with_remove: true)), data: { turbo_frame: 'modal' }, class: 'flex items-center space-x-1 flex-1 min-w-0 pr-1' do %>
+        <%= svg_icon(icon, class: 'w-5 h-5 shrink-0') %>
+        <span class="font-normal truncate"><%= t(params[:status]) %></span>
+      <% end %>
+      <%= link_to url_for(params: request.query_parameters.except('status')), class: 'rounded-lg ml-1 shrink-0 hover:bg-base-content hover:text-white' do %>
+        <%= svg_icon('x', class: 'w-5 h-5') %>
+      <% end %>
+    </div>
+  <% end %>
+  <% if params[:folder].present? %>
+    <div class="order-<%= chip_order['folder'] %> md:order-none md:tooltip tooltip-no-touch tooltip-bottom flex md:flex h-10 px-2 py-1 text-base md:text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl shrink-0 max-w-[60vw] md:w-36 border-neutral-700" data-tip="<%= t('folder') %>">
+      <%= link_to submissions_filter_path('folder', query_params.merge(path: url_for, with_remove: true)), data: { turbo_frame: 'modal' }, class: 'flex items-center space-x-1 flex-1 min-w-0 pr-1' do %>
+        <%= svg_icon('folder', class: 'w-5 h-5 shrink-0') %>
+        <span class="font-normal truncate"><%= params[:folder] %></span>
+      <% end %>
+      <%= link_to url_for(params: request.query_parameters.except('folder')), class: 'rounded-lg ml-1 shrink-0 hover:bg-base-content hover:text-white' do %>
+        <%= svg_icon('x', class: 'w-5 h-5') %>
+      <% end %>
+    </div>
+  <% end %>
+  <% if params[:author].present? %>
+    <div class="order-<%= chip_order['author'] %> md:order-none md:tooltip tooltip-no-touch tooltip-bottom flex md:flex h-10 px-2 py-1 text-base md:text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl shrink-0 max-w-[60vw] md:w-36 border-neutral-700" data-tip="<%= t('author') %>">
+      <%= link_to submissions_filter_path('author', query_params.merge(path: url_for, with_remove: true)), data: { turbo_frame: 'modal' }, class: 'flex items-center space-x-1 flex-1 min-w-0 pr-1' do %>
+        <%= svg_icon('user', class: 'w-5 h-5 shrink-0') %>
+        <span class="font-normal truncate"><%= current_account.users.accessible_by(current_ability).where(account: current_account).find_by(email: params[:author])&.full_name || 'NA' %></span>
+      <% end %>
+      <%= link_to url_for(params: request.query_parameters.except('author')), class: 'rounded-lg ml-1 shrink-0 hover:bg-base-content hover:text-white' do %>
+        <%= svg_icon('x', class: 'w-5 h-5') %>
+      <% end %>
+    </div>
+  <% end %>
+  <% if query_params[:completed_at_from].present? || query_params[:completed_at_to].present? %>
+    <div class="order-<%= chip_order['completed_at'] %> md:order-none md:tooltip tooltip-no-touch tooltip-bottom flex md:flex h-10 px-2 py-1 text-base md:text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl shrink-0 max-w-[60vw] md:w-36 border-neutral-700" data-tip="<%= t('completed_at') %>">
+      <%= link_to submissions_filter_path('completed_at', query_params.merge(path: url_for, with_remove: true)), data: { turbo_frame: 'modal' }, class: 'flex items-center space-x-1 flex-1 min-w-0 pr-1' do %>
+        <%= svg_icon('calendar_check', class: 'w-5 h-5 shrink-0') %>
+        <span class="flex flex-col font-normal text-left md:text-center text-xs">
+          <% if query_params[:completed_at_from] == query_params[:completed_at_to] %>
+            <span><%= l(Date.parse(query_params[:completed_at_from]), locale: current_account.locale) %></span>
+          <% else %>
+            <span><%= query_params[:completed_at_from].present? ? l(Date.parse(query_params[:completed_at_from]), locale: current_account.locale) : '∞' %></span>
+            <span><%= query_params[:completed_at_to].present? ? l(Date.parse(query_params[:completed_at_to]), locale: current_account.locale) : t('today') %></span>
+          <% end %>
+        </span>
+      <% end %>
+      <%= link_to url_for(params: request.query_parameters.except('completed_at_from', 'completed_at_to')), class: 'rounded-lg ml-1 shrink-0 hover:bg-base-content hover:text-white' do %>
+        <%= svg_icon('x', class: 'w-5 h-5') %>
+      <% end %>
+    </div>
+  <% end %>
+  <% if query_params[:created_at_from].present? || query_params[:created_at_to].present? %>
+    <div class="order-<%= chip_order['created_at'] %> md:order-none md:tooltip tooltip-no-touch tooltip-bottom flex md:flex h-10 px-2 py-1 text-base md:text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl shrink-0 max-w-[60vw] md:w-36 border-neutral-700" data-tip="<%= t('created_at') %>">
+      <%= link_to submissions_filter_path('created_at', query_params.merge(path: url_for, with_remove: true)), data: { turbo_frame: 'modal' }, class: 'flex items-center space-x-1 flex-1 min-w-0 pr-1' do %>
+        <%= svg_icon('calendar', class: 'w-5 h-5 shrink-0') %>
+        <span class="flex flex-col font-normal text-left md:text-center text-xs">
+          <% if query_params[:created_at_from] == query_params[:created_at_to] %>
+            <span><%= l(Date.parse(query_params[:created_at_from]), locale: current_account.locale) %></span>
+          <% else %>
+            <span><%= query_params[:created_at_from].present? ? l(Date.parse(query_params[:created_at_from]), locale: current_account.locale) : '∞' %></span>
+            <span><%= query_params[:created_at_to].present? ? l(Date.parse(query_params[:created_at_to]), locale: current_account.locale) : t('today') %></span>
+          <% end %>
+        </span>
+      <% end %>
+      <%= link_to url_for(params: request.query_parameters.except('created_at_to', 'created_at_from')), class: 'rounded-lg ml-1 shrink-0 hover:bg-base-content hover:text-white' do %>
+        <%= svg_icon('x', class: 'w-5 h-5') %>
+      <% end %>
+    </div>
+  <% end %>
+</scroll-fade>
diff --git a/app/views/submissions_filters/_filter_button.html.erb b/app/views/submissions_filters/_filter_button.html.erb
index 2e65f0ed..ec20c1ee 100644
--- a/app/views/submissions_filters/_filter_button.html.erb
+++ b/app/views/submissions_filters/_filter_button.html.erb
@@ -1,8 +1,9 @@
 <% query_params = params.permit(:q).merge(filter_params) %>
-<div class="dropdown dropdown-end">
-  <label tabindex="0" class="cursor-pointer flex h-10 px-3 py-1 space-x-1 text-lg items-center justify-between border text-center text-neutral rounded-xl border-neutral-300 hover:border-neutral-700">
+<% advanced_filters = filter_params.then { |f| f[:status].in?(%w[pending completed]) ? f.except(:status) : f } %>
+<div class="dropdown dropdown-end shrink-0">
+  <label tabindex="0" class="cursor-pointer flex h-10 py-1 w-10 md:w-auto px-0 md:px-3 space-x-0 md:space-x-1 justify-center md:justify-between text-lg items-center border text-center text-neutral rounded-xl <%= advanced_filters.present? ? 'border-neutral-700 md:border-neutral-300' : 'border-neutral-300' %> hover:border-neutral-700">
     <%= svg_icon('filter', class: 'w-5 h-5 flex-shrink-0 stroke-2') %>
-    <span class="<%= filter_params.then { |f| f[:status].in?(%w[pending completed]) ? f.except(:status) : f }.present? ? 'md:hidden' : '' %>">Filter</span>
+    <span class="hidden <%= 'md:inline' if advanced_filters.blank? %>">Filter</span>
   </label>
   <ul tabindex="0" class="z-10 dropdown-content p-2 mt-2 shadow menu text-base bg-base-100 rounded-box min-w-[180px] text-right">
     <li class="flex">
@@ -17,7 +18,7 @@
         <span><%= t('created_at') %></span>
       <% end %>
     </li>
-    <li class="flex">
+    <li class="hidden md:flex">
       <%= link_to submissions_filter_path('status', query_params.merge(path: url_for)), data: { turbo_frame: 'modal' } do %>
         <%= svg_icon('info_circle', class: 'w-5 h-5 flex-shrink-0 stroke-2') %>
         <span><%= t('status') %></span>
diff --git a/app/views/template_folders/show.html.erb b/app/views/template_folders/show.html.erb
index ec03c144..9120dc92 100644
--- a/app/views/template_folders/show.html.erb
+++ b/app/views/template_folders/show.html.erb
@@ -1,5 +1,5 @@
 <div>
-  <%= link_to @template_folder.parent_folder ? folder_path(@template_folder.parent_folder) : root_path, class: 'flex items-center mb-1 md:mb-0' do %>
+  <%= link_to @template_folder.parent_folder ? folder_path(@template_folder.parent_folder) : root_path, class: 'flex items-center' do %>
     <%= svg_icon('chevron_left', class: 'w-5 h-5') %>
     <span style="margin-left: 3px"><%= @template_folder.parent_folder&.name || t('home') %></span>
   <% end %>
diff --git a/app/views/templates/show.html.erb b/app/views/templates/show.html.erb
index b0e062cb..541c37ba 100644
--- a/app/views/templates/show.html.erb
+++ b/app/views/templates/show.html.erb
@@ -29,7 +29,7 @@
 <% end %>
 <% if is_show_tabs %>
   <div class="flex items-center flex-col md:flex-row md:flex-wrap gap-2 mb-4">
-    <div class="flex items-center md:items-end flex-col md:flex-row gap-2 w-full md:w-fit">
+    <div class="hidden md:flex md:items-end gap-2 md:w-fit">
       <a href="<%= url_for(params: request.query_parameters.except('status')) %>" class="<%= params[:status].blank? ? 'border-neutral-700' : 'border-neutral-300' %> flex h-10 px-2 py-1 text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl w-full md:w-48 hover:border-neutral-700">
         <div class="flex items-center space-x-1">
           <%= svg_icon('list', class: 'w-5 h-5') %>
@@ -64,8 +64,8 @@
         <% end %>
       </a>
     </div>
-    <div class="flex items-end flex-col md:flex-row gap-2 w-full md:w-fit">
-      <%= render 'submissions_filters/applied_filters', filter_params: %>
+    <div class="flex items-center md:items-end gap-2 w-full md:w-fit">
+      <%= render 'submissions_filters/applied_filters', filter_params:, with_status: true %>
       <%= render 'submissions_filters/filter_button', filter_params: %>
       <% unless @template.archived_at? %>
         <%= render 'submissions_filters/actions', filter_params: filter_params.merge(template_id: @template.id) %>
diff --git a/app/views/templates_archived_submissions/index.html.erb b/app/views/templates_archived_submissions/index.html.erb
index 6214082f..66097795 100644
--- a/app/views/templates_archived_submissions/index.html.erb
+++ b/app/views/templates_archived_submissions/index.html.erb
@@ -18,12 +18,12 @@
       <% end %>
     </div>
   </div>
-  <div class="flex flex-wrap justify-end items-center gap-2">
+  <div class="flex flex-nowrap md:flex-wrap justify-end items-center gap-2">
     <%= render 'submissions_filters/applied_filters', filter_params: %>
     <div class="shrink-0 md:order-first">
       <%= link_to new_template_submissions_export_path(@template, archived: true), class: 'btn btn-ghost text-base h-10 min-h-10', data: { turbo_frame: 'modal' } do %>
         <%= svg_icon('download', class: 'w-6 h-6 stroke-2') %>
-        <span><%= t('export') %></span>
+        <span class="hidden md:inline"><%= t('export') %></span>
       <% end %>
     </div>
     <%= render 'submissions_filters/filter_button', filter_params: %>

From 66862e93c847912703e46944a2146b955b6e3fd8 Mon Sep 17 00:00:00 2001
From: Alex Turchyn <alex@docuseal.com>
Date: Fri, 24 Jul 2026 18:28:42 +0300
Subject: [PATCH 16/42] unify breakpoint classes

---
 app/views/shared/_navbar.html.erb       | 2 +-
 app/views/shared/_search_input.html.erb | 2 +-
 app/views/shared/_settings_nav.html.erb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb
index cd5f4951..f772d94a 100644
--- a/app/views/shared/_navbar.html.erb
+++ b/app/views/shared/_navbar.html.erb
@@ -34,7 +34,7 @@
               <span class="mr-1"><%= t('settings') %></span>
             <% end %>
           </li>
-          <li class="max-md:hidden">
+          <li class="hidden md:flex">
             <%= link_to settings_profile_index_path, class: 'flex items-center' do %>
               <%= svg_icon('adjustments', class: 'w-5 h-5 flex-shrink-0 stroke-2') %>
               <span class="mr-1"><%= t('profile') %></span>
diff --git a/app/views/shared/_search_input.html.erb b/app/views/shared/_search_input.html.erb
index 73f82406..839cad9e 100644
--- a/app/views/shared/_search_input.html.erb
+++ b/app/views/shared/_search_input.html.erb
@@ -15,7 +15,7 @@
     </div>
   <% end %>
   <search-input class="group flex items-center max-md:focus-within:flex-1 <%= 'max-md:flex-1' if params[:q].present? %>">
-    <input id="search" name="q" value="<%= params[:q] %>" enterkeyhint="search" class="input text-lg pr-10 -mr-12 w-0 md:w-60 max-md:group-focus-within:w-full <%= 'pl-8 input-outlined max-md:w-full' if params[:q].present? %>" placeholder="<%= local_assigns[:placeholder] %>">
+    <input id="search" name="q" value="<%= params[:q] %>" enterkeyhint="search" class="input text-lg pr-10 -mr-12 w-0 md:w-60 max-md:group-focus-within:w-full <%= 'pl-8 input-outlined w-full' if params[:q].present? %>" placeholder="<%= local_assigns[:placeholder] %>">
     <button type="submit" title="<%= t('search') %>" class="btn btn-ghost btn-circle">
       <span class="enabled">
         <%= svg_icon('search', class: 'w-6 h-6 stroke-2') %>
diff --git a/app/views/shared/_settings_nav.html.erb b/app/views/shared/_settings_nav.html.erb
index 12deef0f..1a8f1fee 100644
--- a/app/views/shared/_settings_nav.html.erb
+++ b/app/views/shared/_settings_nav.html.erb
@@ -7,7 +7,7 @@
     </a>
   </div>
 <% end %>
-<div class="<%= expanded ? 'block max-md:-mx-3' : 'hidden md:block w-full md:w-52 flex-none' %>">
+<div class="<%= expanded ? 'block -mx-3 md:mx-0' : 'hidden md:block w-full md:w-52 flex-none' %>">
   <menu-active>
     <ul id="account_settings_menu" class="menu px-0">
       <% unless expanded %>

From 807e82b21e1105618585afb233d989fb8d07bd6e Mon Sep 17 00:00:00 2001
From: Alex Turchyn <alex@docuseal.com>
Date: Fri, 24 Jul 2026 21:58:55 +0300
Subject: [PATCH 17/42] open modals as pages on mobile devices

---
 app/javascript/application.js                  |  2 ++
 app/javascript/elements/convert_modal_links.js | 15 +++++++++++++++
 app/javascript/elements/turbo_modal.js         | 16 +++++++++++++---
 app/views/layouts/application.html.erb         |  1 +
 4 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 app/javascript/elements/convert_modal_links.js

diff --git a/app/javascript/application.js b/app/javascript/application.js
index 647378b0..0bcc7418 100644
--- a/app/javascript/application.js
+++ b/app/javascript/application.js
@@ -57,6 +57,7 @@ import BarChart from './elements/bar_chart'
 import FieldCondition from './elements/field_condition'
 import ConfirmUpload from './elements/confirm_upload'
 import ScrollFade from './elements/scroll_fade'
+import ConvertModalLinks from './elements/convert_modal_links'
 
 import * as TurboInstantClick from './lib/turbo_instant_click'
 
@@ -152,6 +153,7 @@ safeRegisterElement('bar-chart', BarChart)
 safeRegisterElement('field-condition', FieldCondition)
 safeRegisterElement('confirm-upload', ConfirmUpload)
 safeRegisterElement('scroll-fade', ScrollFade)
+safeRegisterElement('convert-modal-links', ConvertModalLinks)
 
 safeRegisterElement('template-builder', class extends HTMLElement {
   connectedCallback () {
diff --git a/app/javascript/elements/convert_modal_links.js b/app/javascript/elements/convert_modal_links.js
new file mode 100644
index 00000000..b31e3108
--- /dev/null
+++ b/app/javascript/elements/convert_modal_links.js
@@ -0,0 +1,15 @@
+export default class extends HTMLElement {
+  connectedCallback () {
+    if (!this.isMobile()) return
+
+    document.querySelectorAll('a[data-turbo-frame="modal"]').forEach((link) => {
+      link.dataset.turboFrame = '_top'
+    })
+  }
+
+  isMobile () {
+    const isTouchWebkit = 'ontouchstart' in window && navigator.maxTouchPoints > 0 && /AppleWebKit|android/i.test(navigator.userAgent)
+
+    return isTouchWebkit || /iPhone|iPad|iPod/i.test(navigator.userAgent)
+  }
+}
diff --git a/app/javascript/elements/turbo_modal.js b/app/javascript/elements/turbo_modal.js
index 69c20549..7642386c 100644
--- a/app/javascript/elements/turbo_modal.js
+++ b/app/javascript/elements/turbo_modal.js
@@ -6,7 +6,7 @@ export default actionable(class extends HTMLElement {
 
     document.addEventListener('keyup', this.onEscKey)
 
-    document.addEventListener('turbo:before-cache', this.close)
+    document.addEventListener('turbo:before-cache', this.onBeforeCache)
 
     if (this.dataset.closeAfterSubmit !== 'false') {
       document.addEventListener('turbo:submit-end', this.onSubmit)
@@ -18,7 +18,7 @@ export default actionable(class extends HTMLElement {
 
     document.removeEventListener('keyup', this.onEscKey)
     document.removeEventListener('turbo:submit-end', this.onSubmit)
-    document.removeEventListener('turbo:before-cache', this.close)
+    document.removeEventListener('turbo:before-cache', this.onBeforeCache)
   }
 
   onSubmit = (e) => {
@@ -33,9 +33,19 @@ export default actionable(class extends HTMLElement {
     }
   }
 
+  onBeforeCache = () => {
+    if (this.closest('turbo-frame')?.src) {
+      this.remove()
+    }
+  }
+
   close = (e) => {
     e?.preventDefault()
 
-    this.remove()
+    if (!this.closest('turbo-frame')?.src && window.history.length > 1) {
+      window.history.back()
+    } else {
+      this.remove()
+    }
   }
 })
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 09cfb218..cb372271 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -27,6 +27,7 @@
       <% end %>
     <% end %>
     <turbo-frame id="modal"></turbo-frame>
+    <convert-modal-links></convert-modal-links>
     <turbo-frame id="drawer"></turbo-frame>
     <%= render 'shared/navbar' %>
     <% if flash.present? %><%= render 'shared/flash' %><% end %>

From 74dbd4bed373c07b0292d02094fefb1e58325a7a Mon Sep 17 00:00:00 2001
From: Alex Turchyn <alex@docuseal.com>
Date: Sat, 25 Jul 2026 00:49:19 +0300
Subject: [PATCH 18/42] fix trusted signature text

---
 app/views/esign_settings/_default_signature_row.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/esign_settings/_default_signature_row.html.erb b/app/views/esign_settings/_default_signature_row.html.erb
index 1cb2148c..8a2e3148 100644
--- a/app/views/esign_settings/_default_signature_row.html.erb
+++ b/app/views/esign_settings/_default_signature_row.html.erb
@@ -1,9 +1,9 @@
 <tr class="group">
   <td class="flex items-center space-x-1">
     <%= svg_icon('discount_check_filled', class: 'w-6 h-6 shrink-0 text-green-500') %>
-    <span class="flex items-center whitespace-nowrap">
-      <%= t('docuseal_trusted_signature') %>
-      <div class="tooltip ml-1 shrink-0" data-tip="<%= t('sign_documents_with_trusted_certificate_provided_by_docu_seal_your_documents_and_data_are_never_shared_with_docu_seal_p_d_f_checksum_is_provided_to_generate_a_trusted_signature') %>">
+    <span class="flex items-center">
+      <span class="whitespace-nowrap"><%= t('docuseal_trusted_signature') %></span>
+      <div class="tooltip tooltip-top ml-1 shrink-0" data-tip="<%= t('sign_documents_with_trusted_certificate_provided_by_docu_seal_your_documents_and_data_are_never_shared_with_docu_seal_p_d_f_checksum_is_provided_to_generate_a_trusted_signature') %>">
         <%= svg_icon('circle_question', class: 'w-4 h-4 stroke-1 shrink-0') %>
       </div>
     </span>

From d56070827b25e821b610a2eed87317bd3907dc5b Mon Sep 17 00:00:00 2001
From: Alex Turchyn <alex@docuseal.com>
Date: Sat, 25 Jul 2026 01:09:25 +0300
Subject: [PATCH 19/42] fix broken svg

---
 app/views/icons/_device_desktop.html.erb | 3 +--
 app/views/mfa_setup/_form.html.erb       | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/views/icons/_device_desktop.html.erb b/app/views/icons/_device_desktop.html.erb
index 3a6ba14f..7f69a1c7 100644
--- a/app/views/icons/_device_desktop.html.erb
+++ b/app/views/icons/_device_desktop.html.erb
@@ -1,8 +1,7 @@
 <svg class="<%= local_assigns[:class] %>" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
   <path stroke="none" d="M0 0h24v24H0z" fill="none" />
   <path d="M3 5a1 1 0 0 1 1 -1h16a1 1 0 0 1 1 1v10a1 1 0 0 1 -1 1h-16a1 1 0 0 1 -1 -1v-10z" />
-  <path d="M7 20h10" /><path d="M9 16v4" />
-  <path d="M15 16v4" /></svg>
+  <path d="M7 20h10" />
   <path d="M9 16v4" />
   <path d="M15 16v4" />
 </svg>
diff --git a/app/views/mfa_setup/_form.html.erb b/app/views/mfa_setup/_form.html.erb
index 96602342..c931b48e 100644
--- a/app/views/mfa_setup/_form.html.erb
+++ b/app/views/mfa_setup/_form.html.erb
@@ -3,7 +3,7 @@
     <%= t('use_an_authenticator_mobile_app_like_google_authenticator_or_1password_to_scan_the_qr_code_below') %>
   </p>
   <div>
-    <%== RQRCode::QRCode.new(@provision_url).as_svg(viewbox: true, svg_attributes: { class: 'md:w-80 md:h-80 my-4 mx-auto' }) %>
+    <%== RQRCode::QRCode.new(@provision_url).as_svg(viewbox: true, svg_attributes: { class: 'md:w-80 md:h-80 my-4 mx-auto' }).sub(/\A<\?xml[^>]*\?>/, '') %>
   </div>
   <div class="form-control my-6 space-y-2">
     <%= f.text_field :otp_attempt, required: true, placeholder: 'XXX-XXX', class: 'base-input text-center' %>

From 59fe8a7917d296f7a8c9aa547eff2938b9eda2f2 Mon Sep 17 00:00:00 2001
From: Alex Turchyn <alex@docuseal.com>
Date: Tue, 28 Jul 2026 23:58:27 +0300
Subject: [PATCH 20/42] break long names in template and folder titles

---
 app/views/submissions/show.html.erb         | 2 +-
 app/views/template_folders/_folder.html.erb | 2 +-
 app/views/templates/_template.html.erb      | 2 +-
 app/views/templates/_title.html.erb         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/submissions/show.html.erb b/app/views/submissions/show.html.erb
index 89342cee..95edc4e7 100644
--- a/app/views/submissions/show.html.erb
+++ b/app/views/submissions/show.html.erb
@@ -13,7 +13,7 @@
   <div class="flex justify-between py-1.5 items-center pr-4 sticky top-0 md:relative z-10 bg-base-100">
     <a href="<%= signed_in? && @submission.account_id == current_account&.id && @submission.template ? template_path(@submission.template) : '/' %>" class="flex items-center space-x-3 py-1">
       <span><%= render 'submissions/logo' %></span>
-      <h1 class="text-xl md:text-3xl font-semibold focus:text-clip" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;"><% (@submission.name || @submission.template&.name).to_s.split(/(_)/).each do |item| %><%= item %><wbr><% end %></h1>
+      <h1 class="text-xl md:text-3xl font-semibold break-all focus:text-clip" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;"><% (@submission.name || @submission.template&.name).to_s.split(/(_)/).each do |item| %><%= item %><wbr><% end %></h1>
     </a>
     <div class="space-x-3 flex items-center">
       <% if signed_in? && can?(:destroy, @submission) && @submission.archived_at? && !@submission.completed_at? %>
diff --git a/app/views/template_folders/_folder.html.erb b/app/views/template_folders/_folder.html.erb
index b7571a1f..23be1f3b 100644
--- a/app/views/template_folders/_folder.html.erb
+++ b/app/views/template_folders/_folder.html.erb
@@ -4,7 +4,7 @@
   <% if !is_long %>
     <%= svg_icon(icon, class: 'w-6 h-6') %>
   <% end %>
-  <div class="text-lg font-semibold mt-1" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: <%= is_long ? 2 : 1 %>;">
+  <div class="text-lg font-semibold mt-1 break-all" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: <%= is_long ? 2 : 1 %>;">
     <% if is_long %>
       <%= svg_icon(icon, class: 'w-6 h-6 inline') %>
     <% end %>
diff --git a/app/views/templates/_template.html.erb b/app/views/templates/_template.html.erb
index 79985645..32239c31 100644
--- a/app/views/templates/_template.html.erb
+++ b/app/views/templates/_template.html.erb
@@ -1,6 +1,6 @@
 <div class="h-36 relative group">
   <a href="<%= template_path(template) %>" class="flex h-full flex-col justify-between rounded-2xl pt-6 px-7 w-full bg-base-200 before:border-2 before:border-base-300 before:border-dashed before:absolute before:left-0 before:right-0 before:top-0 before:bottom-0 before:hidden before:rounded-2xl" data-targets="dashboard-dropzone.templateCards">
-    <div class="text-xl font-semibold" style="line-height: 1.6rem; overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;">
+    <div class="text-xl font-semibold break-all" style="line-height: 1.6rem; overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;">
       <% if template.template_accesses.present? %>
         <%= svg_icon('lock', class: 'w-6 h-6 inline -translate-y-[4px]') %>
       <% end %>
diff --git a/app/views/templates/_title.html.erb b/app/views/templates/_title.html.erb
index 905fb871..0ec43e7e 100644
--- a/app/views/templates/_title.html.erb
+++ b/app/views/templates/_title.html.erb
@@ -2,7 +2,7 @@
   <div class="relative flex items-start justify-between w-full space-x-0">
     <div>
       <div id="template_title" class="flex">
-        <h1 class="text-3xl md:text-[2em] font-semibold" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;">
+        <h1 class="text-3xl md:text-[2em] font-semibold break-all" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;">
           <% template.name.split(/(_)/).each do |item| %><%= item %><wbr><% end %>
           <% if template.archived_at? %>
             <span class="ml-1 badge badge-outline badge-lg align-middle"><%= t('archived') %></span>

From b8ab7190d2a1d077e2af67ce9146b0d023b5ed32 Mon Sep 17 00:00:00 2001
From: Alex Turchyn <alex@docuseal.com>
Date: Wed, 29 Jul 2026 00:30:04 +0300
Subject: [PATCH 21/42] use dvh for modal and drawer

---
 app/views/shared/_turbo_drawer.html.erb      | 5 +++--
 app/views/shared/_turbo_modal_large.html.erb | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/shared/_turbo_drawer.html.erb b/app/views/shared/_turbo_drawer.html.erb
index 12dd4ba7..6ee20c17 100644
--- a/app/views/shared/_turbo_drawer.html.erb
+++ b/app/views/shared/_turbo_drawer.html.erb
@@ -1,7 +1,8 @@
+<% offset = local_assigns[:title] ? '45px' : '0px' %>
 <turbo-frame id="drawer">
   <turbo-modal class="modal modal-open items-start !animate-none justify-end overflow-y-auto !justify-normal md:!justify-end" data-close-after-submit="<%= local_assigns.key?(:close_after_submit) ? local_assigns[:close_after_submit] : true %>">
     <div class="absolute top-0 bottom-0 right-0 left-0" data-action="click:turbo-modal#close"></div>
-    <div class="bg-base-100 min-h-screen max-h-screen relative w-full relative">
+    <div class="bg-base-100 min-h-screen max-h-screen relative w-full min-w-0">
       <% if local_assigns[:title] %>
         <div class="flex justify-between bg-base-100 py-2 px-4 items-center border-b pb-2 font-medium">
           <span>
@@ -14,7 +15,7 @@
           &times;
         </span>
       <% end %>
-      <div class="w-screen md:w-[620px] overflow-y-auto" style="max-height: calc(100vh - <%= local_assigns[:title] ? '45px' : '0px' %>)">
+      <div class="md:w-[620px] overflow-y-auto" style="max-height: calc(100vh - <%= offset %>); max-height: calc(100dvh - <%= offset %>)">
         <%= yield %>
       </div>
     </div>
diff --git a/app/views/shared/_turbo_modal_large.html.erb b/app/views/shared/_turbo_modal_large.html.erb
index 7a1c841d..d929519c 100644
--- a/app/views/shared/_turbo_modal_large.html.erb
+++ b/app/views/shared/_turbo_modal_large.html.erb
@@ -10,7 +10,7 @@
           <a href="#" class="text-xl" data-action="click:turbo-modal#close">&times;</a>
         </div>
       <% end %>
-      <div class="w-full md:w-[590px] overflow-y-auto" style="max-height: calc(100vh - 14px - 45px)">
+      <div class="w-full md:w-[590px] overflow-y-auto" style="max-height: calc(100vh - 14px - 45px); max-height: calc(100dvh - 14px - 45px)">
         <%= yield %>
       </div>
     </div>

From 34d0e00910d5fae9e25dca959ab740df6f2cfe91 Mon Sep 17 00:00:00 2001
From: Alex Turchyn <alex@docuseal.com>
Date: Wed, 29 Jul 2026 01:05:53 +0300
Subject: [PATCH 22/42] use numeric keyboard for otp code inputs

---
 app/javascript/submission_form/phone_step.vue    | 2 +-
 app/views/devise/sessions/_otp_form.html.erb     | 2 +-
 app/views/mfa_setup/_form.html.erb               | 2 +-
 app/views/mfa_setup/edit.html.erb                | 2 +-
 app/views/start_form/email_verification.html.erb | 2 +-
 app/views/submit_form/email_2fa.html.erb         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/javascript/submission_form/phone_step.vue b/app/javascript/submission_form/phone_step.vue
index 8a2dfe13..d3e95bed 100644
--- a/app/javascript/submission_form/phone_step.vue
+++ b/app/javascript/submission_form/phone_step.vue
@@ -39,7 +39,7 @@
           required
           maxlength="6"
           autofocus
-          inputmode="decimal"
+          inputmode="numeric"
           @input="onInputCode"
         >
         <div class="flex justify-between mt-2 -mb-2 md:-mb-4">
diff --git a/app/views/devise/sessions/_otp_form.html.erb b/app/views/devise/sessions/_otp_form.html.erb
index bf1959bf..aee78e63 100644
--- a/app/views/devise/sessions/_otp_form.html.erb
+++ b/app/views/devise/sessions/_otp_form.html.erb
@@ -1,4 +1,4 @@
 <div class="form-control">
   <%= label_tag 'user[otp_attempt]', t('two_factor_code_from_authenticator_app'), class: 'label' %>
-  <%= text_field_tag 'user[otp_attempt]', nil, autofocus: true, autocomplete: 'off', placeholder: 'XXX-XXX', required: true, class: 'base-input' %>
+  <%= text_field_tag 'user[otp_attempt]', nil, autofocus: true, autocomplete: 'off', inputmode: 'numeric', placeholder: 'XXXXXX', required: true, class: 'base-input' %>
 </div>
diff --git a/app/views/mfa_setup/_form.html.erb b/app/views/mfa_setup/_form.html.erb
index c931b48e..52b463a3 100644
--- a/app/views/mfa_setup/_form.html.erb
+++ b/app/views/mfa_setup/_form.html.erb
@@ -6,7 +6,7 @@
     <%== RQRCode::QRCode.new(@provision_url).as_svg(viewbox: true, svg_attributes: { class: 'md:w-80 md:h-80 my-4 mx-auto' }).sub(/\A<\?xml[^>]*\?>/, '') %>
   </div>
   <div class="form-control my-6 space-y-2">
-    <%= f.text_field :otp_attempt, required: true, placeholder: 'XXX-XXX', class: 'base-input text-center' %>
+    <%= f.text_field :otp_attempt, required: true, inputmode: 'numeric', placeholder: 'XXXXXX', class: 'base-input text-center' %>
     <span>
       <%= @error_message %>
     </span>
diff --git a/app/views/mfa_setup/edit.html.erb b/app/views/mfa_setup/edit.html.erb
index d551185d..ec7b410c 100644
--- a/app/views/mfa_setup/edit.html.erb
+++ b/app/views/mfa_setup/edit.html.erb
@@ -1,7 +1,7 @@
 <%= render 'shared/turbo_modal', title: t('remove_2fa') do %>
   <%= form_for '', url: mfa_setup_path, method: :delete, data: { turbo_frame: :_top } do |f| %>
     <div class="form-control my-6 space-y-2">
-      <%= f.text_field :otp_attempt, required: true, placeholder: 'XXX-XXX', class: 'base-input text-center' %>
+      <%= f.text_field :otp_attempt, required: true, inputmode: 'numeric', placeholder: 'XXXXXX', class: 'base-input text-center' %>
       <span>
         <%= @error_message %>
       </span>
diff --git a/app/views/start_form/email_verification.html.erb b/app/views/start_form/email_verification.html.erb
index 248278c5..68e54986 100644
--- a/app/views/start_form/email_verification.html.erb
+++ b/app/views/start_form/email_verification.html.erb
@@ -29,7 +29,7 @@
         <%= f.hidden_field 'submitter[name]', value: params[:name] || @submitter&.name %>
         <%= f.hidden_field 'submitter[email]', value: params[:email] || @submitter&.email %>
         <%= f.hidden_field 'submitter[phone]', value: params[:phone] || @submitter&.phone %>
-        <%= f.text_field :one_time_code, required: true, class: 'base-input text-center', placeholder: 'XXX-XXX' %>
+        <%= f.text_field :one_time_code, required: true, inputmode: 'numeric', class: 'base-input text-center', placeholder: 'XXXXXX' %>
         <div class="flex justify-between items-center mt-1">
           <span>
             <% if flash[:alert] %>
diff --git a/app/views/submit_form/email_2fa.html.erb b/app/views/submit_form/email_2fa.html.erb
index 216c82b8..0d16d2b0 100644
--- a/app/views/submit_form/email_2fa.html.erb
+++ b/app/views/submit_form/email_2fa.html.erb
@@ -33,7 +33,7 @@
         <%= form_for '', url: submit_form_email_2fa_path, method: :post, html: { class: 'space-y-4', id: 'code_form' } do |f| %>
           <div dir="auto" class="form-control !mt-0">
             <%= f.hidden_field :submitter_slug, value: @submitter.slug %>
-            <%= f.text_field :one_time_code, required: true, class: 'base-input text-center', placeholder: 'XXX-XXX' %>
+            <%= f.text_field :one_time_code, required: true, inputmode: 'numeric', class: 'base-input text-center', placeholder: 'XXXXXX' %>
             <div class="flex justify-between items-center mt-1">
               <span>
                 <% if flash[:alert] %>

From 3eebf6d2cfe8eb5dc1e2133cc16d10def85e610e Mon Sep 17 00:00:00 2001
From: Alex Turchyn <alex@docuseal.com>
Date: Wed, 29 Jul 2026 16:37:25 +0300
Subject: [PATCH 23/42] unify tooltip and breakpoint classes

---
 app/views/accounts/show.html.erb          | 24 +++++++++++------------
 app/views/dashboard/_toggle_view.html.erb |  4 ++--
 app/views/mcp_settings/index.html.erb     |  2 +-
 app/views/shared/_navbar.html.erb         |  2 +-
 app/views/templates/_submission.html.erb  |  8 ++++----
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/views/accounts/show.html.erb b/app/views/accounts/show.html.erb
index 7a79c0cf..67019274 100644
--- a/app/views/accounts/show.html.erb
+++ b/app/views/accounts/show.html.erb
@@ -54,7 +54,7 @@
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('force_2fa_with_authenticator_app') %></span>
                 <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('require_two_factor_authentication_2fa_with_an_authenticator_app_e_g_google_authenticator_authy_all_users_signing_documents_must_pass_the_second_factor_verification_using_a_secure_code_in_addition_to_their_password') %>">
-                  <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
+                  <%= svg_icon('info_circle', class: 'w-4 h-4 shrink-0') %>
                 </span>
               </div>
               <submit-form data-on="change" class="flex">
@@ -71,7 +71,7 @@
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('add_signature_id_to_the_documents') %></span>
                 <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('add_a_unique_signature_id_and_timestamp_to_each_signature_for_audit_and_traceability_purposes_along_with_the_timestamp_part_of_docuseals_21_cfr_part_11_compliance_settings') %>">
-                  <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
+                  <%= svg_icon('info_circle', class: 'w-4 h-4 shrink-0') %>
                 </span>
               </div>
               <submit-form data-on="change" class="flex">
@@ -88,7 +88,7 @@
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('require_signing_reason') %></span>
                 <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('require_signer_to_provide_a_reason_for_signing_before_completing_their_signature_e_g_approvals_certifications_part_of_docuseals_21_cfr_part_11_compliance_settings') %>">
-                  <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
+                  <%= svg_icon('info_circle', class: 'w-4 h-4 shrink-0') %>
                 </span>
               </div>
               <submit-form data-on="change" class="flex">
@@ -105,7 +105,7 @@
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('allow_typed_text_signatures') %></span>
                 <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('allow_signers_to_create_signatures_by_typing_their_name_instead_of_drawing_or_uploading_one') %>">
-                  <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
+                  <%= svg_icon('info_circle', class: 'w-4 h-4 shrink-0') %>
                 </span>
               </div>
               <submit-form data-on="change" class="flex">
@@ -122,7 +122,7 @@
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('allow_to_resubmit_completed_forms') %></span>
                 <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('allow_signers_to_resubmit_forms_after_completion_useful_when_corrections_or_multiple_submissions_are_needed') %>">
-                  <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
+                  <%= svg_icon('info_circle', class: 'w-4 h-4 shrink-0') %>
                 </span>
               </div>
               <submit-form data-on="change" class="flex">
@@ -139,7 +139,7 @@
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('allow_to_decline_documents') %></span>
                 <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('allow_recipients_to_decline_signing_a_document_the_decline_reason_notification_will_be_sent_to_the_signature_requester') %>">
-                  <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
+                  <%= svg_icon('info_circle', class: 'w-4 h-4 shrink-0') %>
                 </span>
               </div>
               <% if !Docuseal.multitenant? || can?(:manage, :disable_decline) %>
@@ -162,7 +162,7 @@
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('allow_to_delegate_documents') %></span>
                 <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('allow_recipients_to_delegate_documents') %>">
-                  <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
+                  <%= svg_icon('info_circle', class: 'w-4 h-4 shrink-0') %>
                 </span>
               </div>
               <% if !Docuseal.multitenant? || can?(:manage, :delegate_form) %>
@@ -185,7 +185,7 @@
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('remember_and_pre_fill_signatures') %></span>
                 <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('save_a_users_signature_and_automatically_pre_fill_it_in_future_signing_sessions') %>">
-                  <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
+                  <%= svg_icon('info_circle', class: 'w-4 h-4 shrink-0') %>
                 </span>
               </div>
               <submit-form data-on="change" class="flex">
@@ -202,7 +202,7 @@
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('expirable_file_download_links') %></span>
                 <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('make_document_download_links_expire_after_40_minutes_to_prevent_long_term_access_and_enhance_security') %>">
-                  <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
+                  <%= svg_icon('info_circle', class: 'w-4 h-4 shrink-0') %>
                 </span>
               </div>
               <submit-form data-on="change" class="flex">
@@ -219,7 +219,7 @@
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('require_authentication_for_file_download_links') %></span>
                 <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('require_authentication_with_user_login_or_api_key_to_access_the_document_download_links') %>">
-                  <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
+                  <%= svg_icon('info_circle', class: 'w-4 h-4 shrink-0') %>
                 </span>
               </div>
               <submit-form data-on="change" class="flex">
@@ -236,7 +236,7 @@
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('combine_completed_documents_and_audit_log') %></span>
                 <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('combine_signed_documents_and_the_audit_log_into_a_single_pdf_file_for_easier_recordkeeping_and_compliance') %>">
-                  <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
+                  <%= svg_icon('info_circle', class: 'w-4 h-4 shrink-0') %>
                 </span>
               </div>
               <submit-form data-on="change" class="flex">
@@ -254,7 +254,7 @@
                 <div class="flex items-center space-x-1">
                   <span class="text-left"><%= t('always_enforce_signing_order') %></span>
                   <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('make_the_recipients_signing_order_always_enforced_so_that_the_second_signer_can_start_signing_their_part_only_after_the_first_signer_has_completed_signing') %>">
-                    <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
+                    <%= svg_icon('info_circle', class: 'w-4 h-4 shrink-0') %>
                   </span>
                 </div>
                 <submit-form data-on="change" class="flex">
diff --git a/app/views/dashboard/_toggle_view.html.erb b/app/views/dashboard/_toggle_view.html.erb
index 54836506..29bbb8fc 100644
--- a/app/views/dashboard/_toggle_view.html.erb
+++ b/app/views/dashboard/_toggle_view.html.erb
@@ -1,10 +1,10 @@
 <form action="<%= root_path %>" method="get" id="templates_submissions_toggle" class="bg-base-200 px-1.5 rounded-xl py-1 whitespace-nowrap">
-  <toggle-cookies data-value="templates" data-key="dashboard_view" class="sm:tooltip tooltip-top tooltip-no-touch" data-tip="<%= t('templates') %>">
+  <toggle-cookies data-value="templates" data-key="dashboard_view" class="tooltip tooltip-top tooltip-no-touch" data-tip="<%= t('templates') %>">
     <button class="<%= local_assigns[:selected] == 'submissions' ? 'btn !border !rounded-lg btn-square !p-0 !btn-sm !h-8 !w-9' : 'btn btn-neutral !rounded-lg btn-square !p-0 hover:text-neutral-300 !btn-sm !h-8 !w-9 disabled:btn-neutral' %>">
       <%= svg_icon('layout_grid', class: 'w-6 h-6 stroke-2') %>
     </button>
   </toggle-cookies>
-  <toggle-cookies data-value="submissions" data-key="dashboard_view" class="sm:tooltip tooltip-top tooltip-no-touch" data-tip="<%= t('submissions') %>">
+  <toggle-cookies data-value="submissions" data-key="dashboard_view" class="tooltip tooltip-top tooltip-no-touch" data-tip="<%= t('submissions') %>">
     <button class="<%= local_assigns[:selected] == 'submissions' ? 'btn btn-neutral !rounded-lg btn-square !p-0 hover:text-neutral-300 !btn-sm !h-8 !w-9' : 'btn !border !rounded-lg btn-square !p-0 !btn-sm !h-8 !w-9 disabled:btn-neutral' %>">
       <%= svg_icon('layout_list', class: 'w-6 h-6 stroke-2') %>
     </button>
diff --git a/app/views/mcp_settings/index.html.erb b/app/views/mcp_settings/index.html.erb
index d0e5c46b..bb27bbc8 100644
--- a/app/views/mcp_settings/index.html.erb
+++ b/app/views/mcp_settings/index.html.erb
@@ -99,7 +99,7 @@
           <div class="flex items-center space-x-1">
             <span class="text-left"><%= t('enable_mcp_server') %></span>
             <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('all_existing_mcp_connections_will_be_stopped_immediately_when_this_setting_is_disabled') %>">
-              <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
+              <%= svg_icon('info_circle', class: 'w-4 h-4 shrink-0') %>
             </span>
           </div>
           <submit-form data-on="change" class="flex">
diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb
index f772d94a..fce7a2ee 100644
--- a/app/views/shared/_navbar.html.erb
+++ b/app/views/shared/_navbar.html.erb
@@ -34,7 +34,7 @@
               <span class="mr-1"><%= t('settings') %></span>
             <% end %>
           </li>
-          <li class="hidden md:flex">
+          <li class="hidden md:list-item">
             <%= link_to settings_profile_index_path, class: 'flex items-center' do %>
               <%= svg_icon('adjustments', class: 'w-5 h-5 flex-shrink-0 stroke-2') %>
               <span class="mr-1"><%= t('profile') %></span>
diff --git a/app/views/templates/_submission.html.erb b/app/views/templates/_submission.html.erb
index 8ac88786..e0a7acab 100644
--- a/app/views/templates/_submission.html.erb
+++ b/app/views/templates/_submission.html.erb
@@ -102,12 +102,12 @@
           </a>
         </div>
         <% if !submission.archived_at? && !template&.archived_at? && can?(:destroy, submission) %>
-          <span data-tip="<%= t('archive') %>" class="sm:tooltip tooltip-top tooltip-no-touch">
+          <span data-tip="<%= t('archive') %>" class="tooltip tooltip-top tooltip-no-touch">
             <%= button_to button_title(title: nil, disabled_with: nil, icon: svg_icon('archive', class: 'w-6 h-6'), icon_disabled: svg_icon('loader', class: 'w-6 h-6 animate-spin')), submission_path(submission), class: 'btn btn-outline btn-sm w-full md:w-fit', form: { class: 'flex' }, title: t('archive'), method: :delete %>
           </span>
         <% end %>
         <% if local_assigns[:archived] && can?(:destroy, submission) %>
-          <span data-tip="<%= t('remove') %>" class="sm:tooltip tooltip-top tooltip-no-touch">
+          <span data-tip="<%= t('remove') %>" class="tooltip tooltip-top tooltip-no-touch">
             <%= button_to button_title(title: nil, disabled_with: nil, icon: svg_icon('trash', class: 'w-6 h-6'), icon_disabled: svg_icon('loader', class: 'w-6 h-6 animate-spin')), submission_path(submission, permanently: true), class: 'btn btn-outline btn-sm w-full md:w-fit', form: { class: 'flex' }, title: t('remove'), method: :delete, data: { turbo_confirm: t('submission_deletion_is_irreversible_and_will_permanently_remove_all_associated_signed_documents_with_it_are_you_sure_') } %>
           </span>
         <% end %>
@@ -209,12 +209,12 @@
           </a>
         </div>
         <% if !submission.archived_at? && !template&.archived_at? %>
-          <span data-tip="<%= t('archive') %>" class="sm:tooltip tooltip-top tooltip-no-touch">
+          <span data-tip="<%= t('archive') %>" class="tooltip tooltip-top tooltip-no-touch">
             <%= button_to button_title(title: nil, disabled_with: nil, icon: svg_icon('archive', class: 'w-6 h-6'), icon_disabled: svg_icon('loader', class: 'w-6 h-6 animate-spin')), submission_path(submission), class: 'btn btn-outline btn-sm w-full md:w-fit', form: { class: 'flex' }, title: t('archive'), method: :delete %>
           </span>
         <% end %>
         <% if local_assigns[:archived] && can?(:destroy, submission) %>
-          <span data-tip="<%= t('remove') %>" class="sm:tooltip tooltip-top tooltip-no-touch">
+          <span data-tip="<%= t('remove') %>" class="tooltip tooltip-top tooltip-no-touch">
             <%= button_to button_title(title: nil, disabled_with: nil, icon: svg_icon('trash', class: 'w-6 h-6'), icon_disabled: svg_icon('loader', class: 'w-6 h-6 animate-spin')), submission_path(submission, permanently: true), class: 'btn btn-outline btn-sm w-full md:w-fit', form: { class: 'flex' }, title: t('remove'), method: :delete, data: { turbo_confirm: t('submission_deletion_is_irreversible_and_will_permanently_remove_all_associated_signed_documents_with_it_are_you_sure_') } %>
           </span>
         <% end %>

From 68e8cd118859b93658b3c7a9d0b7db698874fbdd Mon Sep 17 00:00:00 2001
From: Alex Turchyn <alex@docuseal.com>
Date: Wed, 29 Jul 2026 21:17:10 +0300
Subject: [PATCH 24/42] fix settings nav offset

---
 app/views/accounts/show.html.erb              |   2 +-
 app/views/email_smtp_settings/index.html.erb  |   2 +-
 .../notifications_settings/index.html.erb     |   2 +-
 .../personalization_settings/show.html.erb    |   2 +-
 app/views/profile/index.html.erb              |   2 +-
 app/views/shared/_settings_nav.html.erb       | 266 +++++++++---------
 app/views/sms_settings/index.html.erb         |   2 +-
 app/views/sso_settings/index.html.erb         |   2 +-
 app/views/storage_settings/index.html.erb     |   2 +-
 9 files changed, 142 insertions(+), 140 deletions(-)

diff --git a/app/views/accounts/show.html.erb b/app/views/accounts/show.html.erb
index 67019274..46787131 100644
--- a/app/views/accounts/show.html.erb
+++ b/app/views/accounts/show.html.erb
@@ -1,6 +1,6 @@
 <div class="flex flex-wrap space-y-4 md:flex-nowrap md:space-y-0">
   <%= render 'shared/settings_nav' %>
-  <div class="flex-grow md:max-w-xl md:mx-auto">
+  <div class="flex-grow max-w-xl mx-auto">
     <h1 class="text-3xl md:text-4xl font-bold mb-4">
       <%= t('account') %>
     </h1>
diff --git a/app/views/email_smtp_settings/index.html.erb b/app/views/email_smtp_settings/index.html.erb
index 80c7eb3b..cd750acf 100644
--- a/app/views/email_smtp_settings/index.html.erb
+++ b/app/views/email_smtp_settings/index.html.erb
@@ -1,6 +1,6 @@
 <div class="flex flex-wrap space-y-4 md:flex-nowrap md:space-y-0">
   <%= render 'shared/settings_nav' %>
-  <div class="flex-grow md:max-w-xl md:mx-auto min-w-0">
+  <div class="flex-grow max-w-xl mx-auto min-w-0">
     <h1 class="text-3xl md:text-4xl font-bold mb-4">Email SMTP</h1>
     <% value = @encrypted_config.value || {} %>
     <%= form_for @encrypted_config, url: settings_email_index_path, method: :post, html: { autocomplete: 'off', class: 'space-y-4' } do |f| %>
diff --git a/app/views/notifications_settings/index.html.erb b/app/views/notifications_settings/index.html.erb
index 7f408c52..8703c440 100644
--- a/app/views/notifications_settings/index.html.erb
+++ b/app/views/notifications_settings/index.html.erb
@@ -1,6 +1,6 @@
 <div class="flex flex-wrap space-y-4 md:flex-nowrap md:space-y-0">
   <%= render 'shared/settings_nav' %>
-  <div class="flex-grow md:max-w-xl md:mx-auto">
+  <div class="flex-grow max-w-xl mx-auto">
     <h1 class="text-3xl md:text-4xl font-bold mb-4">
       <%= t('email_notifications') %>
     </h1>
diff --git a/app/views/personalization_settings/show.html.erb b/app/views/personalization_settings/show.html.erb
index 3ea5d1db..20ea3c78 100644
--- a/app/views/personalization_settings/show.html.erb
+++ b/app/views/personalization_settings/show.html.erb
@@ -1,6 +1,6 @@
 <div class="flex flex-wrap space-y-4 md:flex-nowrap md:space-y-0">
   <%= render 'shared/settings_nav' %>
-  <div class="flex-grow md:max-w-xl md:mx-auto">
+  <div class="flex-grow max-w-xl mx-auto">
     <p class="text-3xl md:text-4xl font-bold mb-4">
       <%= t('email_templates') %>
     </p>
diff --git a/app/views/profile/index.html.erb b/app/views/profile/index.html.erb
index f5945d7f..6444c53f 100644
--- a/app/views/profile/index.html.erb
+++ b/app/views/profile/index.html.erb
@@ -1,6 +1,6 @@
 <div class="flex flex-wrap space-y-4 md:flex-nowrap md:space-y-0">
   <%= render 'shared/settings_nav' %>
-  <div class="flex-grow md:max-w-xl md:mx-auto">
+  <div class="flex-grow max-w-xl mx-auto">
     <h1 class="text-3xl md:text-4xl font-bold mb-4">
       <%= t('profile') %>
     </h1>
diff --git a/app/views/shared/_settings_nav.html.erb b/app/views/shared/_settings_nav.html.erb
index 1a8f1fee..c2d9bc3a 100644
--- a/app/views/shared/_settings_nav.html.erb
+++ b/app/views/shared/_settings_nav.html.erb
@@ -1,166 +1,168 @@
 <% expanded = local_assigns[:expanded] %>
-<% unless expanded %>
-  <div class="md:hidden w-full">
-    <a href="<%= settings_index_path %>" class="flex items-center space-x-0.5 font-medium">
-      <%= svg_icon('arrow_left', class: 'w-4 h-4 stroke-2') %>
-      <span><%= t('settings') %></span>
-    </a>
-  </div>
-<% end %>
-<div class="<%= expanded ? 'block -mx-3 md:mx-0' : 'hidden md:block w-full md:w-52 flex-none' %>">
-  <menu-active>
-    <ul id="account_settings_menu" class="menu px-0">
-      <% unless expanded %>
-        <li class="menu-title py-0 !bg-transparent mb-3 -mt-5">
-          <a href="<%= root_path %>" class="!bg-transparent !text-neutral font-medium flex items-center space-x-0.5">
-            <%= svg_icon('arrow_left', class: 'w-4 h-4 stroke-2') %>
-            <span><%= t('back') %></span>
-          </a>
+<div class="<%= expanded ? 'block -mx-3 md:mx-0' : 'w-full md:w-52 flex-none' %>">
+  <% unless expanded %>
+    <div class="md:hidden w-full">
+      <a href="<%= settings_index_path %>" class="flex items-center space-x-0.5 font-medium">
+        <%= svg_icon('arrow_left', class: 'w-4 h-4 stroke-2') %>
+        <span><%= t('settings') %></span>
+      </a>
+    </div>
+  <% end %>
+  <div class="<%= 'hidden md:block' unless expanded %>">
+    <menu-active>
+      <ul id="account_settings_menu" class="menu px-0">
+        <% unless expanded %>
+          <li class="menu-title py-0 !bg-transparent mb-3 -mt-5">
+            <a href="<%= root_path %>" class="!bg-transparent !text-neutral font-medium flex items-center space-x-0.5">
+              <%= svg_icon('arrow_left', class: 'w-4 h-4 stroke-2') %>
+              <span><%= t('back') %></span>
+            </a>
+          </li>
+        <% end %>
+        <li class="menu-title py-0 !bg-transparent">
+          <span class="!bg-transparent"><%= t('settings') %></span>
         </li>
-      <% end %>
-      <li class="menu-title py-0 !bg-transparent">
-        <span class="!bg-transparent"><%= t('settings') %></span>
-      </li>
-      <li></li>
-      <li>
-        <%= link_to t('profile'), settings_profile_index_path, class: 'text-base hover:bg-base-300' %>
-      </li>
-      <li>
-        <%= link_to t('account'), settings_account_path, class: 'text-base hover:bg-base-300' %>
-      </li>
-      <% if (!Docuseal.multitenant? || EncryptedConfig.exists?(key: EncryptedConfig::EMAIL_SMTP_KEY, account: current_account)) && can?(:read, EncryptedConfig.new(key: EncryptedConfig::EMAIL_SMTP_KEY, account: current_account)) && ENV['SMTP_ADDRESS'].blank? && true_user == current_user %>
+        <li></li>
         <li>
-          <%= link_to t('email'), settings_email_index_path, class: 'text-base hover:bg-base-300' %>
+          <%= link_to t('profile'), settings_profile_index_path, class: 'text-base hover:bg-base-300' %>
         </li>
-      <% end %>
-      <% unless Docuseal.multitenant? %>
-        <% if can?(:read, EncryptedConfig.new(key: EncryptedConfig::FILES_STORAGE_KEY, account: current_account)) && true_user == current_user && ENV['S3_ATTACHMENTS_BUCKET'].blank? && ENV['GCS_BUCKET'].blank? && ENV['AZURE_CONTAINER'].blank? %>
+        <li>
+          <%= link_to t('account'), settings_account_path, class: 'text-base hover:bg-base-300' %>
+        </li>
+        <% if (!Docuseal.multitenant? || EncryptedConfig.exists?(key: EncryptedConfig::EMAIL_SMTP_KEY, account: current_account)) && can?(:read, EncryptedConfig.new(key: EncryptedConfig::EMAIL_SMTP_KEY, account: current_account)) && ENV['SMTP_ADDRESS'].blank? && true_user == current_user %>
           <li>
-            <%= link_to t('storage'), settings_storage_index_path, class: 'text-base hover:bg-base-300' %>
+            <%= link_to t('email'), settings_email_index_path, class: 'text-base hover:bg-base-300' %>
           </li>
         <% end %>
-        <% if can?(:read, EncryptedConfig.new(key: 'submitter_invitation_sms', account: current_account)) && true_user == current_user %>
+        <% unless Docuseal.multitenant? %>
+          <% if can?(:read, EncryptedConfig.new(key: EncryptedConfig::FILES_STORAGE_KEY, account: current_account)) && true_user == current_user && ENV['S3_ATTACHMENTS_BUCKET'].blank? && ENV['GCS_BUCKET'].blank? && ENV['AZURE_CONTAINER'].blank? %>
+            <li>
+              <%= link_to t('storage'), settings_storage_index_path, class: 'text-base hover:bg-base-300' %>
+            </li>
+          <% end %>
+          <% if can?(:read, EncryptedConfig.new(key: 'submitter_invitation_sms', account: current_account)) && true_user == current_user %>
+            <li>
+              <%= link_to 'SMS', settings_sms_path, class: 'text-base hover:bg-base-300' %>
+            </li>
+          <% end %>
+        <% end %>
+        <% if can?(:read, AccountConfig) %>
           <li>
-            <%= link_to 'SMS', settings_sms_path, class: 'text-base hover:bg-base-300' %>
+            <%= link_to t('notifications'), settings_notifications_path, class: 'text-base hover:bg-base-300' %>
           </li>
         <% end %>
-      <% end %>
-      <% if can?(:read, AccountConfig) %>
-        <li>
-          <%= link_to t('notifications'), settings_notifications_path, class: 'text-base hover:bg-base-300' %>
-        </li>
-      <% end %>
-      <% if can?(:read, EncryptedConfig.new(key: EncryptedConfig::ESIGN_CERTS_KEY, account: current_account)) %>
-        <li>
-          <%= link_to t('e_signature'), settings_esign_path, class: 'text-base hover:bg-base-300' %>
-        </li>
-      <% end %>
-      <% if can?(:read, AccountConfig) %>
-        <li>
-          <%= link_to t('personalization'), settings_personalization_path, class: 'text-base hover:bg-base-300' %>
-        </li>
-      <% end %>
-      <% if can?(:read, User) %>
-        <li>
-          <%= link_to t('users'), settings_users_path, class: 'text-base hover:bg-base-300' %>
-        </li>
-      <% end %>
-      <%= render 'shared/settings_nav_extra' %>
-      <% if Docuseal.demo? || !Docuseal.multitenant? %>
-        <% if can?(:read, AccessToken) %>
+        <% if can?(:read, EncryptedConfig.new(key: EncryptedConfig::ESIGN_CERTS_KEY, account: current_account)) %>
           <li>
-            <%= link_to 'API', settings_api_index_path, class: 'text-base hover:bg-base-300' %>
+            <%= link_to t('e_signature'), settings_esign_path, class: 'text-base hover:bg-base-300' %>
           </li>
         <% end %>
-      <% end %>
-      <% if Docuseal.demo? || !Docuseal.multitenant? || (current_user != true_user && !current_account.testing?) %>
-        <% if can?(:read, WebhookUrl) %>
+        <% if can?(:read, AccountConfig) %>
           <li>
-            <%= link_to 'Webhooks', settings_webhooks_path, class: 'text-base hover:bg-base-300' %>
+            <%= link_to t('personalization'), settings_personalization_path, class: 'text-base hover:bg-base-300' %>
           </li>
         <% end %>
-      <% end %>
-      <% if !Docuseal.demo? && can?(:manage, EncryptedConfig) && (current_user != true_user || !current_account.linked_account_account) %>
-        <li>
-          <%= content_for(:pro_link) || link_to(Docuseal.multitenant? ? console_redirect_index_path(redir: "#{Docuseal::CONSOLE_URL}/plans") : "#{Docuseal::CLOUD_URL}/sign_up?#{{ redir: "#{Docuseal::CONSOLE_URL}/on_premises" }.to_query}", class: 'text-base hover:bg-base-300', data: { turbo: false }) do %>
-            <%= t('plans') %>
-            <span class="badge badge-warning"><%= t('pro') %></span>
-          <% end %>
-        </li>
-      <% end %>
-      <% if !Docuseal.demo? && can?(:manage, EncryptedConfig) && (current_user == true_user || current_account.testing?) %>
-        <li>
-          <%= link_to Docuseal.multitenant? ? console_redirect_index_path(redir: "#{Docuseal::CONSOLE_URL}#{'/test' if current_account.testing?}/api") : "#{Docuseal::CONSOLE_URL}/on_premises", class: 'text-base hover:bg-base-300', data: { turbo: false } do %>
-            <% if Docuseal.multitenant? %> API <% else %> <%= t('console') %> <% end %>
-          <% end %>
-        </li>
-        <% if Docuseal.multitenant? %>
+        <% if can?(:read, User) %>
           <li>
-            <%= link_to console_redirect_index_path(redir: "#{Docuseal::CONSOLE_URL}#{'/test' if current_account.testing?}/embedding/form"), class: 'text-base hover:bg-base-300', data: { turbo: false } do %>
-              <%= t('embedding') %>
-            <% end %>
+            <%= link_to t('users'), settings_users_path, class: 'text-base hover:bg-base-300' %>
           </li>
         <% end %>
-        <% if (!Docuseal.multitenant? || can?(:manage, :saml_sso)) && can?(:read, EncryptedConfig.new(key: 'saml_configs', account: current_account)) && true_user == current_user %>
+        <%= render 'shared/settings_nav_extra' %>
+        <% if Docuseal.demo? || !Docuseal.multitenant? %>
+          <% if can?(:read, AccessToken) %>
+            <li>
+              <%= link_to 'API', settings_api_index_path, class: 'text-base hover:bg-base-300' %>
+            </li>
+          <% end %>
+        <% end %>
+        <% if Docuseal.demo? || !Docuseal.multitenant? || (current_user != true_user && !current_account.testing?) %>
+          <% if can?(:read, WebhookUrl) %>
+            <li>
+              <%= link_to 'Webhooks', settings_webhooks_path, class: 'text-base hover:bg-base-300' %>
+            </li>
+          <% end %>
+        <% end %>
+        <% if !Docuseal.demo? && can?(:manage, EncryptedConfig) && (current_user != true_user || !current_account.linked_account_account) %>
           <li>
-            <%= link_to 'SSO', settings_sso_index_path, class: 'text-base hover:bg-base-300' %>
+            <%= content_for(:pro_link) || link_to(Docuseal.multitenant? ? console_redirect_index_path(redir: "#{Docuseal::CONSOLE_URL}/plans") : "#{Docuseal::CLOUD_URL}/sign_up?#{{ redir: "#{Docuseal::CONSOLE_URL}/on_premises" }.to_query}", class: 'text-base hover:bg-base-300', data: { turbo: false }) do %>
+              <%= t('plans') %>
+              <span class="badge badge-warning"><%= t('pro') %></span>
+            <% end %>
           </li>
         <% end %>
-        <% if !Docuseal.multitenant? && can?(:read, McpToken) && can?(:manage, :mcp) %>
+        <% if !Docuseal.demo? && can?(:manage, EncryptedConfig) && (current_user == true_user || current_account.testing?) %>
           <li>
-            <%= link_to 'MCP', settings_mcp_index_path, class: 'text-base hover:bg-base-300' %>
+            <%= link_to Docuseal.multitenant? ? console_redirect_index_path(redir: "#{Docuseal::CONSOLE_URL}#{'/test' if current_account.testing?}/api") : "#{Docuseal::CONSOLE_URL}/on_premises", class: 'text-base hover:bg-base-300', data: { turbo: false } do %>
+              <% if Docuseal.multitenant? %> API <% else %> <%= t('console') %> <% end %>
+            <% end %>
           </li>
-        <% end %>
-        <%= render 'shared/settings_nav_extra2' %>
-        <% if (can?(:manage, EncryptedConfig) && current_user == true_user) || (current_user != true_user && current_account.testing?) %>
-          <%= form_for '', url: testing_account_path, method: current_account.testing? ? :delete : :post, html: { class: 'w-full' } do |f| %>
+          <% if Docuseal.multitenant? %>
+            <li>
+              <%= link_to console_redirect_index_path(redir: "#{Docuseal::CONSOLE_URL}#{'/test' if current_account.testing?}/embedding/form"), class: 'text-base hover:bg-base-300', data: { turbo: false } do %>
+                <%= t('embedding') %>
+              <% end %>
+            </li>
+          <% end %>
+          <% if (!Docuseal.multitenant? || can?(:manage, :saml_sso)) && can?(:read, EncryptedConfig.new(key: 'saml_configs', account: current_account)) && true_user == current_user %>
             <li>
-              <label class="flex items-center text-base hover:bg-base-300 w-full justify-between" for="testing_toggle">
-                <span class="mr-2 w-full">
-                  <%= t('test_mode') %>
-                </span>
-                <submit-form data-on="change" class="flex">
-                  <%= f.check_box :testing_toggle, class: 'toggle toggle-sm', checked: current_account.testing? %>
-                </submit-form>
-              </label>
+              <%= link_to 'SSO', settings_sso_index_path, class: 'text-base hover:bg-base-300' %>
             </li>
           <% end %>
+          <% if !Docuseal.multitenant? && can?(:read, McpToken) && can?(:manage, :mcp) %>
+            <li>
+              <%= link_to 'MCP', settings_mcp_index_path, class: 'text-base hover:bg-base-300' %>
+            </li>
+          <% end %>
+          <%= render 'shared/settings_nav_extra2' %>
+          <% if (can?(:manage, EncryptedConfig) && current_user == true_user) || (current_user != true_user && current_account.testing?) %>
+            <%= form_for '', url: testing_account_path, method: current_account.testing? ? :delete : :post, html: { class: 'w-full' } do |f| %>
+              <li>
+                <label class="flex items-center text-base hover:bg-base-300 w-full justify-between" for="testing_toggle">
+                  <span class="mr-2 w-full">
+                    <%= t('test_mode') %>
+                  </span>
+                  <submit-form data-on="change" class="flex">
+                    <%= f.check_box :testing_toggle, class: 'toggle toggle-sm', checked: current_account.testing? %>
+                  </submit-form>
+                </label>
+              </li>
+            <% end %>
+          <% end %>
         <% end %>
-      <% end %>
-    </ul>
-  </menu-active>
-  <% if Docuseal.multitenant? || cannot?(:manage, :tenants) %>
-    <div id="support_channels" class="mx-4 border-t border-base-300 <%= 'hidden md:block' unless expanded %>">
-      <div class="text-sm mt-3">
-        <%= t('need_help_ask_a_question_') %>
-      </div>
-      <div class="flex mt-3 space-x-3">
-        <div class="tooltip tooltip-no-touch" data-tip="GitHub">
-          <a href="<%= Docuseal::GITHUB_URL %>" target="_blank" class="btn btn-circle btn-primary btn-md">
-            <%= svg_icon('brand_github', class: 'w-8 h-8') %>
-          </a>
-        </div>
-        <div class="tooltip tooltip-no-touch" data-tip="<%= t('discord_community') %>">
-          <a href="<%= Docuseal::DISCORD_URL %>" target="_blank" class="btn btn-circle btn-primary btn-md">
-            <%= svg_icon('brand_discord', class: 'w-8 h-8') %>
-          </a>
+      </ul>
+    </menu-active>
+    <% if Docuseal.multitenant? || cannot?(:manage, :tenants) %>
+      <div id="support_channels" class="mx-4 border-t border-base-300 <%= 'hidden md:block' unless expanded %>">
+        <div class="text-sm mt-3">
+          <%= t('need_help_ask_a_question_') %>
         </div>
-        <%= capture do %>
-          <div class="tooltip tooltip-no-touch" data-tip="<%= t('ai_assistant') %>">
-            <a href="<%= Docuseal::CHATGPT_URL %>" target="_blank" class="btn btn-circle btn-primary btn-md">
-              <%= svg_icon('message', class: 'w-8 h-8') %>
+        <div class="flex mt-3 space-x-3">
+          <div class="tooltip tooltip-no-touch" data-tip="GitHub">
+            <a href="<%= Docuseal::GITHUB_URL %>" target="_blank" class="btn btn-circle btn-primary btn-md">
+              <%= svg_icon('brand_github', class: 'w-8 h-8') %>
+            </a>
+          </div>
+          <div class="tooltip tooltip-no-touch" data-tip="<%= t('discord_community') %>">
+            <a href="<%= Docuseal::DISCORD_URL %>" target="_blank" class="btn btn-circle btn-primary btn-md">
+              <%= svg_icon('brand_discord', class: 'w-8 h-8') %>
             </a>
           </div>
+          <%= capture do %>
+            <div class="tooltip tooltip-no-touch" data-tip="<%= t('ai_assistant') %>">
+              <a href="<%= Docuseal::CHATGPT_URL %>" target="_blank" class="btn btn-circle btn-primary btn-md">
+                <%= svg_icon('message', class: 'w-8 h-8') %>
+              </a>
+            </div>
+          <% end %>
+        </div>
+        <a href="mailto:<%= Docuseal::SUPPORT_EMAIL %>" target="_blank" class="w-full block mt-4 underline text-center">
+          <%= Docuseal::SUPPORT_EMAIL %>
+        </a>
+        <% if Docuseal.version.present? && !Docuseal.multitenant? && can?(:manage, EncryptedConfig) %>
+          <a href="https://github.com/docusealco/docuseal/releases" target="_blank" class="badge badge-outline text-xs block mx-auto mt-4">
+            v<%= Docuseal.version %>
+          </a>
         <% end %>
       </div>
-      <a href="mailto:<%= Docuseal::SUPPORT_EMAIL %>" target="_blank" class="w-full block mt-4 underline text-center">
-        <%= Docuseal::SUPPORT_EMAIL %>
-      </a>
-      <% if Docuseal.version.present? && !Docuseal.multitenant? && can?(:manage, EncryptedConfig) %>
-        <a href="https://github.com/docusealco/docuseal/releases" target="_blank" class="badge badge-outline text-xs block mx-auto mt-4">
-          v<%= Docuseal.version %>
-        </a>
-      <% end %>
-    </div>
-  <% end %>
+    <% end %>
+  </div>
 </div>
diff --git a/app/views/sms_settings/index.html.erb b/app/views/sms_settings/index.html.erb
index 58051458..2c2d2e90 100644
--- a/app/views/sms_settings/index.html.erb
+++ b/app/views/sms_settings/index.html.erb
@@ -1,6 +1,6 @@
 <div class="flex flex-wrap space-y-4 md:flex-nowrap md:space-y-0">
   <%= render 'shared/settings_nav' %>
-  <div class="flex-grow md:max-w-xl md:mx-auto">
+  <div class="flex-grow max-w-xl mx-auto">
     <h1 class="text-3xl md:text-4xl font-bold mb-4">SMS</h1>
     <%= render 'placeholder' %>
   </div>
diff --git a/app/views/sso_settings/index.html.erb b/app/views/sso_settings/index.html.erb
index dd3e4fb6..9ac6bdf2 100644
--- a/app/views/sso_settings/index.html.erb
+++ b/app/views/sso_settings/index.html.erb
@@ -1,6 +1,6 @@
 <div class="flex flex-wrap space-y-4 md:flex-nowrap md:space-y-0">
   <%= render 'shared/settings_nav' %>
-  <div class="flex-grow md:max-w-xl md:mx-auto">
+  <div class="flex-grow max-w-xl mx-auto">
     <h1 class="text-3xl md:text-4xl font-bold mb-4">SAML SSO</h1>
     <%= render 'placeholder' %>
   </div>
diff --git a/app/views/storage_settings/index.html.erb b/app/views/storage_settings/index.html.erb
index b2cc9a6d..e4a5bd95 100644
--- a/app/views/storage_settings/index.html.erb
+++ b/app/views/storage_settings/index.html.erb
@@ -1,6 +1,6 @@
 <div class="flex flex-wrap space-y-4 md:flex-nowrap md:space-y-0">
   <%= render 'shared/settings_nav' %>
-  <div class="flex-grow md:max-w-xl md:mx-auto">
+  <div class="flex-grow max-w-xl mx-auto">
     <h1 class="text-3xl md:text-4xl font-bold mb-4">
       <%= t('storage') %>
     </h1>

From 3667993caf1022dd9f74edcc683c12358060f16b Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Thu, 30 Jul 2026 16:54:36 +0300
Subject: [PATCH 25/42] center settings footer

---
 app/views/shared/_settings_nav.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/shared/_settings_nav.html.erb b/app/views/shared/_settings_nav.html.erb
index c2d9bc3a..0a181301 100644
--- a/app/views/shared/_settings_nav.html.erb
+++ b/app/views/shared/_settings_nav.html.erb
@@ -132,10 +132,10 @@
     </menu-active>
     <% if Docuseal.multitenant? || cannot?(:manage, :tenants) %>
       <div id="support_channels" class="mx-4 border-t border-base-300 <%= 'hidden md:block' unless expanded %>">
-        <div class="text-sm mt-3">
+        <div class="text-sm text-center mt-3">
           <%= t('need_help_ask_a_question_') %>
         </div>
-        <div class="flex mt-3 space-x-3">
+        <div class="flex justify-center mt-3 space-x-3">
           <div class="tooltip tooltip-no-touch" data-tip="GitHub">
             <a href="<%= Docuseal::GITHUB_URL %>" target="_blank" class="btn btn-circle btn-primary btn-md">
               <%= svg_icon('brand_github', class: 'w-8 h-8') %>

From 50ec7682b59031ab1957b109dbbbfc67a3551d68 Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Thu, 30 Jul 2026 17:40:54 +0300
Subject: [PATCH 26/42] fix open modal mobile

---
 .../submission_events_controller.rb           |  4 +-
 app/controllers/submissions_controller.rb     |  2 +
 app/controllers/submitters_controller.rb      |  2 +
 app/controllers/templates_controller.rb       |  4 +-
 .../templates_preferences_controller.rb       |  4 +-
 .../templates_share_link_controller.rb        |  4 +-
 app/javascript/application.js                 |  6 ++-
 app/javascript/elements/history_back.js       | 15 ++++++
 ...rt_modal_links.js => open_modal_mobile.js} |  3 +-
 app/javascript/elements/turbo_modal.js        |  6 +--
 app/javascript/template_builder/builder.vue   |  4 +-
 app/views/layouts/application.html.erb        |  1 -
 app/views/shared/_turbo_modal_large.html.erb  | 46 +++++++++++++------
 app/views/submissions/show.html.erb           | 18 +++++---
 .../submissions_dashboard/index.html.erb      | 10 ++--
 app/views/template_folders/show.html.erb      | 10 ++--
 app/views/templates/_submission.html.erb      | 16 ++++---
 app/views/templates/_title.html.erb           | 14 +++---
 app/views/templates/show.html.erb             | 10 ++--
 app/views/templates_dashboard/index.html.erb  | 10 ++--
 20 files changed, 124 insertions(+), 65 deletions(-)
 create mode 100644 app/javascript/elements/history_back.js
 rename app/javascript/elements/{convert_modal_links.js => open_modal_mobile.js} (77%)

diff --git a/app/controllers/submission_events_controller.rb b/app/controllers/submission_events_controller.rb
index 0dad2336..b3b892f1 100644
--- a/app/controllers/submission_events_controller.rb
+++ b/app/controllers/submission_events_controller.rb
@@ -24,5 +24,7 @@ class SubmissionEventsController < ApplicationController
 
   load_and_authorize_resource :submission
 
-  def index; end
+  def index
+    render :index, layout: 'plain'
+  end
 end
diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb
index 31e568e2..96ae4972 100644
--- a/app/controllers/submissions_controller.rb
+++ b/app/controllers/submissions_controller.rb
@@ -33,6 +33,8 @@ class SubmissionsController < ApplicationController
 
   def new
     authorize!(:new, Submission)
+
+    render :new, layout: 'plain'
   end
 
   def create
diff --git a/app/controllers/submitters_controller.rb b/app/controllers/submitters_controller.rb
index 7a40101f..48610854 100644
--- a/app/controllers/submitters_controller.rb
+++ b/app/controllers/submitters_controller.rb
@@ -8,6 +8,8 @@ class SubmittersController < ApplicationController
       if @submitter.preferences['email_message_uuid'].present?
         @submitter.account.email_messages.find_by(uuid: @submitter.preferences['email_message_uuid'])
       end
+
+    render :edit, layout: 'plain'
   end
 
   def update
diff --git a/app/controllers/templates_controller.rb b/app/controllers/templates_controller.rb
index b0d3446f..c45fe6cd 100644
--- a/app/controllers/templates_controller.rb
+++ b/app/controllers/templates_controller.rb
@@ -25,7 +25,9 @@ class TemplatesController < ApplicationController
     redirect_to root_path
   end
 
-  def new; end
+  def new
+    render :new, layout: 'plain'
+  end
 
   def edit
     @template_data = Templates.serialize_for_builder(@template)
diff --git a/app/controllers/templates_preferences_controller.rb b/app/controllers/templates_preferences_controller.rb
index b49202d0..449a58c6 100644
--- a/app/controllers/templates_preferences_controller.rb
+++ b/app/controllers/templates_preferences_controller.rb
@@ -14,7 +14,9 @@ class TemplatesPreferencesController < ApplicationController
                                                        completed_notification_email_body]
   }.freeze
 
-  def show; end
+  def show
+    render :show, layout: 'plain'
+  end
 
   def create
     authorize!(:update, @template)
diff --git a/app/controllers/templates_share_link_controller.rb b/app/controllers/templates_share_link_controller.rb
index 5dfed111..8600ce95 100644
--- a/app/controllers/templates_share_link_controller.rb
+++ b/app/controllers/templates_share_link_controller.rb
@@ -3,7 +3,9 @@
 class TemplatesShareLinkController < ApplicationController
   load_and_authorize_resource :template
 
-  def show; end
+  def show
+    render :show, layout: 'plain'
+  end
 
   def create
     authorize!(:update, @template)
diff --git a/app/javascript/application.js b/app/javascript/application.js
index 0bcc7418..9e14ff9b 100644
--- a/app/javascript/application.js
+++ b/app/javascript/application.js
@@ -57,7 +57,8 @@ import BarChart from './elements/bar_chart'
 import FieldCondition from './elements/field_condition'
 import ConfirmUpload from './elements/confirm_upload'
 import ScrollFade from './elements/scroll_fade'
-import ConvertModalLinks from './elements/convert_modal_links'
+import OpenModalMobile from './elements/open_modal_mobile'
+import HistoryBack from './elements/history_back'
 
 import * as TurboInstantClick from './lib/turbo_instant_click'
 
@@ -153,7 +154,8 @@ safeRegisterElement('bar-chart', BarChart)
 safeRegisterElement('field-condition', FieldCondition)
 safeRegisterElement('confirm-upload', ConfirmUpload)
 safeRegisterElement('scroll-fade', ScrollFade)
-safeRegisterElement('convert-modal-links', ConvertModalLinks)
+safeRegisterElement('open-modal-mobile', OpenModalMobile)
+safeRegisterElement('history-back', HistoryBack)
 
 safeRegisterElement('template-builder', class extends HTMLElement {
   connectedCallback () {
diff --git a/app/javascript/elements/history_back.js b/app/javascript/elements/history_back.js
new file mode 100644
index 00000000..3c44ad61
--- /dev/null
+++ b/app/javascript/elements/history_back.js
@@ -0,0 +1,15 @@
+export default class extends HTMLElement {
+  connectedCallback () {
+    this.addEventListener('click', this.onClick)
+  }
+
+  disconnectedCallback () {
+    this.removeEventListener('click', this.onClick)
+  }
+
+  onClick = (e) => {
+    e.preventDefault()
+
+    window.history.back()
+  }
+}
diff --git a/app/javascript/elements/convert_modal_links.js b/app/javascript/elements/open_modal_mobile.js
similarity index 77%
rename from app/javascript/elements/convert_modal_links.js
rename to app/javascript/elements/open_modal_mobile.js
index b31e3108..a9d45ed4 100644
--- a/app/javascript/elements/convert_modal_links.js
+++ b/app/javascript/elements/open_modal_mobile.js
@@ -1,8 +1,9 @@
 export default class extends HTMLElement {
   connectedCallback () {
     if (!this.isMobile()) return
+    if (window.innerWidth >= 768) return
 
-    document.querySelectorAll('a[data-turbo-frame="modal"]').forEach((link) => {
+    this.querySelectorAll('a[data-turbo-frame]').forEach((link) => {
       link.dataset.turboFrame = '_top'
     })
   }
diff --git a/app/javascript/elements/turbo_modal.js b/app/javascript/elements/turbo_modal.js
index 7642386c..89460ee6 100644
--- a/app/javascript/elements/turbo_modal.js
+++ b/app/javascript/elements/turbo_modal.js
@@ -42,10 +42,6 @@ export default actionable(class extends HTMLElement {
   close = (e) => {
     e?.preventDefault()
 
-    if (!this.closest('turbo-frame')?.src && window.history.length > 1) {
-      window.history.back()
-    } else {
-      this.remove()
-    }
+    this.remove()
   }
 })
diff --git a/app/javascript/template_builder/builder.vue b/app/javascript/template_builder/builder.vue
index 5b0546af..8dd2208f 100644
--- a/app/javascript/template_builder/builder.vue
+++ b/app/javascript/template_builder/builder.vue
@@ -164,7 +164,7 @@
             v-if="withSendButton"
             id="send_button"
             :href="`/templates/${template.id}/submissions/new?with_link=true`"
-            data-turbo-frame="modal"
+            :data-turbo-frame="isMobile && isBreakpointLg ? '_top' : 'modal'"
             class="white-button md:!px-6"
             @click="maybeShowErrorTemplateAlert"
           >
@@ -229,7 +229,7 @@
                 <li>
                   <a
                     :href="`/templates/${template.id}/preferences`"
-                    data-turbo-frame="modal"
+                    :data-turbo-frame="isMobile && isBreakpointLg ? '_top' : 'modal'"
                     class="flex space-x-2"
                     @click="closeDropdown"
                   >
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index cb372271..09cfb218 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -27,7 +27,6 @@
       <% end %>
     <% end %>
     <turbo-frame id="modal"></turbo-frame>
-    <convert-modal-links></convert-modal-links>
     <turbo-frame id="drawer"></turbo-frame>
     <%= render 'shared/navbar' %>
     <% if flash.present? %><%= render 'shared/flash' %><% end %>
diff --git a/app/views/shared/_turbo_modal_large.html.erb b/app/views/shared/_turbo_modal_large.html.erb
index d929519c..4c42fe56 100644
--- a/app/views/shared/_turbo_modal_large.html.erb
+++ b/app/views/shared/_turbo_modal_large.html.erb
@@ -1,18 +1,34 @@
-<turbo-frame id="modal">
-  <turbo-modal class="modal modal-open items-start !animate-none overflow-y-auto !justify-normal md:!justify-center" data-close-after-submit="<%= local_assigns.key?(:close_after_submit) ? local_assigns[:close_after_submit] : true %>">
-    <div class="absolute top-0 bottom-0 right-0 left-0" data-action="click:turbo-modal#close"></div>
-    <div class="bg-base-100 min-h-screen max-h-screen md:min-h-fit md:mt-3 md:rounded-2xl relative w-full relative overflow-y-auto">
-      <% if local_assigns[:title] %>
-        <div class="flex justify-between bg-base-100 py-2 px-5 items-center border-b pb-2 font-medium mt-0.5">
-          <span>
-            <%= local_assigns[:title] %>
-          </span>
-          <a href="#" class="text-xl" data-action="click:turbo-modal#close">&times;</a>
+<% if turbo_frame_request? %>
+  <turbo-frame id="modal">
+    <turbo-modal class="modal modal-open items-start !animate-none overflow-y-auto !justify-normal md:!justify-center" data-close-after-submit="<%= local_assigns.key?(:close_after_submit) ? local_assigns[:close_after_submit] : true %>">
+      <div class="absolute top-0 bottom-0 right-0 left-0" data-action="click:turbo-modal#close"></div>
+      <div class="bg-base-100 min-h-screen max-h-screen md:min-h-fit md:mt-3 md:rounded-2xl relative w-full relative overflow-y-auto">
+        <% if local_assigns[:title] %>
+          <div class="flex justify-between bg-base-100 py-2 px-5 items-center border-b pb-2 font-medium mt-0.5">
+            <span>
+              <%= local_assigns[:title] %>
+            </span>
+            <a href="#" class="text-xl" data-action="click:turbo-modal#close">&times;</a>
+          </div>
+        <% end %>
+        <div class="w-full md:w-[590px] overflow-y-auto" style="max-height: calc(100vh - 14px - 45px); max-height: calc(100dvh - 14px - 45px)">
+          <%= yield %>
         </div>
-      <% end %>
-      <div class="w-full md:w-[590px] overflow-y-auto" style="max-height: calc(100vh - 14px - 45px); max-height: calc(100dvh - 14px - 45px)">
-        <%= yield %>
       </div>
+    </turbo-modal>
+  </turbo-frame>
+<% else %>
+  <% if local_assigns[:title] %>
+    <div class="sticky top-0 z-10 flex justify-between bg-base-100 py-2 px-5 items-center border-b pb-2 font-medium">
+      <span>
+        <%= local_assigns[:title] %>
+      </span>
+      <history-back>
+        <a href="#" class="text-xl">&times;</a>
+      </history-back>
     </div>
-  </turbo-modal>
-</turbo-frame>
+  <% end %>
+  <div class="w-full">
+    <%= yield %>
+  </div>
+<% end %>
diff --git a/app/views/submissions/show.html.erb b/app/views/submissions/show.html.erb
index 95edc4e7..809a1828 100644
--- a/app/views/submissions/show.html.erb
+++ b/app/views/submissions/show.html.erb
@@ -25,10 +25,12 @@
           <span class="hidden md:inline"><%= t('audit_log') %></span>
         </a>
       <% elsif signed_in? %>
-        <%= link_to submission_events_path(@submission), class: 'white-button', data: { turbo_frame: :modal } do %>
-          <%= svg_icon('logs', class: 'w-6 h-6') %>
-          <span class="hidden md:block"><%= t('event_log') %></span>
-        <% end %>
+        <open-modal-mobile class="flex">
+          <%= link_to submission_events_path(@submission), class: 'white-button', data: { turbo_frame: :modal } do %>
+            <%= svg_icon('logs', class: 'w-6 h-6') %>
+            <span class="hidden md:block"><%= t('event_log') %></span>
+          <% end %>
+        </open-modal-mobile>
       <% end %>
       <% if signed_in? && !@submission.completed_at? && can?(:manage, :resend_all) && @submission.submitters.to_a.size > 3 && !@submission.archived_at? && !@submission.template&.archived_at? && !@submission.expired? && can?(:update, @submission) %>
         <% pending_submitters_count = @submission.submitters.to_a.count { |s| !s.completed_at? && s.email.present? && !s.declined_at? } %>
@@ -181,9 +183,11 @@
               </div>
               <% if signed_in? && can?(:update, @submission) && submitter && !submitter.completed_at? && !@submission.completed_at? && !submitter.declined_at? && !@submission.archived_at? && !@submission.template&.archived_at? && !@submission.expired? && !submitter.start_form_submission_events.any? %>
                 <span class="tooltip tooltip-left tooltip-no-touch" data-tip="<%= t('edit') %>">
-                  <%= link_to edit_submitter_path(submitter), class: 'shrink-0 inline md:hidden md:group-hover:inline', data: { turbo_frame: 'modal' } do %>
-                    <%= svg_icon('pencil', class: 'w-5 h-5') %>
-                  <% end %>
+                  <open-modal-mobile>
+                    <%= link_to edit_submitter_path(submitter), class: 'shrink-0 inline md:hidden md:group-hover:inline', data: { turbo_frame: 'modal' } do %>
+                      <%= svg_icon('pencil', class: 'w-5 h-5') %>
+                    <% end %>
+                  </open-modal-mobile>
                 </span>
               <% end %>
             </div>
diff --git a/app/views/submissions_dashboard/index.html.erb b/app/views/submissions_dashboard/index.html.erb
index dc7580c2..5b8a0a71 100644
--- a/app/views/submissions_dashboard/index.html.erb
+++ b/app/views/submissions_dashboard/index.html.erb
@@ -18,10 +18,12 @@
       <span class="hidden sm:block">
         <%= render 'templates/upload_button' %>
       </span>
-      <%= link_to new_template_path, class: 'white-button !border gap-2', data: { turbo_frame: :modal } do %>
-        <%= svg_icon('plus', class: 'w-6 h-6 stroke-2') %>
-        <span class="hidden md:block"><%= t('create') %></span>
-      <% end %>
+      <open-modal-mobile class="flex">
+        <%= link_to new_template_path, class: 'white-button !border gap-2', data: { turbo_frame: :modal } do %>
+          <%= svg_icon('plus', class: 'w-6 h-6 stroke-2') %>
+          <span class="hidden md:block"><%= t('create') %></span>
+        <% end %>
+      </open-modal-mobile>
     <% end %>
   </div>
 </div>
diff --git a/app/views/template_folders/show.html.erb b/app/views/template_folders/show.html.erb
index 9120dc92..d5557117 100644
--- a/app/views/template_folders/show.html.erb
+++ b/app/views/template_folders/show.html.erb
@@ -37,10 +37,12 @@
         <span class="hidden sm:block">
           <%= render 'templates/upload_button', folder_name: @template_folder.full_name %>
         </span>
-        <%= link_to new_template_path(folder_name: @template_folder.full_name), class: 'white-button !border gap-2', data: { turbo_frame: :modal } do %>
-          <%= svg_icon('plus', class: 'w-6 h-6 stroke-2') %>
-          <span class="hidden md:block"><%= t('create') %></span>
-        <% end %>
+        <open-modal-mobile class="flex">
+          <%= link_to new_template_path(folder_name: @template_folder.full_name), class: 'white-button !border gap-2', data: { turbo_frame: :modal } do %>
+            <%= svg_icon('plus', class: 'w-6 h-6 stroke-2') %>
+            <span class="hidden md:block"><%= t('create') %></span>
+          <% end %>
+        </open-modal-mobile>
       <% end %>
     </div>
   </div>
diff --git a/app/views/templates/_submission.html.erb b/app/views/templates/_submission.html.erb
index e0a7acab..278bd679 100644
--- a/app/views/templates/_submission.html.erb
+++ b/app/views/templates/_submission.html.erb
@@ -53,9 +53,11 @@
               </a>
               <% if !submitter.completed_at? && !submission.completed_at? && can?(:update, submission) && !submitter.start_form_submission_events.any? && !submission.archived_at? && !submission.expired? && !submitter.declined_at? %>
                 <span class="pl-0.5 tooltip tooltip-top tooltip-no-touch md:opacity-0 md:hover:opacity-100 md:peer-hover:opacity-100" data-tip="<%= t('edit') %>">
-                  <%= link_to edit_submitter_path(submitter), class: 'shrink-0', data: { turbo_frame: 'modal' } do %>
-                    <%= svg_icon('pencil', class: 'w-5 h-5') %>
-                  <% end %>
+                  <open-modal-mobile>
+                    <%= link_to edit_submitter_path(submitter), class: 'shrink-0', data: { turbo_frame: 'modal' } do %>
+                      <%= svg_icon('pencil', class: 'w-5 h-5') %>
+                    <% end %>
+                  </open-modal-mobile>
                 </span>
               <% end %>
             </span>
@@ -146,9 +148,11 @@
                     </a>
                     <% if !submitter.completed_at? && !submission.completed_at? && can?(:update, submission) && !submitter.start_form_submission_events.any? && !submission.archived_at? && !submission.expired? && !submitter.declined_at? %>
                       <span class="pl-0.5 tooltip tooltip-top tooltip-no-touch md:opacity-0 md:hover:opacity-100 md:peer-hover:opacity-100" data-tip="<%= t('edit') %>">
-                        <%= link_to edit_submitter_path(submitter), class: 'shrink-0', data: { turbo_frame: 'modal' } do %>
-                          <%= svg_icon('pencil', class: 'w-5 h-5') %>
-                        <% end %>
+                        <open-modal-mobile>
+                          <%= link_to edit_submitter_path(submitter), class: 'shrink-0', data: { turbo_frame: 'modal' } do %>
+                            <%= svg_icon('pencil', class: 'w-5 h-5') %>
+                          <% end %>
+                        </open-modal-mobile>
                       </span>
                     <% end %>
                   </span>
diff --git a/app/views/templates/_title.html.erb b/app/views/templates/_title.html.erb
index 0ec43e7e..76b1a5f9 100644
--- a/app/views/templates/_title.html.erb
+++ b/app/views/templates/_title.html.erb
@@ -52,12 +52,14 @@
             <% end %>
           </div>
         <% end %>
-        <%= link_to template_share_link_path(template), class: 'absolute md:relative bottom-0 right-0 btn btn-xs md:btn-sm whitespace-nowrap btn-neutral text-white mt-1 px-2', data: { turbo_frame: :modal } do %>
-          <span class="flex items-center justify-center space-x-2">
-            <%= svg_icon('link', class: 'w-4 h-4 md:w-6 md:h-6') %>
-            <span><%= t('link') %></span>
-          </span>
-        <% end %>
+        <open-modal-mobile class="absolute md:relative bottom-0 right-0 mt-1">
+          <%= link_to template_share_link_path(template), class: 'btn btn-xs md:btn-sm whitespace-nowrap btn-neutral text-white px-2', data: { turbo_frame: :modal } do %>
+            <span class="flex items-center justify-center space-x-2">
+              <%= svg_icon('link', class: 'w-4 h-4 md:w-6 md:h-6') %>
+              <span><%= t('link') %></span>
+            </span>
+          <% end %>
+        </open-modal-mobile>
       </div>
     <% end %>
   </div>
diff --git a/app/views/templates/show.html.erb b/app/views/templates/show.html.erb
index 541c37ba..500b11f0 100644
--- a/app/views/templates/show.html.erb
+++ b/app/views/templates/show.html.erb
@@ -18,10 +18,12 @@
           <span><%= t('export') %></span>
         <% end %>
         <% if !@template.archived_at? && can?(:create, Submission) %>
-          <%= link_to new_template_submission_path(@template), id: 'add_recipients_button', class: 'white-button !border', data: { turbo_frame: 'modal' } do %>
-            <%= svg_icon('plus', class: 'w-6 h-6 stroke-2') %>
-            <%= t('add_recipients_html') %>
-          <% end %>
+          <open-modal-mobile class="flex">
+            <%= link_to new_template_submission_path(@template), id: 'add_recipients_button', class: 'white-button !border', data: { turbo_frame: 'modal' } do %>
+              <%= svg_icon('plus', class: 'w-6 h-6 stroke-2') %>
+              <%= t('add_recipients_html') %>
+            <% end %>
+          </open-modal-mobile>
         <% end %>
       </div>
     </div>
diff --git a/app/views/templates_dashboard/index.html.erb b/app/views/templates_dashboard/index.html.erb
index 887a9f84..8ab97431 100644
--- a/app/views/templates_dashboard/index.html.erb
+++ b/app/views/templates_dashboard/index.html.erb
@@ -30,10 +30,12 @@
         <span class="hidden sm:block">
           <%= render 'templates/upload_button' %>
         </span>
-        <%= link_to new_template_path, class: 'white-button !border gap-2', data: { turbo_frame: :modal } do %>
-          <%= svg_icon('plus', class: 'w-6 h-6 stroke-2') %>
-          <span class="hidden md:block"><%= t('create') %></span>
-        <% end %>
+        <open-modal-mobile class="flex">
+          <%= link_to new_template_path, class: 'white-button !border gap-2', data: { turbo_frame: :modal } do %>
+            <%= svg_icon('plus', class: 'w-6 h-6 stroke-2') %>
+            <span class="hidden md:block"><%= t('create') %></span>
+          <% end %>
+        </open-modal-mobile>
       <% end %>
     </div>
   </div>

From 3a24ecac63928a2fdabfceaf230d8accdabc25f8 Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Thu, 30 Jul 2026 17:42:21 +0300
Subject: [PATCH 27/42] Revert "break long names in template and folder titles"

This reverts commit 59fe8a7917d296f7a8c9aa547eff2938b9eda2f2.
---
 app/views/submissions/show.html.erb         | 2 +-
 app/views/template_folders/_folder.html.erb | 2 +-
 app/views/templates/_template.html.erb      | 2 +-
 app/views/templates/_title.html.erb         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/submissions/show.html.erb b/app/views/submissions/show.html.erb
index 809a1828..56994bd7 100644
--- a/app/views/submissions/show.html.erb
+++ b/app/views/submissions/show.html.erb
@@ -13,7 +13,7 @@
   <div class="flex justify-between py-1.5 items-center pr-4 sticky top-0 md:relative z-10 bg-base-100">
     <a href="<%= signed_in? && @submission.account_id == current_account&.id && @submission.template ? template_path(@submission.template) : '/' %>" class="flex items-center space-x-3 py-1">
       <span><%= render 'submissions/logo' %></span>
-      <h1 class="text-xl md:text-3xl font-semibold break-all focus:text-clip" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;"><% (@submission.name || @submission.template&.name).to_s.split(/(_)/).each do |item| %><%= item %><wbr><% end %></h1>
+      <h1 class="text-xl md:text-3xl font-semibold focus:text-clip" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;"><% (@submission.name || @submission.template&.name).to_s.split(/(_)/).each do |item| %><%= item %><wbr><% end %></h1>
     </a>
     <div class="space-x-3 flex items-center">
       <% if signed_in? && can?(:destroy, @submission) && @submission.archived_at? && !@submission.completed_at? %>
diff --git a/app/views/template_folders/_folder.html.erb b/app/views/template_folders/_folder.html.erb
index 23be1f3b..b7571a1f 100644
--- a/app/views/template_folders/_folder.html.erb
+++ b/app/views/template_folders/_folder.html.erb
@@ -4,7 +4,7 @@
   <% if !is_long %>
     <%= svg_icon(icon, class: 'w-6 h-6') %>
   <% end %>
-  <div class="text-lg font-semibold mt-1 break-all" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: <%= is_long ? 2 : 1 %>;">
+  <div class="text-lg font-semibold mt-1" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: <%= is_long ? 2 : 1 %>;">
     <% if is_long %>
       <%= svg_icon(icon, class: 'w-6 h-6 inline') %>
     <% end %>
diff --git a/app/views/templates/_template.html.erb b/app/views/templates/_template.html.erb
index 32239c31..79985645 100644
--- a/app/views/templates/_template.html.erb
+++ b/app/views/templates/_template.html.erb
@@ -1,6 +1,6 @@
 <div class="h-36 relative group">
   <a href="<%= template_path(template) %>" class="flex h-full flex-col justify-between rounded-2xl pt-6 px-7 w-full bg-base-200 before:border-2 before:border-base-300 before:border-dashed before:absolute before:left-0 before:right-0 before:top-0 before:bottom-0 before:hidden before:rounded-2xl" data-targets="dashboard-dropzone.templateCards">
-    <div class="text-xl font-semibold break-all" style="line-height: 1.6rem; overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;">
+    <div class="text-xl font-semibold" style="line-height: 1.6rem; overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;">
       <% if template.template_accesses.present? %>
         <%= svg_icon('lock', class: 'w-6 h-6 inline -translate-y-[4px]') %>
       <% end %>
diff --git a/app/views/templates/_title.html.erb b/app/views/templates/_title.html.erb
index 76b1a5f9..d420becf 100644
--- a/app/views/templates/_title.html.erb
+++ b/app/views/templates/_title.html.erb
@@ -2,7 +2,7 @@
   <div class="relative flex items-start justify-between w-full space-x-0">
     <div>
       <div id="template_title" class="flex">
-        <h1 class="text-3xl md:text-[2em] font-semibold break-all" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;">
+        <h1 class="text-3xl md:text-[2em] font-semibold" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;">
           <% template.name.split(/(_)/).each do |item| %><%= item %><wbr><% end %>
           <% if template.archived_at? %>
             <span class="ml-1 badge badge-outline badge-lg align-middle"><%= t('archived') %></span>

From 35f7c36f28790fbf0958562a1b9167639aec61d9 Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Thu, 30 Jul 2026 17:48:52 +0300
Subject: [PATCH 28/42] rename settings index

---
 .../{settings_index_controller.rb => settings_controller.rb}    | 2 +-
 app/views/{settings_index => settings}/index.html.erb           | 0
 app/views/shared/_navbar.html.erb                               | 2 +-
 app/views/shared/_settings_nav.html.erb                         | 2 +-
 config/routes.rb                                                | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename app/controllers/{settings_index_controller.rb => settings_controller.rb} (59%)
 rename app/views/{settings_index => settings}/index.html.erb (100%)

diff --git a/app/controllers/settings_index_controller.rb b/app/controllers/settings_controller.rb
similarity index 59%
rename from app/controllers/settings_index_controller.rb
rename to app/controllers/settings_controller.rb
index 1feed012..73aa4daf 100644
--- a/app/controllers/settings_index_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class SettingsIndexController < ApplicationController
+class SettingsController < ApplicationController
   skip_authorization_check
 
   def index; end
diff --git a/app/views/settings_index/index.html.erb b/app/views/settings/index.html.erb
similarity index 100%
rename from app/views/settings_index/index.html.erb
rename to app/views/settings/index.html.erb
diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb
index fce7a2ee..84536d97 100644
--- a/app/views/shared/_navbar.html.erb
+++ b/app/views/shared/_navbar.html.erb
@@ -29,7 +29,7 @@
         </label>
         <ul tabindex="0" class="z-10 dropdown-content p-2 mt-2 shadow menu text-base bg-base-100 rounded-box min-w-[160px] text-right">
           <li class="md:hidden">
-            <%= link_to settings_index_path, class: 'flex items-center' do %>
+            <%= link_to settings_path, class: 'flex items-center' do %>
               <%= svg_icon('settings', class: 'w-5 h-5 flex-shrink-0 stroke-2') %>
               <span class="mr-1"><%= t('settings') %></span>
             <% end %>
diff --git a/app/views/shared/_settings_nav.html.erb b/app/views/shared/_settings_nav.html.erb
index 0a181301..52916ec4 100644
--- a/app/views/shared/_settings_nav.html.erb
+++ b/app/views/shared/_settings_nav.html.erb
@@ -2,7 +2,7 @@
 <div class="<%= expanded ? 'block -mx-3 md:mx-0' : 'w-full md:w-52 flex-none' %>">
   <% unless expanded %>
     <div class="md:hidden w-full">
-      <a href="<%= settings_index_path %>" class="flex items-center space-x-0.5 font-medium">
+      <a href="<%= settings_path %>" class="flex items-center space-x-0.5 font-medium">
         <%= svg_icon('arrow_left', class: 'w-4 h-4 stroke-2') %>
         <span><%= t('settings') %></span>
       </a>
diff --git a/config/routes.rb b/config/routes.rb
index 24fb8705..ad8505e5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -178,7 +178,7 @@ Rails.application.routes.draw do
     resources :send_email, only: %i[create], controller: 'submitters_send_email'
   end
 
-  get 'settings' => 'settings_index#index', as: :settings_index
+  resources :settings, only: %i[index]
 
   scope '/settings', as: :settings do
     unless Docuseal.multitenant?

From edf2c0d9edd338c4ac5e1f1d8b1b44916302917e Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Thu, 30 Jul 2026 18:47:44 +0300
Subject: [PATCH 29/42] update gem

---
 Gemfile.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 15b1bbc8..d33024e4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -527,11 +527,11 @@ GEM
     simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
-    sqlite3 (2.9.2-aarch64-linux-gnu)
-    sqlite3 (2.9.2-aarch64-linux-musl)
-    sqlite3 (2.9.2-arm64-darwin)
-    sqlite3 (2.9.2-x86_64-linux-gnu)
-    sqlite3 (2.9.2-x86_64-linux-musl)
+    sqlite3 (2.9.5-aarch64-linux-gnu)
+    sqlite3 (2.9.5-aarch64-linux-musl)
+    sqlite3 (2.9.5-arm64-darwin)
+    sqlite3 (2.9.5-x86_64-linux-gnu)
+    sqlite3 (2.9.5-x86_64-linux-musl)
     strip_attributes (2.0.1)
       activemodel (>= 3.0, < 9.0)
     strscan (3.1.8)

From dba50cd1bfbae066987c5da62426b06df820ddd5 Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Thu, 30 Jul 2026 19:10:48 +0300
Subject: [PATCH 30/42] mobile fixes

---
 app/javascript/application.js                 | 16 ++++++++++++++
 app/javascript/template_builder/builder.vue   |  4 ++++
 .../_editor_toolbar.html.erb                  | 17 ++++++++-------
 app/views/shared/_classes.html.erb            |  2 +-
 app/views/shared/_navbar.html.erb             |  2 +-
 app/views/shared/_settings_nav.html.erb       |  6 +++---
 app/views/shared/_turbo_modal_large.html.erb  |  2 +-
 .../submissions/_send_email_base.html.erb     |  4 ++--
 app/views/templates/_template.html.erb        |  4 ++--
 app/views/templates/_title.html.erb           |  4 ++--
 app/views/templates/show.html.erb             | 20 +++++++++++-------
 config/locales/i18n.yml                       | 21 ++++++++++++-------
 12 files changed, 67 insertions(+), 35 deletions(-)

diff --git a/app/javascript/application.js b/app/javascript/application.js
index 9e14ff9b..6e8eec57 100644
--- a/app/javascript/application.js
+++ b/app/javascript/application.js
@@ -160,6 +160,7 @@ safeRegisterElement('history-back', HistoryBack)
 safeRegisterElement('template-builder', class extends HTMLElement {
   connectedCallback () {
     document.addEventListener('turbo:submit-end', this.onSubmit)
+    document.addEventListener('turbo:before-cache', this.onBeforeCache)
 
     this.appElem = document.createElement('div')
 
@@ -243,8 +244,14 @@ safeRegisterElement('template-builder', class extends HTMLElement {
     }
   }
 
+  onBeforeCache = () => {
+    this.app?.unmount()
+    this.appElem?.remove()
+  }
+
   disconnectedCallback () {
     document.removeEventListener('turbo:submit-end', this.onSubmit)
+    document.removeEventListener('turbo:before-cache', this.onBeforeCache)
 
     this.app?.unmount()
     this.appElem?.remove()
@@ -253,6 +260,8 @@ safeRegisterElement('template-builder', class extends HTMLElement {
 
 safeRegisterElement('import-list', class extends HTMLElement {
   connectedCallback () {
+    document.addEventListener('turbo:before-cache', this.onBeforeCache)
+
     this.appElem = document.createElement('div')
 
     this.app = createApp(ImportList, {
@@ -267,7 +276,14 @@ safeRegisterElement('import-list', class extends HTMLElement {
     this.appendChild(this.appElem)
   }
 
+  onBeforeCache = () => {
+    this.app?.unmount()
+    this.appElem?.remove()
+  }
+
   disconnectedCallback () {
+    document.removeEventListener('turbo:before-cache', this.onBeforeCache)
+
     this.app?.unmount()
     this.appElem?.remove()
   }
diff --git a/app/javascript/template_builder/builder.vue b/app/javascript/template_builder/builder.vue
index 8dd2208f..fca220ac 100644
--- a/app/javascript/template_builder/builder.vue
+++ b/app/javascript/template_builder/builder.vue
@@ -281,6 +281,10 @@
             :href="`/templates/${template.id}`"
             class="base-button"
           >
+            <IconX
+              width="20"
+              class="md:hidden stroke-2"
+            />
             <span class="hidden md:inline">
               {{ t('back') }}
             </span>
diff --git a/app/views/personalization_settings/_editor_toolbar.html.erb b/app/views/personalization_settings/_editor_toolbar.html.erb
index d6c58698..4e6c4185 100644
--- a/app/views/personalization_settings/_editor_toolbar.html.erb
+++ b/app/views/personalization_settings/_editor_toolbar.html.erb
@@ -1,21 +1,21 @@
 <div class="flex items-center px-2 py-2 border-b" style="height: 42px;">
   <div class="flex items-center gap-1">
-    <div class="tooltip tooltip-top before:text-xs" data-tip="<%= t('bold') %> (Ctrl+B)">
+    <div class="tooltip tooltip-top tooltip-no-touch before:text-xs" data-tip="<%= t('bold') %> (Ctrl+B)">
       <button type="button" data-action="click:<%= editor_tag %>#bold" data-target="<%= editor_tag %>.boldButton" aria-label="<%= t('bold') %>" class="flex items-center px-1 w-6 h-6 rounded hover:bg-base-300">
         <%= svg_icon('bold', class: 'w-4 h-4') %>
       </button>
     </div>
-    <div class="tooltip tooltip-top before:text-xs" data-tip="<%= t('italic') %> (Ctrl+I)">
+    <div class="tooltip tooltip-top tooltip-no-touch before:text-xs" data-tip="<%= t('italic') %> (Ctrl+I)">
       <button type="button" data-action="click:<%= editor_tag %>#italic" data-target="<%= editor_tag %>.italicButton" aria-label="<%= t('italic') %>" class="flex items-center px-1 w-6 h-6 rounded hover:bg-base-300">
         <%= svg_icon('italic', class: 'w-4 h-4') %>
       </button>
     </div>
-    <div class="tooltip tooltip-top before:text-xs" data-tip="<%= t('underline') %> (Ctrl+U)">
+    <div class="tooltip tooltip-top tooltip-no-touch before:text-xs" data-tip="<%= t('underline') %> (Ctrl+U)">
       <button type="button" data-action="click:<%= editor_tag %>#underline" data-target="<%= editor_tag %>.underlineButton" aria-label="<%= t('underline') %>" class="flex items-center px-1 w-6 h-6 rounded hover:bg-base-300">
         <%= svg_icon('underline', class: 'w-4 h-4') %>
       </button>
     </div>
-    <div class="tooltip tooltip-top before:text-xs" data-tip="<%= t('link') %> (Ctrl+K)">
+    <div class="tooltip tooltip-top tooltip-no-touch before:text-xs" data-tip="<%= t('link') %> (Ctrl+K)">
       <button type="button" data-action="click:<%= editor_tag %>#linkSelection" data-target="<%= editor_tag %>.linkButton" aria-label="<%= t('link') %>" class="flex items-center px-1 w-6 h-6 rounded hover:bg-base-300">
         <%= svg_icon('link', class: 'w-4 h-4') %>
       </button>
@@ -23,12 +23,12 @@
   </div>
   <div class="mx-2 h-5 border-l border-base-content/20"></div>
   <div class="flex items-center gap-1">
-    <div class="tooltip tooltip-top before:text-xs" data-tip="<%= t('undo') %> (Ctrl+Z)">
+    <div class="tooltip tooltip-top tooltip-no-touch before:text-xs" data-tip="<%= t('undo') %> (Ctrl+Z)">
       <button type="button" data-action="click:<%= editor_tag %>#undo" data-target="<%= editor_tag %>.undoButton" aria-label="<%= t('undo') %>" class="flex items-center px-1 w-6 h-6 rounded hover:bg-base-300">
         <%= svg_icon('arrow_back_up', class: 'w-4 h-4') %>
       </button>
     </div>
-    <div class="tooltip tooltip-top before:text-xs" data-tip="<%= t('redo') %> (Ctrl+Shift+Z)">
+    <div class="tooltip tooltip-top tooltip-no-touch before:text-xs" data-tip="<%= t('redo') %> (Ctrl+Shift+Z)">
       <button type="button" data-action="click:<%= editor_tag %>#redo" data-target="<%= editor_tag %>.redoButton" aria-label="<%= t('redo') %>" class="flex items-center px-1 w-6 h-6 rounded hover:bg-base-300">
         <%= svg_icon('arrow_forward_up', class: 'w-4 h-4') %>
       </button>
@@ -37,8 +37,9 @@
   <% if local_assigns[:variables]&.any? %>
     <% variable_labels = { 'account.name' => t('variables.account_name'), 'submitter.link' => t('variables.submitter_link'), 'template.name' => t('variables.template_name'), 'submission.submitters' => t('variables.submission_submitters'), 'submission.link' => t('variables.submission_link'), 'documents.link' => t('variables.documents_link') } %>
     <div class="dropdown dropdown-end ml-auto">
-      <label tabindex="0" class="flex items-center gap-1 text-sm px-2 py-1 rounded hover:bg-base-200 cursor-pointer">
-        <%= t('add_variable') %>
+      <label tabindex="0" class="flex items-center gap-1 text-sm px-2 py-1 rounded hover:bg-base-200 cursor-pointer whitespace-nowrap">
+        <span class="hidden sm:inline"><%= t('add_variable') %></span>
+        <span class="sm:hidden"><%= t('variable') %></span>
         <%= svg_icon('chevron_down', class: 'w-3.5 h-3.5') %>
       </label>
       <div tabindex="0" class="dropdown-content right-0 top-full mt-1 p-1 bg-white border border-neutral-200 rounded-lg shadow-lg z-50">
diff --git a/app/views/shared/_classes.html.erb b/app/views/shared/_classes.html.erb
index f4858dca..6a2b14a5 100644
--- a/app/views/shared/_classes.html.erb
+++ b/app/views/shared/_classes.html.erb
@@ -1 +1 @@
-<% 'stats stat stat-figure stat-title stat-value text-accent w-fit hover:bg-white dropdown-open border-base-content/30 before:border-base-content/30 order-none order-1 order-2 order-3 order-4 order-5' %>
+<% 'stats stat stat-figure stat-title stat-value text-accent w-fit hover:bg-white dropdown-open border-base-content/30 before:border-base-content/30 order-none order-1 order-2 order-3 order-4 order-5 lg:inline lg:hidden' %>
diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb
index 84536d97..6725711e 100644
--- a/app/views/shared/_navbar.html.erb
+++ b/app/views/shared/_navbar.html.erb
@@ -30,7 +30,7 @@
         <ul tabindex="0" class="z-10 dropdown-content p-2 mt-2 shadow menu text-base bg-base-100 rounded-box min-w-[160px] text-right">
           <li class="md:hidden">
             <%= link_to settings_path, class: 'flex items-center' do %>
-              <%= svg_icon('settings', class: 'w-5 h-5 flex-shrink-0 stroke-2') %>
+              <%= svg_icon('adjustments', class: 'w-5 h-5 flex-shrink-0 stroke-2') %>
               <span class="mr-1"><%= t('settings') %></span>
             <% end %>
           </li>
diff --git a/app/views/shared/_settings_nav.html.erb b/app/views/shared/_settings_nav.html.erb
index 52916ec4..f091df45 100644
--- a/app/views/shared/_settings_nav.html.erb
+++ b/app/views/shared/_settings_nav.html.erb
@@ -132,10 +132,10 @@
     </menu-active>
     <% if Docuseal.multitenant? || cannot?(:manage, :tenants) %>
       <div id="support_channels" class="mx-4 border-t border-base-300 <%= 'hidden md:block' unless expanded %>">
-        <div class="text-sm text-center mt-3">
+        <div class="text-sm mt-3">
           <%= t('need_help_ask_a_question_') %>
         </div>
-        <div class="flex justify-center mt-3 space-x-3">
+        <div class="flex mt-3 space-x-3">
           <div class="tooltip tooltip-no-touch" data-tip="GitHub">
             <a href="<%= Docuseal::GITHUB_URL %>" target="_blank" class="btn btn-circle btn-primary btn-md">
               <%= svg_icon('brand_github', class: 'w-8 h-8') %>
@@ -154,7 +154,7 @@
             </div>
           <% end %>
         </div>
-        <a href="mailto:<%= Docuseal::SUPPORT_EMAIL %>" target="_blank" class="w-full block mt-4 underline text-center">
+        <a href="mailto:<%= Docuseal::SUPPORT_EMAIL %>" target="_blank" class="w-full block mt-4 underline">
           <%= Docuseal::SUPPORT_EMAIL %>
         </a>
         <% if Docuseal.version.present? && !Docuseal.multitenant? && can?(:manage, EncryptedConfig) %>
diff --git a/app/views/shared/_turbo_modal_large.html.erb b/app/views/shared/_turbo_modal_large.html.erb
index 4c42fe56..0505b51e 100644
--- a/app/views/shared/_turbo_modal_large.html.erb
+++ b/app/views/shared/_turbo_modal_large.html.erb
@@ -24,7 +24,7 @@
         <%= local_assigns[:title] %>
       </span>
       <history-back>
-        <a href="#" class="text-xl">&times;</a>
+        <a href="#" class="text-xl block py-2 px-5 -my-2 -mr-5">&times;</a>
       </history-back>
     </div>
   <% end %>
diff --git a/app/views/submissions/_send_email_base.html.erb b/app/views/submissions/_send_email_base.html.erb
index 9830344d..4e640d70 100644
--- a/app/views/submissions/_send_email_base.html.erb
+++ b/app/views/submissions/_send_email_base.html.erb
@@ -45,8 +45,8 @@
 <% default_subject = template&.preferences&.dig('request_email_subject').presence || config.value['subject'] %>
 <% default_body = template&.preferences&.dig('request_email_body').presence || config_body %>
 <% is_edit_viewer = local_assigns[:submitter] && local_assigns[:viewer_submitter_uuids].include?(local_assigns[:submitter].uuid) %>
-<div id="<%= message_field_id %>" class="card card-compact bg-base-300/40 hidden">
-  <div class="card-body">
+<div id="<%= message_field_id %>" class="relative flex flex-col rounded-2xl md:bg-base-300/40 hidden">
+  <div class="flex flex-auto flex-col gap-2 md:text-sm md:p-4">
     <%= tag.input id: toggle_uuid = SecureRandom.uuid, value: '1', name: 'request_email_per_submitter', class: 'peer', type: 'checkbox', hidden: true, checked: local_assigns[:message_per_submitter] != false && template_submitters.size < 11 && template&.preferences&.dig('submitters').to_a.size > 1 %>
     <% if local_assigns[:viewer_submitter_uuids].present? && local_assigns[:submitter].blank? %>
       <% (template_submitters.pluck('uuid') - local_assigns[:viewer_submitter_uuids].to_a).each do |signer_uuid| %>
diff --git a/app/views/templates/_template.html.erb b/app/views/templates/_template.html.erb
index 79985645..1eac20ca 100644
--- a/app/views/templates/_template.html.erb
+++ b/app/views/templates/_template.html.erb
@@ -15,8 +15,8 @@
         <% end %>
       </p>
       <p class="flex text-xs text-base-content/60">
-        <span class="flex items-center space-x-1 w-1/2">
-          <%= svg_icon('calendar', class: 'w-4 h-4') %>
+        <span class="flex items-center space-x-1 w-1/2 whitespace-nowrap">
+          <%= svg_icon('calendar', class: 'w-4 h-4 flex-shrink-0') %>
           <span><%= l(template.created_at.in_time_zone(current_account.timezone), format: :short, locale: current_account.locale) %></span>
         </span>
         <% if local_assigns[:with_folder] %>
diff --git a/app/views/templates/_title.html.erb b/app/views/templates/_title.html.erb
index d420becf..d9446ebd 100644
--- a/app/views/templates/_title.html.erb
+++ b/app/views/templates/_title.html.erb
@@ -20,7 +20,7 @@
               </span>
             </a>
             <% if can?(:update, template) %>
-              <span class="pl-1 tooltip tooltip-right md:opacity-0 hover:opacity-100 peer-hover:opacity-100" data-tip="<%= t('move') %>">
+              <span class="pl-1 tooltip tooltip-right tooltip-no-touch md:opacity-0 hover:opacity-100 peer-hover:opacity-100" data-tip="<%= t('move') %>">
                 <a href="<%= edit_template_folder_path(template.id, subfolder: @template.folder.parent_folder.present?) %>" data-turbo-frame="modal">
                   <%= svg_icon('pencil_share', class: 'w-5 h-5') %>
                 </a>
@@ -44,7 +44,7 @@
     <% if !template.archived_at? %>
       <div class="flex items-center space-x-2">
         <% if can?(:update, template) %>
-          <div class="tooltip hidden md:block" data-tip="<%= t('preferences') %>">
+          <div class="tooltip tooltip-no-touch hidden md:block" data-tip="<%= t('preferences') %>">
             <%= link_to template_preferences_path(template), class: 'btn border border-base-200 bg-base-200 hover:bg-base-300 hover:border-base-300 btn-sm flex-1 hidden md:flex', data: { turbo_frame: :modal } do %>
               <span class="flex items-center justify-center space-x-2">
                 <%= svg_icon('adjustments_horizontal', class: 'w-6 h-6') %>
diff --git a/app/views/templates/show.html.erb b/app/views/templates/show.html.erb
index 500b11f0..abaab0e8 100644
--- a/app/views/templates/show.html.erb
+++ b/app/views/templates/show.html.erb
@@ -91,10 +91,12 @@
             <p><%= t('send_an_invitation_to_fill_and_complete_the_form') %></p>
             <div class="space-y-2 flex flex-col">
               <% if can?(:create, Submission) %>
-                <%= link_to new_template_submission_path(@template, with_link: true), id: 'send_to_recipients_button', class: 'base-button mt-6', data: { turbo_frame: 'modal' } do %>
-                  <%= svg_icon('plus', class: 'w-6 h-6 stroke-2') %>
-                  <span class="mr-1"><%= t('send_to_recipients') %></span>
-                <% end %>
+                <open-modal-mobile class="flex flex-col mt-6">
+                  <%= link_to new_template_submission_path(@template, with_link: true), id: 'send_to_recipients_button', class: 'base-button', data: { turbo_frame: 'modal' } do %>
+                    <%= svg_icon('plus', class: 'w-6 h-6 stroke-2') %>
+                    <span class="mr-1"><%= t('send_to_recipients') %></span>
+                  <% end %>
+                </open-modal-mobile>
               <% end %>
               <% if Templates.filter_undefined_submitters(@template.submitters).size == 1 && @template.variables_schema.blank? %>
                 <%= button_to start_form_path(@template.slug), params: { selfsign: true }, method: :put, class: 'white-button w-full', form: { style: 'display: inline', target: '_blank', data: { turbo: false } } do %>
@@ -102,10 +104,12 @@
                   <span class="mr-1"><%= t('sign_it_yourself') %></span>
                 <% end %>
               <% else %>
-                <%= link_to new_template_submission_path(@template, selfsign: true), id: 'sign_yourself_button', class: 'white-button mt-6', data: { turbo_frame: 'modal' } do %>
-                  <%= svg_icon('writing', class: 'w-6 h-6') %>
-                  <span class="mr-1"><%= t('sign_it_yourself') %></span>
-                <% end %>
+                <open-modal-mobile class="flex flex-col mt-6">
+                  <%= link_to new_template_submission_path(@template, selfsign: true), id: 'sign_yourself_button', class: 'white-button', data: { turbo_frame: 'modal' } do %>
+                    <%= svg_icon('writing', class: 'w-6 h-6') %>
+                    <span class="mr-1"><%= t('sign_it_yourself') %></span>
+                  <% end %>
+                </open-modal-mobile>
               <% end %>
             </div>
           </div>
diff --git a/config/locales/i18n.yml b/config/locales/i18n.yml
index 19e11f72..776aea52 100644
--- a/config/locales/i18n.yml
+++ b/config/locales/i18n.yml
@@ -473,7 +473,7 @@ en: &en
   back_to_active: Back to Active
   submissions: Submissions
   templates: Templates
-  document_templates_html: <span class="hidden md:inline">Document</span> Templates
+  document_templates_html: <span class="hidden lg:inline">Document</span> Templates
   archived: Archived
   search: Search
   submissions_not_found: Submissions not Found
@@ -965,6 +965,7 @@ en: &en
   undo: Undo
   redo: Redo
   add_variable: Add variable
+  variable: Variable
   enter_a_url_or_variable_name: Enter a URL or variable name
   new_token: New token
   token: Token
@@ -1572,7 +1573,7 @@ es: &es
   back_to_active: Volver a activo
   submissions: Envíos
   templates: Plantillas
-  document_templates_html: Plantillas <span class="hidden md:inline">de documento</span>
+  document_templates_html: Plantillas <span class="hidden lg:inline">de documento</span>
   archived: Archivado
   search: Buscar
   submissions_not_found: Envíos no encontrados
@@ -2061,6 +2062,7 @@ es: &es
   undo: Deshacer
   redo: Rehacer
   add_variable: Agregar variable
+  variable: Variable
   enter_a_url_or_variable_name: Ingrese una URL o nombre de variable
   new_token: Nuevo token
   token: Token
@@ -2668,7 +2670,7 @@ it: &it
   back_to_active: Torna attivo
   submissions: Invii
   templates: Modelli
-  document_templates_html: Modelli <span class="hidden md:inline">di documento</span>
+  document_templates_html: Modelli <span class="hidden lg:inline">di documento</span>
   archived: Archiviato
   search: Cerca
   submissions_not_found: Invii non trovati
@@ -3157,6 +3159,7 @@ it: &it
   undo: Annulla
   redo: Ripeti
   add_variable: Aggiungi variabile
+  variable: Variabile
   enter_a_url_or_variable_name: Inserisci un URL o nome variabile
   new_token: Nuovo token
   token: Token
@@ -3764,7 +3767,7 @@ fr: &fr
   back_to_active: Retour aux actifs
   submissions: Soumissions
   templates: Modèles
-  document_templates_html: Modèles <span class="hidden md:inline">de documents</span>
+  document_templates_html: Modèles <span class="hidden lg:inline">de documents</span>
   archived: Archivé
   search: Rechercher
   submissions_not_found: Soumissions introuvables
@@ -4250,6 +4253,7 @@ fr: &fr
   undo: Annuler
   redo: Rétablir
   add_variable: Ajouter une variable
+  variable: Variable
   enter_a_url_or_variable_name: Entrez une URL ou un nom de variable
   new_token: Nouveau jeton
   token: Jeton
@@ -4857,7 +4861,7 @@ pt: &pt
   back_to_active: Voltar para ativo
   submissions: Submissões
   templates: Modelos
-  document_templates_html: Modelos <span class="hidden md:inline">de documento</span>
+  document_templates_html: Modelos <span class="hidden lg:inline">de documento</span>
   archived: Arquivado
   search: Buscar
   submissions_not_found: Submissões não encontradas
@@ -5346,6 +5350,7 @@ pt: &pt
   undo: Desfazer
   redo: Refazer
   add_variable: Adicionar variável
+  variable: Variável
   enter_a_url_or_variable_name: Digite uma URL ou nome de variável
   new_token: Novo token
   token: Token
@@ -5953,7 +5958,7 @@ de: &de
   back_to_active: Zurück zu Aktiv
   submissions: Einreichungen
   templates: Vorlagen
-  document_templates_html: <span class="md:hidden">Vorlagen</span><span class="hidden md:inline">Dokumentvorlagen</span>
+  document_templates_html: <span class="lg:hidden">Vorlagen</span><span class="hidden lg:inline">Dokumentvorlagen</span>
   archived: Archiviert
   search: Suchen
   submissions_not_found: Einreichungen nicht gefunden
@@ -6442,6 +6447,7 @@ de: &de
   undo: Rückgängig
   redo: Wiederholen
   add_variable: Variable hinzufügen
+  variable: Variable
   enter_a_url_or_variable_name: Geben Sie eine URL oder einen Variablennamen ein
   new_token: Neues Token
   token: Token
@@ -7454,7 +7460,7 @@ nl: &nl
   back_to_active: Terug naar Actief
   submissions: Inzendingen
   templates: Sjablonen
-  document_templates_html: <span class="md:hidden">Sjablonen</span><span class="hidden md:inline">Documentsjablonen</span>
+  document_templates_html: <span class="lg:hidden">Sjablonen</span><span class="hidden lg:inline">Documentsjablonen</span>
   archived: Gearchiveerd
   search: Zoeken
   submissions_not_found: Geen inzendingen gevonden
@@ -7939,6 +7945,7 @@ nl: &nl
   undo: Ongedaan maken
   redo: Opnieuw
   add_variable: Variabele toevoegen
+  variable: Variabele
   enter_a_url_or_variable_name: Voer een URL of variabelenaam in
   new_token: Nieuw token
   token: Token

From c67d37207e5d15b3d5828ef7bc7c167fbff7aaba Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Thu, 30 Jul 2026 20:51:46 +0300
Subject: [PATCH 31/42] update deps

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index d33024e4..e56e0f7f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -344,7 +344,7 @@ GEM
     orm_adapter (0.5.0)
     os (1.1.4)
     package_json (0.2.0)
-    pagy (43.4.4)
+    pagy (43.6.1)
       json
       uri
       yaml

From 2fc1ba3037fc28c1c7a548dec600e60f2520f347 Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Fri, 31 Jul 2026 09:23:18 +0300
Subject: [PATCH 32/42] fix layout

---
 app/views/templates/_template.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/templates/_template.html.erb b/app/views/templates/_template.html.erb
index 1eac20ca..8b96126e 100644
--- a/app/views/templates/_template.html.erb
+++ b/app/views/templates/_template.html.erb
@@ -15,12 +15,12 @@
         <% end %>
       </p>
       <p class="flex text-xs text-base-content/60">
-        <span class="flex items-center space-x-1 w-1/2 whitespace-nowrap">
+        <span class="flex items-center space-x-1 w-1/2 md:w-2/3 lg:w-1/2 whitespace-nowrap">
           <%= svg_icon('calendar', class: 'w-4 h-4 flex-shrink-0') %>
           <span><%= l(template.created_at.in_time_zone(current_account.timezone), format: :short, locale: current_account.locale) %></span>
         </span>
         <% if local_assigns[:with_folder] %>
-          <span class="flex items-center space-x-1 w-1/2">
+          <span class="flex items-center space-x-1 w-1/2 md:w-1/3 lg:w-1/2">
             <%= svg_icon('folder', class: 'w-4 h-4 flex-shrink-0') %>
             <span class="truncate"><%= template.folder.full_name %></span>
           </span>

From b96fe74db18fc8ea2f80d754edc215fae16bf416 Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Fri, 31 Jul 2026 10:46:24 +0300
Subject: [PATCH 33/42] adjust filters

---
 app/views/shared/_classes.html.erb            |  2 +-
 app/views/submissions_archived/index.html.erb |  2 +-
 .../_applied_filters.html.erb                 | 54 ++++++++++++++-----
 .../_filter_button.html.erb                   |  8 +--
 app/views/submissions_filters/status.html.erb |  6 +--
 .../index.html.erb                            |  6 +--
 6 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/app/views/shared/_classes.html.erb b/app/views/shared/_classes.html.erb
index 6a2b14a5..e36c5fe5 100644
--- a/app/views/shared/_classes.html.erb
+++ b/app/views/shared/_classes.html.erb
@@ -1 +1 @@
-<% 'stats stat stat-figure stat-title stat-value text-accent w-fit hover:bg-white dropdown-open border-base-content/30 before:border-base-content/30 order-none order-1 order-2 order-3 order-4 order-5 lg:inline lg:hidden' %>
+<% 'stats stat stat-figure stat-title stat-value text-accent w-fit hover:bg-white dropdown-open border-base-content/30 before:border-base-content/30 order-1 order-2 order-3 order-4 order-5 lg:inline lg:hidden' %>
diff --git a/app/views/submissions_archived/index.html.erb b/app/views/submissions_archived/index.html.erb
index 67380d50..a51b8099 100644
--- a/app/views/submissions_archived/index.html.erb
+++ b/app/views/submissions_archived/index.html.erb
@@ -17,7 +17,7 @@
     </div>
   </div>
   <div class="flex items-center md:items-end gap-2">
-    <%= render 'submissions_filters/applied_filters', filter_params: %>
+    <%= render 'submissions_filters/applied_filters', filter_params:, with_status: true %>
     <%= render 'submissions_filters/filter_button', filter_params: %>
   </div>
 </div>
diff --git a/app/views/submissions_filters/_applied_filters.html.erb b/app/views/submissions_filters/_applied_filters.html.erb
index 07cc0049..5cfd4063 100644
--- a/app/views/submissions_filters/_applied_filters.html.erb
+++ b/app/views/submissions_filters/_applied_filters.html.erb
@@ -3,20 +3,15 @@
 <% ordered_filters = request.query_parameters.keys.filter_map { |key| filter_names.find { |name| key.start_with?(name) } }.uniq %>
 <% chip_order = ordered_filters.reverse.each_with_index.to_h { |name, index| [name, index + 1] } %>
 <% chip_order.default = ordered_filters.size + 1 %>
-<scroll-fade class="flex items-center gap-2 overflow-x-auto flex-1 min-w-0 [scrollbar-width:none] [&::-webkit-scrollbar]:hidden [&::-webkit-scrollbar]:h-0 [&::-webkit-scrollbar]:w-0 md:contents">
-  <% if local_assigns[:with_status] %>
-    <% status_icons = { 'all' => 'list', 'pending' => 'clock', 'completed' => 'circle_check', 'partially_completed' => 'clock_edit', 'sent' => 'send', 'opened' => 'mail_opened', 'declined' => 'x_circle', 'expired' => 'clock_cancel' } %>
-    <% current_status = status_icons.key?(params[:status].to_s) ? params[:status] : 'all' %>
-    <a href="<%= submissions_filter_path('status', query_params.merge(path: url_for)) %>" data-turbo-frame="modal" class="order-<%= current_status == 'all' ? 'none' : chip_order['status'] %> md:hidden flex h-10 px-2 py-1 space-x-1 text-base items-center border text-neutral rounded-xl shrink-0 <%= current_status == 'all' ? 'border-neutral-300' : 'border-neutral-700' %>">
-      <%= svg_icon(status_icons[current_status], class: 'w-5 h-5 shrink-0') %>
-      <span><%= t(current_status) %></span>
-      <%= svg_icon('chevron_down', class: 'w-4 h-4 shrink-0') %>
-    </a>
-  <% end %>
-  <% if icon = { 'declined' => 'x_circle', 'expired' => 'clock_cancel', 'partially_completed' => 'clock_edit', 'sent' => 'send', 'opened' => 'mail_opened' }[params[:status]] %>
-    <div class="order-<%= chip_order['status'] %> md:order-none <%= 'hidden md:flex' if local_assigns[:with_status] %> flex h-10 px-2 py-1 text-base md:text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl shrink-0 max-w-[60vw] md:w-36 border-neutral-700">
+<% status_icon = { 'declined' => 'x_circle', 'expired' => 'clock_cancel', 'partially_completed' => 'clock_edit', 'sent' => 'send', 'opened' => 'mail_opened' }[params[:status]] %>
+<% status_icons = { 'all' => 'list', 'pending' => 'clock', 'completed' => 'circle_check' } %>
+<% current_status = status_icons.key?(params[:status].to_s) ? params[:status].to_s : 'all' %>
+<% with_status_button = local_assigns[:with_status] && status_icon.blank? %>
+<% chips_html = capture do %>
+  <% if status_icon %>
+    <div class="order-none flex h-10 px-2 py-1 text-base md:text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl shrink-0 max-w-[60vw] md:w-36 border-neutral-700">
       <%= link_to submissions_filter_path('status', query_params.merge(path: url_for, with_remove: true)), data: { turbo_frame: 'modal' }, class: 'flex items-center space-x-1 flex-1 min-w-0 pr-1' do %>
-        <%= svg_icon(icon, class: 'w-5 h-5 shrink-0') %>
+        <%= svg_icon(status_icon, class: 'w-5 h-5 shrink-0') %>
         <span class="font-normal truncate"><%= t(params[:status]) %></span>
       <% end %>
       <%= link_to url_for(params: request.query_parameters.except('status')), class: 'rounded-lg ml-1 shrink-0 hover:bg-base-content hover:text-white' do %>
@@ -82,4 +77,35 @@
       <% end %>
     </div>
   <% end %>
-</scroll-fade>
+<% end %>
+<% if with_status_button && chips_html.blank? %>
+  <div class="dropdown md:hidden shrink-0">
+    <label tabindex="0" class="cursor-pointer flex h-10 px-2 py-1 space-x-1 text-base items-center border text-neutral rounded-xl <%= current_status == 'all' ? 'border-neutral-300' : 'border-neutral-700' %>">
+      <%= svg_icon(status_icons[current_status], class: 'w-5 h-5 shrink-0') %>
+      <span><%= t(current_status) %></span>
+      <%= svg_icon('chevron_down', class: 'w-4 h-4 shrink-0') %>
+    </label>
+    <ul tabindex="0" class="z-10 dropdown-content p-2 mt-2 shadow menu text-base bg-base-100 rounded-box min-w-[180px]">
+      <% { 'all' => request.query_parameters.except('status'), 'pending' => request.query_parameters.merge('status' => 'pending'), 'completed' => request.query_parameters.merge('status' => 'completed') }.each do |status, status_params| %>
+        <li>
+          <%= link_to url_for(params: status_params), class: ('bg-base-200' if current_status == status) do %>
+            <%= svg_icon(status_icons[status], class: 'w-5 h-5 shrink-0') %>
+            <span><%= t(status) %></span>
+          <% end %>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>
+<% if chips_html.present? %>
+  <scroll-fade class="flex items-center gap-2 overflow-x-auto flex-1 min-w-0 [scrollbar-width:none] [&::-webkit-scrollbar]:hidden [&::-webkit-scrollbar]:h-0 [&::-webkit-scrollbar]:w-0 md:contents">
+    <% if with_status_button %>
+      <a href="<%= submissions_filter_path('status', query_params.merge(path: url_for)) %>" data-turbo-frame="modal" class="order-none md:hidden flex h-10 px-2 py-1 space-x-1 text-base items-center border text-neutral rounded-xl shrink-0 <%= current_status == 'all' ? 'border-neutral-300' : 'border-neutral-700' %>">
+        <%= svg_icon(status_icons[current_status], class: 'w-5 h-5 shrink-0') %>
+        <span><%= t(current_status) %></span>
+        <%= svg_icon('chevron_down', class: 'w-4 h-4 shrink-0') %>
+      </a>
+    <% end %>
+    <%= chips_html %>
+  </scroll-fade>
+<% end %>
diff --git a/app/views/submissions_filters/_filter_button.html.erb b/app/views/submissions_filters/_filter_button.html.erb
index ec20c1ee..601b2d02 100644
--- a/app/views/submissions_filters/_filter_button.html.erb
+++ b/app/views/submissions_filters/_filter_button.html.erb
@@ -1,9 +1,11 @@
 <% query_params = params.permit(:q).merge(filter_params) %>
 <% advanced_filters = filter_params.then { |f| f[:status].in?(%w[pending completed]) ? f.except(:status) : f } %>
 <div class="dropdown dropdown-end shrink-0">
-  <label tabindex="0" class="cursor-pointer flex h-10 py-1 w-10 md:w-auto px-0 md:px-3 space-x-0 md:space-x-1 justify-center md:justify-between text-lg items-center border text-center text-neutral rounded-xl <%= advanced_filters.present? ? 'border-neutral-700 md:border-neutral-300' : 'border-neutral-300' %> hover:border-neutral-700">
+  <label tabindex="0" class="cursor-pointer flex h-10 py-1 text-lg items-center border text-center text-neutral rounded-xl hover:border-neutral-700 <%= advanced_filters.present? ? 'w-10 md:w-auto px-0 md:px-3 space-x-0 md:space-x-1 justify-center md:justify-between border-neutral-700 md:border-neutral-300' : 'px-3 space-x-1 justify-between border-neutral-300' %>">
     <%= svg_icon('filter', class: 'w-5 h-5 flex-shrink-0 stroke-2') %>
-    <span class="hidden <%= 'md:inline' if advanced_filters.blank? %>">Filter</span>
+    <% if advanced_filters.blank? %>
+      <span>Filter</span>
+    <% end %>
   </label>
   <ul tabindex="0" class="z-10 dropdown-content p-2 mt-2 shadow menu text-base bg-base-100 rounded-box min-w-[180px] text-right">
     <li class="flex">
@@ -18,7 +20,7 @@
         <span><%= t('created_at') %></span>
       <% end %>
     </li>
-    <li class="hidden md:flex">
+    <li class="flex">
       <%= link_to submissions_filter_path('status', query_params.merge(path: url_for)), data: { turbo_frame: 'modal' } do %>
         <%= svg_icon('info_circle', class: 'w-5 h-5 flex-shrink-0 stroke-2') %>
         <span><%= t('status') %></span>
diff --git a/app/views/submissions_filters/status.html.erb b/app/views/submissions_filters/status.html.erb
index 7cb91b57..872e30a1 100644
--- a/app/views/submissions_filters/status.html.erb
+++ b/app/views/submissions_filters/status.html.erb
@@ -3,9 +3,9 @@
     <div class="form-control w-full">
       <div id="status" class="radio-select grid grid-cols-2 gap-2 px-1">
         <% ['', 'pending', 'completed', 'partially_completed', 'sent', 'opened', 'declined', 'expired'].each do |status| %>
-          <label class="radio-label cursor-pointer inline-flex items-center space-x-2">
-            <%= radio_button_tag 'status', status, params[:status] == status || (status == '' && params[:status].blank?), class: 'base-radio' %>
-            <span><%= t(status.presence || 'all') %></span>
+          <label class="radio-label cursor-pointer inline-flex items-center space-x-2 min-w-0">
+            <%= radio_button_tag 'status', status, params[:status] == status || (status == '' && params[:status].blank?), class: 'base-radio shrink-0' %>
+            <span class="truncate"><%= t(status.presence || 'all') %></span>
           </label>
         <% end %>
       </div>
diff --git a/app/views/templates_archived_submissions/index.html.erb b/app/views/templates_archived_submissions/index.html.erb
index 66097795..4bbf24c9 100644
--- a/app/views/templates_archived_submissions/index.html.erb
+++ b/app/views/templates_archived_submissions/index.html.erb
@@ -18,9 +18,9 @@
       <% end %>
     </div>
   </div>
-  <div class="flex flex-nowrap md:flex-wrap justify-end items-center gap-2">
-    <%= render 'submissions_filters/applied_filters', filter_params: %>
-    <div class="shrink-0 md:order-first">
+  <div class="flex flex-nowrap md:flex-wrap md:justify-end items-center gap-2">
+    <%= render 'submissions_filters/applied_filters', filter_params:, with_status: true %>
+    <div class="hidden md:block shrink-0 md:order-first">
       <%= link_to new_template_submissions_export_path(@template, archived: true), class: 'btn btn-ghost text-base h-10 min-h-10', data: { turbo_frame: 'modal' } do %>
         <%= svg_icon('download', class: 'w-6 h-6 stroke-2') %>
         <span class="hidden md:inline"><%= t('export') %></span>

From 55089bee7f5dce2913f9b446c6ff50ab2023c4c1 Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Fri, 31 Jul 2026 10:53:34 +0300
Subject: [PATCH 34/42] adjust pagination

---
 app/views/shared/_pagination.html.erb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/views/shared/_pagination.html.erb b/app/views/shared/_pagination.html.erb
index 4e3fcad3..bf51e8e2 100644
--- a/app/views/shared/_pagination.html.erb
+++ b/app/views/shared/_pagination.html.erb
@@ -1,13 +1,12 @@
 <% if pagy.pages > 1 %>
-  <% left_additional_html = local_assigns[:left_additional_html] %>
-  <div class="flex my-6 items-center <%= left_additional_html.present? ? 'justify-between' : 'justify-center md:justify-between' %>">
-    <div class="text-sm <%= 'hidden md:block' if left_additional_html.blank? %>">
+  <div class="flex my-6 items-center justify-between">
+    <div class="text-sm">
       <% if pagy.count.nil? %>
         <%= t("pagination.#{local_assigns.fetch(:items_name, 'items')}.range_without_total", from: local_assigns.fetch(:from, pagy.from), to: local_assigns.fetch(:to, pagy.to)) %>
       <% else %>
         <%= t("pagination.#{local_assigns.fetch(:items_name, 'items')}.range_with_total", from: local_assigns.fetch(:from, pagy.from), to: local_assigns.fetch(:to, pagy.to), count: local_assigns.fetch(:count, pagy.count)) %>
       <% end %>
-      <%= left_additional_html %>
+      <%= local_assigns[:left_additional_html] %>
     </div>
     <div class="flex items-center space-x-1.5">
       <%= local_assigns[:right_additional_html] %>

From 0d197bb2ebb4c90880d1777fc89e7d9ed9923e17 Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Fri, 31 Jul 2026 10:57:37 +0300
Subject: [PATCH 35/42] fix mobile modal

---
 app/javascript/elements/open_modal_mobile.js   | 1 +
 app/views/submissions_dashboard/index.html.erb | 2 +-
 app/views/template_folders/show.html.erb       | 2 +-
 app/views/templates_dashboard/index.html.erb   | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/javascript/elements/open_modal_mobile.js b/app/javascript/elements/open_modal_mobile.js
index a9d45ed4..4096f1f6 100644
--- a/app/javascript/elements/open_modal_mobile.js
+++ b/app/javascript/elements/open_modal_mobile.js
@@ -1,5 +1,6 @@
 export default class extends HTMLElement {
   connectedCallback () {
+    if (this.dataset.disabled === 'true') return
     if (!this.isMobile()) return
     if (window.innerWidth >= 768) return
 
diff --git a/app/views/submissions_dashboard/index.html.erb b/app/views/submissions_dashboard/index.html.erb
index 5b8a0a71..9bfaf39a 100644
--- a/app/views/submissions_dashboard/index.html.erb
+++ b/app/views/submissions_dashboard/index.html.erb
@@ -18,7 +18,7 @@
       <span class="hidden sm:block">
         <%= render 'templates/upload_button' %>
       </span>
-      <open-modal-mobile class="flex">
+      <open-modal-mobile data-disabled="<%= !Docuseal.multitenant? %>" class="flex">
         <%= link_to new_template_path, class: 'white-button !border gap-2', data: { turbo_frame: :modal } do %>
           <%= svg_icon('plus', class: 'w-6 h-6 stroke-2') %>
           <span class="hidden md:block"><%= t('create') %></span>
diff --git a/app/views/template_folders/show.html.erb b/app/views/template_folders/show.html.erb
index d5557117..dd70e3fa 100644
--- a/app/views/template_folders/show.html.erb
+++ b/app/views/template_folders/show.html.erb
@@ -37,7 +37,7 @@
         <span class="hidden sm:block">
           <%= render 'templates/upload_button', folder_name: @template_folder.full_name %>
         </span>
-        <open-modal-mobile class="flex">
+        <open-modal-mobile data-disabled="<%= !Docuseal.multitenant? %>" class="flex">
           <%= link_to new_template_path(folder_name: @template_folder.full_name), class: 'white-button !border gap-2', data: { turbo_frame: :modal } do %>
             <%= svg_icon('plus', class: 'w-6 h-6 stroke-2') %>
             <span class="hidden md:block"><%= t('create') %></span>
diff --git a/app/views/templates_dashboard/index.html.erb b/app/views/templates_dashboard/index.html.erb
index 8ab97431..5406bf68 100644
--- a/app/views/templates_dashboard/index.html.erb
+++ b/app/views/templates_dashboard/index.html.erb
@@ -30,7 +30,7 @@
         <span class="hidden sm:block">
           <%= render 'templates/upload_button' %>
         </span>
-        <open-modal-mobile class="flex">
+        <open-modal-mobile data-disabled="<%= !Docuseal.multitenant? %>" class="flex">
           <%= link_to new_template_path, class: 'white-button !border gap-2', data: { turbo_frame: :modal } do %>
             <%= svg_icon('plus', class: 'w-6 h-6 stroke-2') %>
             <span class="hidden md:block"><%= t('create') %></span>

From e2ffbdac1dfbec859df4bdea6e14efeb7d3a4d46 Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Fri, 31 Jul 2026 11:43:40 +0300
Subject: [PATCH 36/42] update gem

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e56e0f7f..0d7b7624 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -309,7 +309,7 @@ GEM
     minitest (6.0.6)
       drb (~> 2.0)
       prism (~> 1.5)
-    msgpack (1.8.0)
+    msgpack (1.8.4)
     multi_json (1.19.1)
     net-http (0.9.1)
       uri (>= 0.11.1)

From c4b7be3925f1ed0c02c0bc1eef31b5b3fd0787f5 Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Fri, 31 Jul 2026 12:46:34 +0300
Subject: [PATCH 37/42] fix mobile tabs

---
 app/views/templates_preferences/show.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/templates_preferences/show.html.erb b/app/views/templates_preferences/show.html.erb
index df67e61b..5ef07981 100644
--- a/app/views/templates_preferences/show.html.erb
+++ b/app/views/templates_preferences/show.html.erb
@@ -3,14 +3,14 @@
   <% show_recipients = @template.submitters.to_a.length > 1 %>
   <% options = [[t('general'), 'general']] %>
   <% options << [t('recipients'), 'recipients'] if show_recipients %>
-  <% options << [t('api_and_embedding'), 'api'] if show_api %>
+  <% options << [safe_join([tag.span('API', class: 'md:hidden'), tag.span(t('api_and_embedding'), class: 'hidden md:inline')]), 'api'] if show_api %>
   <% if options.size > 1 %>
     <toggle-visible data-element-ids="<%= options.map(&:last).to_json %>" class="relative text-center mt-3 block">
       <div class="join">
         <% options.each_with_index do |(label, value), index| %>
           <span>
             <%= radio_button_tag 'option', value, value == 'general', class: 'peer hidden', data: { action: 'change:toggle-visible#trigger' } %>
-            <label for="option_<%= value %>" class="<%= '!rounded-s-full' if index.zero? %> btn btn-sm join-item peer-checked:btn-active normal-case <%= 'px-8 md:px-0' if value.in?(%w[general recipients]) %> <%= options.size > 2 ? 'md:w-44' : 'md:w-48' %>">
+            <label for="option_<%= value %>" class="<%= '!rounded-s-full' if index.zero? %> btn btn-sm join-item peer-checked:btn-active normal-case px-8 md:px-0 <%= 'min-w-28 md:min-w-0' if value == 'api' %> <%= options.size > 2 ? 'md:w-44' : 'md:w-48' %>">
               <%= label %>
             </label>
           </span>

From 2876c9a18e49a00655fa312e4cfaf4404e705c26 Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Sat, 1 Aug 2026 08:38:49 +0300
Subject: [PATCH 38/42] adjust pagination

---
 app/views/shared/_pagination.html.erb | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/views/shared/_pagination.html.erb b/app/views/shared/_pagination.html.erb
index bf51e8e2..71bcef1c 100644
--- a/app/views/shared/_pagination.html.erb
+++ b/app/views/shared/_pagination.html.erb
@@ -1,14 +1,17 @@
 <% if pagy.pages > 1 %>
-  <div class="flex my-6 items-center justify-between">
-    <div class="text-sm">
-      <% if pagy.count.nil? %>
-        <%= t("pagination.#{local_assigns.fetch(:items_name, 'items')}.range_without_total", from: local_assigns.fetch(:from, pagy.from), to: local_assigns.fetch(:to, pagy.to)) %>
-      <% else %>
-        <%= t("pagination.#{local_assigns.fetch(:items_name, 'items')}.range_with_total", from: local_assigns.fetch(:from, pagy.from), to: local_assigns.fetch(:to, pagy.to), count: local_assigns.fetch(:count, pagy.count)) %>
-      <% end %>
-      <%= local_assigns[:left_additional_html] %>
+  <% left_additional_html = local_assigns[:left_additional_html] %>
+  <div class="flex flex-col md:flex-row md:items-center <%= left_additional_html.present? ? 'mt-3' : 'mt-6' %> mb-6 md:my-6 justify-center md:justify-between">
+    <div class="text-sm <%= 'mb-2 md:mb-0' if left_additional_html.present? %>">
+      <span class="hidden md:inline">
+        <% if pagy.count.nil? %>
+          <%= t("pagination.#{local_assigns.fetch(:items_name, 'items')}.range_without_total", from: local_assigns.fetch(:from, pagy.from), to: local_assigns.fetch(:to, pagy.to)) %>
+        <% else %>
+          <%= t("pagination.#{local_assigns.fetch(:items_name, 'items')}.range_with_total", from: local_assigns.fetch(:from, pagy.from), to: local_assigns.fetch(:to, pagy.to), count: local_assigns.fetch(:count, pagy.count)) %>
+        <% end %>
+      </span>
+      <%= left_additional_html %>
     </div>
-    <div class="flex items-center space-x-1.5">
+    <div class="flex items-center space-x-1.5 justify-center md:justify-end">
       <%= local_assigns[:right_additional_html] %>
       <div class="join">
         <% if pagy.previous %>

From 03b5956cbc0e5278de09a2e96d5f66a4301921c4 Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Sat, 1 Aug 2026 13:30:38 +0300
Subject: [PATCH 39/42] bcc limit

---
 app/jobs/process_submitter_completion_job.rb | 21 +++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/jobs/process_submitter_completion_job.rb b/app/jobs/process_submitter_completion_job.rb
index 129b2363..897ff350 100644
--- a/app/jobs/process_submitter_completion_job.rb
+++ b/app/jobs/process_submitter_completion_job.rb
@@ -3,6 +3,9 @@
 class ProcessSubmitterCompletionJob
   include Sidekiq::Job
 
+  BCC_LIMIT = 14
+  TooManyBcc = Class.new(StandardError)
+
   def perform(params = {})
     submitter = Submitter.find(params['submitter_id'])
     submission = submitter.submission
@@ -133,16 +136,24 @@ class ProcessSubmitterCompletionJob
           true
         end
 
-      build_bcc_addresses(submission).each do |to|
-        next if is_sent_to_user && to == user.email
-
-        SubmitterMailer.completed_email(submitter, user, to:).deliver_later!
-      end
+      enqueue_bcc_completed_emails(submitter, user, is_sent_to_user)
     end
 
     maybe_enqueue_copy_emails(submitter)
   end
 
+  def enqueue_bcc_completed_emails(submitter, user, is_sent_to_user)
+    bcc_addresses = build_bcc_addresses(submitter.submission)
+
+    raise TooManyBcc, submitter.account_id if Docuseal.multitenant? && bcc_addresses.size > BCC_LIMIT
+
+    bcc_addresses.each do |to|
+      next if is_sent_to_user && to == user.email
+
+      SubmitterMailer.completed_email(submitter, user, to:).deliver_later!
+    end
+  end
+
   def maybe_enqueue_copy_emails(submitter)
     return if submitter.template&.preferences&.dig('documents_copy_email_enabled') == false
 

From 784ae9aa4b042a7b0b88a91c8e48c7ac53111950 Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Mon, 3 Aug 2026 08:05:26 +0300
Subject: [PATCH 40/42] fix dynamic document preview

---
 .../templates_form_preview_controller.rb            |  2 ++
 app/javascript/template_builder/builder.vue         | 13 +++++++++++--
 lib/submissions/create_from_submitters.rb           |  6 +++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/controllers/templates_form_preview_controller.rb b/app/controllers/templates_form_preview_controller.rb
index f5c1d7a6..fef1be33 100644
--- a/app/controllers/templates_form_preview_controller.rb
+++ b/app/controllers/templates_form_preview_controller.rb
@@ -13,6 +13,8 @@ class TemplatesFormPreviewController < ApplicationController
 
     @submitter.submission.submitters = @template.submitters.map { |item| Submitter.new(uuid: item['uuid']) }
 
+    Submissions::CreateFromSubmitters.maybe_set_dynamic_documents(@submitter.submission, preview: true)
+
     Submissions.preload_with_pages(@submitter.submission)
 
     @attachments_index = ActiveStorage::Attachment.where(record: @submitter.submission.submitters, name: :attachments)
diff --git a/app/javascript/template_builder/builder.vue b/app/javascript/template_builder/builder.vue
index fca220ac..0b49de40 100644
--- a/app/javascript/template_builder/builder.vue
+++ b/app/javascript/template_builder/builder.vue
@@ -202,7 +202,7 @@
             </button>
             <div
               class="dropdown dropdown-end"
-              :class="{ 'dropdown-open': isDownloading }"
+              :class="{ 'dropdown-open': isDownloading || isPreviewLoading }"
             >
               <label
                 tabindex="0"
@@ -221,8 +221,16 @@
                     :href="`/templates/${template.id}/form`"
                     data-turbo="false"
                     class="flex items-center justify-center space-x-2"
+                    @click.exact="isPreviewLoading = true"
                   >
-                    <IconEye class="w-6 h-6 flex-shrink-0" />
+                    <IconInnerShadowTop
+                      v-if="isPreviewLoading"
+                      class="animate-spin w-6 h-6 flex-shrink-0"
+                    />
+                    <IconEye
+                      v-else
+                      class="w-6 h-6 flex-shrink-0"
+                    />
                     <span class="whitespace-nowrap">{{ t('save_and_preview') }}</span>
                   </a>
                 </li>
@@ -1122,6 +1130,7 @@ export default {
       documentRefs: [],
       isBreakpointLg: false,
       isDownloading: false,
+      isPreviewLoading: false,
       isLoadingBlankPage: false,
       isSaving: false,
       isDetectingPageFields: false,
diff --git a/lib/submissions/create_from_submitters.rb b/lib/submissions/create_from_submitters.rb
index 7332ce9b..10117e33 100644
--- a/lib/submissions/create_from_submitters.rb
+++ b/lib/submissions/create_from_submitters.rb
@@ -130,13 +130,13 @@ module Submissions
       submission
     end
 
-    def maybe_set_dynamic_documents(submission)
+    def maybe_set_dynamic_documents(submission, preview: false)
       return submission unless submission.template_id?
 
       template = submission.template
 
-      return submission if template.variables_schema.present? ||
-                           submission.variables_schema.present?
+      return submission if !preview && (template.variables_schema.present? ||
+                                        submission.variables_schema.present?)
 
       return submission if template.schema.none? { |e| e['dynamic'] }
 

From b05c3b20300fc80abff057b683efa478c7c46442 Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Mon, 3 Aug 2026 09:41:08 +0300
Subject: [PATCH 41/42] fix autocomplete

---
 lib/submitters.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/submitters.rb b/lib/submitters.rb
index a310bbf6..09852001 100644
--- a/lib/submitters.rb
+++ b/lib/submitters.rb
@@ -49,7 +49,7 @@ module Submitters
   end
 
   def fulltext_search_field(current_user, submitters, keyword, field_name)
-    keyword = keyword.delete("\0")
+    keyword = keyword.delete("\0\\")
 
     return submitters.none if keyword.blank?
 

From 4d68783b824747ece775fba0a33898cecc934923 Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Mon, 3 Aug 2026 10:05:09 +0300
Subject: [PATCH 42/42] add counters

---
 .../_applied_filters.html.erb                 | 41 +++++++++++++++----
 .../_filter_button.html.erb                   |  2 +-
 app/views/templates/show.html.erb             |  8 ++--
 3 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/app/views/submissions_filters/_applied_filters.html.erb b/app/views/submissions_filters/_applied_filters.html.erb
index 5cfd4063..35323184 100644
--- a/app/views/submissions_filters/_applied_filters.html.erb
+++ b/app/views/submissions_filters/_applied_filters.html.erb
@@ -85,15 +85,40 @@
       <span><%= t(current_status) %></span>
       <%= svg_icon('chevron_down', class: 'w-4 h-4 shrink-0') %>
     </label>
-    <ul tabindex="0" class="z-10 dropdown-content p-2 mt-2 shadow menu text-base bg-base-100 rounded-box min-w-[180px]">
-      <% { 'all' => request.query_parameters.except('status'), 'pending' => request.query_parameters.merge('status' => 'pending'), 'completed' => request.query_parameters.merge('status' => 'completed') }.each do |status, status_params| %>
-        <li>
-          <%= link_to url_for(params: status_params), class: ('bg-base-200' if current_status == status) do %>
-            <%= svg_icon(status_icons[status], class: 'w-5 h-5 shrink-0') %>
-            <span><%= t(status) %></span>
+    <ul tabindex="0" class="z-10 dropdown-content p-2 mt-2 shadow menu text-base bg-base-100 rounded-box" style="min-width: 180px;">
+      <li>
+        <%= link_to url_for(params: request.query_parameters.except('status')), class: ('bg-base-200' if current_status == 'all') do %>
+          <%= svg_icon('list', class: 'w-5 h-5 shrink-0') %>
+          <span><%= t('all') %></span>
+          <% if local_assigns[:all_count] %>
+            <span class="badge badge-sm badge-ghost font-medium px-2 ml-auto">
+              <%= local_assigns[:all_count] %>
+            </span>
           <% end %>
-        </li>
-      <% end %>
+        <% end %>
+      </li>
+      <li>
+        <%= link_to url_for(params: request.query_parameters.merge('status' => 'pending')), class: ('bg-base-200' if current_status == 'pending') do %>
+          <%= svg_icon('clock', class: 'w-5 h-5 shrink-0') %>
+          <span><%= t('pending') %></span>
+          <% if local_assigns[:pending_count] %>
+            <span class="badge badge-sm badge-ghost font-medium px-2 ml-auto">
+              <%= local_assigns[:pending_count] %>
+            </span>
+          <% end %>
+        <% end %>
+      </li>
+      <li>
+        <%= link_to url_for(params: request.query_parameters.merge('status' => 'completed')), class: ('bg-base-200' if current_status == 'completed') do %>
+          <%= svg_icon('circle_check', class: 'w-5 h-5 shrink-0') %>
+          <span><%= t('completed') %></span>
+          <% if local_assigns[:completed_count] %>
+            <span class="badge badge-sm badge-ghost font-medium px-2 ml-auto">
+              <%= local_assigns[:completed_count] %>
+            </span>
+          <% end %>
+        <% end %>
+      </li>
     </ul>
   </div>
 <% end %>
diff --git a/app/views/submissions_filters/_filter_button.html.erb b/app/views/submissions_filters/_filter_button.html.erb
index 601b2d02..ab79aa7d 100644
--- a/app/views/submissions_filters/_filter_button.html.erb
+++ b/app/views/submissions_filters/_filter_button.html.erb
@@ -7,7 +7,7 @@
       <span>Filter</span>
     <% end %>
   </label>
-  <ul tabindex="0" class="z-10 dropdown-content p-2 mt-2 shadow menu text-base bg-base-100 rounded-box min-w-[180px] text-right">
+  <ul tabindex="0" class="z-10 dropdown-content p-2 mt-2 shadow menu text-base bg-base-100 rounded-box text-right" style="min-width: 180px;">
     <li class="flex">
       <%= link_to submissions_filter_path('completed_at', query_params.merge(path: url_for)), data: { turbo_frame: 'modal' } do %>
         <%= svg_icon('calendar_check', class: 'w-5 h-5 flex-shrink-0 stroke-2') %>
diff --git a/app/views/templates/show.html.erb b/app/views/templates/show.html.erb
index abaab0e8..d41ba3eb 100644
--- a/app/views/templates/show.html.erb
+++ b/app/views/templates/show.html.erb
@@ -39,7 +39,7 @@
         </div>
         <% unless can?(:manage, :countless) %>
           <div class="badge badge-neutral badge-outline font-medium">
-            <%= params[:status].blank? && filter_params.blank? ? @pagy.count : @base_submissions.count %>
+            <%= all_count = params[:status].blank? && filter_params.blank? ? @pagy.count : @base_submissions.count %>
           </div>
         <% end %>
       </a>
@@ -50,7 +50,7 @@
         </div>
         <% unless can?(:manage, :countless) %>
           <div class="badge badge-neutral badge-outline font-medium">
-            <%= params[:status] == 'pending' && filter_params.blank? ? @pagy.count : @base_submissions.pending.count %>
+            <%= pending_count = params[:status] == 'pending' && filter_params.blank? ? @pagy.count : @base_submissions.pending.count %>
           </div>
         <% end %>
       </a>
@@ -61,13 +61,13 @@
         </div>
         <% unless can?(:manage, :countless) %>
           <div class="badge badge-neutral badge-outline font-medium">
-            <%= params[:status] == 'completed' && filter_params.blank? ? @pagy.count : @base_submissions.completed.count %>
+            <%= completed_count = params[:status] == 'completed' && filter_params.blank? ? @pagy.count : @base_submissions.completed.count %>
           </div>
         <% end %>
       </a>
     </div>
     <div class="flex items-center md:items-end gap-2 w-full md:w-fit">
-      <%= render 'submissions_filters/applied_filters', filter_params:, with_status: true %>
+      <%= render 'submissions_filters/applied_filters', filter_params:, with_status: true, all_count:, pending_count:, completed_count: %>
       <%= render 'submissions_filters/filter_button', filter_params: %>
       <% unless @template.archived_at? %>
         <%= render 'submissions_filters/actions', filter_params: filter_params.merge(template_id: @template.id) %>