From 4ecd830587b4261a3d7c5d97f40e13c6e17fdd9c Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Wed, 28 Oct 2026 15:30:04 +0200
Subject: [PATCH] android fixes

---
 .../submissions_filters_controller.rb           |  2 +-
 app/javascript/template_builder/builder.vue     |  4 ++--
 .../template_builder/documents_editor_modal.vue |  2 +-
 app/views/layouts/_native_styles.html.erb       | 17 +++++++++++++++++
 app/views/shared/_native_navbar.html.erb        | 14 ++++++++------
 app/views/shared/_turbo_modal.html.erb          |  2 +-
 app/views/submissions/new.html.erb              |  2 +-
 .../submissions_filters/_filter_modal.html.erb  |  2 +-
 .../submissions_filters/completed_at.html.erb   |  4 ++--
 .../submissions_filters/created_at.html.erb     |  4 ++--
 app/views/templates/show.html.erb               |  4 +++-
 app/views/templates_preferences/show.html.erb   |  2 +-
 app/views/templates_share_link/show.html.erb    |  8 ++++----
 13 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/app/controllers/submissions_filters_controller.rb b/app/controllers/submissions_filters_controller.rb
index 8c08bb1d6..ecebfefca 100644
--- a/app/controllers/submissions_filters_controller.rb
+++ b/app/controllers/submissions_filters_controller.rb
@@ -14,6 +14,6 @@ class SubmissionsFiltersController < ApplicationController
   def show
     return head :not_found unless ALLOWED_NAMES.include?(params[:name])
 
-    render params[:name]
+    render params[:name], layout: turbo_native_android? ? 'plain' : true
   end
 end
diff --git a/app/javascript/template_builder/builder.vue b/app/javascript/template_builder/builder.vue
index 620ab845a..7da438e5d 100644
--- a/app/javascript/template_builder/builder.vue
+++ b/app/javascript/template_builder/builder.vue
@@ -772,7 +772,7 @@
       class="sticky bottom-0 z-20"
     >
       <native-action
-        v-if="nativePlatform && withDocumentsList && (isBreakpointLg || isMobile) && sortedDocuments.length && editable"
+        v-if="nativePlatform && withDocumentsList && (isBreakpointLg || isMobile) && editable"
         data-placement="drawer"
         data-side="leading"
         data-icon="files"
@@ -782,7 +782,7 @@
         data-view="documents"
       />
       <native-action
-        v-if="nativePlatform && withFieldsList && isBreakpointLg && sortedDocuments.length && editable"
+        v-if="nativePlatform && withFieldsList && isBreakpointLg && editable"
         data-placement="drawer"
         data-side="trailing"
         data-icon="plus"
diff --git a/app/javascript/template_builder/documents_editor_modal.vue b/app/javascript/template_builder/documents_editor_modal.vue
index d90247f34..7ff2ee40b 100644
--- a/app/javascript/template_builder/documents_editor_modal.vue
+++ b/app/javascript/template_builder/documents_editor_modal.vue
@@ -260,7 +260,7 @@
           </div>
           <div
             class="flex-none px-4 border-t pt-3 flex flex-col gap-3 md:w-56 md:border-t-0 md:border-l md:py-4 md:gap-0"
-            :class="{ 'pb-3': !inline }"
+            :class="{ 'pb-3': !inline || nativePlatform === 'android' }"
           >
             <div class="grid grid-cols-4 gap-2 md:block md:space-y-2">
               <button
diff --git a/app/views/layouts/_native_styles.html.erb b/app/views/layouts/_native_styles.html.erb
index 2eb34a5c2..b17e153d3 100644
--- a/app/views/layouts/_native_styles.html.erb
+++ b/app/views/layouts/_native_styles.html.erb
@@ -7,4 +7,21 @@
     -webkit-user-drag: none;
     -webkit-touch-callout: none;
   }
+
+  <% if turbo_native_android? %>
+  input[type="date"] {
+    appearance: none;
+    -webkit-appearance: none;
+  }
+
+  input[type="date"]::-webkit-calendar-picker-indicator {
+    display: none;
+  }
+
+  @media (max-width: 767px) {
+    div:has(> #account_settings_menu) + * {
+      margin-top: 0 !important;
+    }
+  }
+  <% end %>
 </style>
diff --git a/app/views/shared/_native_navbar.html.erb b/app/views/shared/_native_navbar.html.erb
index 4eb16702b..96970ec52 100644
--- a/app/views/shared/_native_navbar.html.erb
+++ b/app/views/shared/_native_navbar.html.erb
@@ -1,11 +1,13 @@
 <script type="application/json" id="native_path_configuration"><%= render partial: 'layouts/native_path_configuration', formats: :json %></script>
 <% if signed_in? %>
-  <native-action data-placement="profile" data-icon="user">
-    <%= link_to t('profile'), settings_profile_index_path %>
-  </native-action>
-  <native-action data-placement="profile" data-icon="settings">
-    <%= link_to t('settings'), settings_path %>
-  </native-action>
+  <% unless turbo_native_android? %>
+    <native-action data-placement="profile" data-icon="user">
+      <%= link_to t('profile'), settings_profile_index_path %>
+    </native-action>
+    <native-action data-placement="profile" data-icon="settings">
+      <%= link_to t('settings'), settings_path %>
+    </native-action>
+  <% end %>
   <% if current_account.testing? && (can?(:manage, EncryptedConfig) || current_user != true_user) %>
     <native-action data-placement="test_mode" data-icon="code" data-label="<%= t('exit_test_mode') %>">
       <%= button_to '', testing_account_path, method: :delete, form: { data: { turbo_action: 'replace' } } %>
diff --git a/app/views/shared/_turbo_modal.html.erb b/app/views/shared/_turbo_modal.html.erb
index f7af42efa..dc4074fa8 100644
--- a/app/views/shared/_turbo_modal.html.erb
+++ b/app/views/shared/_turbo_modal.html.erb
@@ -2,7 +2,7 @@
   <% content_for(:native_modal, 'true') %>
   <% content_for(:native_title, local_assigns[:title]) if local_assigns[:title] %>
   <turbo-frame id="modal">
-    <native-modal class="block max-w-lg mx-auto pb-6" data-close-after-submit="<%= local_assigns.key?(:close_after_submit) ? local_assigns[:close_after_submit] : true %>">
+    <native-modal class="block max-w-lg mx-auto <%= turbo_native_android? ? 'pb-4' : 'pb-6' %>" data-close-after-submit="<%= local_assigns.key?(:close_after_submit) ? local_assigns[:close_after_submit] : true %>">
       <%= yield %>
     </native-modal>
   </turbo-frame>
diff --git a/app/views/submissions/new.html.erb b/app/views/submissions/new.html.erb
index 53296bc85..87f7bdccc 100644
--- a/app/views/submissions/new.html.erb
+++ b/app/views/submissions/new.html.erb
@@ -13,7 +13,7 @@
 <%= render 'shared/turbo_modal_large', title: params[:selfsign] ? t('add_recipients') : t('add_new_recipients') do %>
   <% options = [only_detailed ? nil : [t('via_email'), 'email'], only_detailed || !with_phone ? nil : [t('via_phone'), 'phone'], [t('detailed'), 'detailed'], with_list ? [t('upload_list'), 'list'] : nil].compact %>
   <% if options.size > 1 %>
-    <toggle-visible data-element-ids="<%= options.map(&:last).to_json %>" class="relative text-center px-2 block <%= 'mt-4' unless turbo_native_app? %>">
+    <toggle-visible data-element-ids="<%= options.map(&:last).to_json %>" class="relative text-center px-2 block <%= turbo_native_app? ? ('mt-1.5' if turbo_native_android?) : 'mt-4' %>">
       <div class="flex justify-center">
         <% options.each_with_index do |(label, value), index| %>
           <%= content_tag(value == 'list' ? 'span' : 'toggle-cookies', data: { value:, key: 'add_recipients_tab' }) do %>
diff --git a/app/views/submissions_filters/_filter_modal.html.erb b/app/views/submissions_filters/_filter_modal.html.erb
index a74c20f4a..b7d45e168 100644
--- a/app/views/submissions_filters/_filter_modal.html.erb
+++ b/app/views/submissions_filters/_filter_modal.html.erb
@@ -1,7 +1,7 @@
 <% path_uri = Addressable::URI.parse(params[:path].to_s) %>
 <% path = url_for(**Rails.application.routes.recognize_path(path_uri.path, method: :get)) %>
 <%= render 'shared/turbo_modal', title: local_assigns[:title] do %>
-  <%= form_for '', url: path, method: :get, data: { turbo_frame: :_top }, html: { autocomplete: :off } do |f| %>
+  <%= form_for '', url: path, method: :get, data: { turbo_frame: :_top }, html: { autocomplete: :off, class: ('px-4' if turbo_native_android?) } do |f| %>
     <%= hidden_field_tag :q, params[:q] if params[:q].present? %>
     <%= hidden_field_tag :scope, params[:scope] if params[:scope].present? %>
     <%= hidden_field_tag :archived, params[:archived] if params[:archived].present? %>
diff --git a/app/views/submissions_filters/completed_at.html.erb b/app/views/submissions_filters/completed_at.html.erb
index 0a0b6b6fe..47b8fed42 100644
--- a/app/views/submissions_filters/completed_at.html.erb
+++ b/app/views/submissions_filters/completed_at.html.erb
@@ -3,11 +3,11 @@
     <div class="flex flex-col md:flex-row gap-2">
       <div class="form-control w-full">
         <%= label_tag 'completed_at_from', t('from'), for: 'date_from', class: 'label text-sm' %>
-        <%= date_field_tag 'completed_at_from', params[:completed_at_from], id: 'date_from', class: 'base-input !h-10', autocomplete: 'off' %>
+        <%= date_field_tag 'completed_at_from', params[:completed_at_from], id: 'date_from', class: 'base-input !h-10 w-full', autocomplete: 'off' %>
       </div>
       <div class="form-control w-full">
         <%= label_tag 'completed_at_to', t('to'), for: 'date_to', class: 'label text-sm' %>
-        <%= date_field_tag 'completed_at_to', params[:completed_at_to], id: 'date_to', class: 'base-input !h-10', autocomplete: 'off' %>
+        <%= date_field_tag 'completed_at_to', params[:completed_at_to], id: 'date_to', class: 'base-input !h-10 w-full', autocomplete: 'off' %>
       </div>
     </div>
     <%= render 'date_buttons' %>
diff --git a/app/views/submissions_filters/created_at.html.erb b/app/views/submissions_filters/created_at.html.erb
index 2f0894645..6b4d58566 100644
--- a/app/views/submissions_filters/created_at.html.erb
+++ b/app/views/submissions_filters/created_at.html.erb
@@ -3,11 +3,11 @@
     <div class="flex flex-col md:flex-row gap-2">
       <div class="form-control w-full">
         <%= label_tag 'created_at_from', t('from'), for: 'date_from', class: 'label text-sm' %>
-        <%= date_field_tag 'created_at_from', params[:created_at_from], id: 'date_from', class: 'base-input !h-10', autocomplete: 'off' %>
+        <%= date_field_tag 'created_at_from', params[:created_at_from], id: 'date_from', class: 'base-input !h-10 w-full', autocomplete: 'off' %>
       </div>
       <div class="form-control w-full">
         <%= label_tag 'created_at_to', t('to'), for: 'date_to', class: 'label text-sm' %>
-        <%= date_field_tag 'created_at_to', params[:created_at_to], id: 'date_to', class: 'base-input !h-10', autocomplete: 'off' %>
+        <%= date_field_tag 'created_at_to', params[:created_at_to], id: 'date_to', class: 'base-input !h-10 w-full', autocomplete: 'off' %>
       </div>
     </div>
     <%= render 'date_buttons' %>
diff --git a/app/views/templates/show.html.erb b/app/views/templates/show.html.erb
index 7ee8567cb..bb95bb554 100644
--- a/app/views/templates/show.html.erb
+++ b/app/views/templates/show.html.erb
@@ -5,7 +5,9 @@
 <% is_show_header = submissions_count != 0 || params[:q].present? || params[:status].present? || filter_params.present? %>
 <%= render 'title', template: @template, with_export: is_show_header %>
 <% if turbo_native_app? %>
-  <native-action data-placement="search" data-native="search" data-label="<%= t('search') %>" data-url="<%= search_index_path(filter_params.to_h.merge({ 'scope' => 'submissions', 'template_id' => @template.id, 'archived' => ('true' if @template.archived_at?) }.compact)) %>"></native-action>
+  <% if !turbo_native_android? || submissions_count >= 5 || params[:q].present? || params[:status].present? || filter_params.present? %>
+    <native-action data-placement="search" data-native="search" data-label="<%= t('search') %>" data-url="<%= search_index_path(filter_params.to_h.merge({ 'scope' => 'submissions', 'template_id' => @template.id, 'archived' => ('true' if @template.archived_at?) }.compact)) %>"></native-action>
+  <% end %>
   <% if !@template.archived_at? && can?(:create, Submission) %>
     <native-action data-placement="footer" data-icon="send" data-haptic="true" data-label="<%= t('send_to_recipients') %>">
       <a href="<%= new_template_submission_path(@template) %>" data-turbo-frame="modal" data-native-modal="<%= 'medium' if @template.submitters.size < 3 %>"></a>
diff --git a/app/views/templates_preferences/show.html.erb b/app/views/templates_preferences/show.html.erb
index f6df9d583..404355d4f 100644
--- a/app/views/templates_preferences/show.html.erb
+++ b/app/views/templates_preferences/show.html.erb
@@ -5,7 +5,7 @@
   <% options << [t('recipients'), 'recipients'] if show_recipients %>
   <% 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 block <%= 'mt-3' unless turbo_native_app? %>">
+    <toggle-visible data-element-ids="<%= options.map(&:last).to_json %>" class="relative text-center block <%= turbo_native_app? ? ('mt-1.5' if turbo_native_android?) : 'mt-3' %>">
       <div class="join">
         <% options.each_with_index do |(label, value), index| %>
           <span>
diff --git a/app/views/templates_share_link/show.html.erb b/app/views/templates_share_link/show.html.erb
index 71cec53f5..b4712eedc 100644
--- a/app/views/templates_share_link/show.html.erb
+++ b/app/views/templates_share_link/show.html.erb
@@ -1,21 +1,21 @@
 <% multiple_submitters = @template.submitters.to_a.length > 1 %>
 <% enough_defined_submitters = Templates.filter_undefined_submitters(@template.submitters).size < 2 %>
 <%= render 'shared/turbo_modal_large', title: t('share_link') do %>
-  <div class="mt-2 mb-4 px-5">
+  <div class="<%= 'mt-2' unless turbo_native_android? %> mb-4 px-5">
     <% if @template.variables_schema.present? %>
       <div class="flex items-start gap-4 p-4 border border-base-300 rounded-2xl bg-base-100 mt-4">
         <%= svg_icon('info_circle', class: 'stroke-current shrink-0 h-6 w-6') %>
         <div><%= t('dynamic_template_with_variables_cannot_be_used_via_shared_link') %></div>
       </div>
     <% end %>
-    <%= form_for @template, url: template_share_link_path(@template), method: :post, html: { id: 'shared_link_form', autocomplete: 'off', class: 'mt-3' }, data: { close_on_submit: false } do |f| %>
+    <%= form_for @template, url: template_share_link_path(@template), method: :post, html: { id: 'shared_link_form', autocomplete: 'off', class: turbo_native_android? ? 'mt-1' : 'mt-3' }, data: { close_on_submit: false } do |f| %>
       <% if @template.preferences&.dig('require_email_2fa') || @template.preferences&.dig('require_phone_2fa') %>
-        <label for="template_shared_link" class="tooltip tooltip-bottom tooltip-no-touch flex items-center my-4 justify-between gap-4 p-4 border border-base-300 rounded-2xl bg-base-100" data-tip="<%= t(:templates_that_require_email_or_phone_2fa_cannot_be_used_via_a_shared_link) %>">
+        <label for="template_shared_link" class="tooltip tooltip-bottom tooltip-no-touch flex items-center <%= turbo_native_android? ? 'mb-4' : 'my-4' %> justify-between gap-4 p-4 border border-base-300 rounded-2xl bg-base-100" data-tip="<%= t(:templates_that_require_email_or_phone_2fa_cannot_be_used_via_a_shared_link) %>">
           <span><%= t('enable_shared_link') %></span>
           <%= check_box_tag 'shared_link', 'true', false, disabled: true, class: 'toggle' %>
         </label>
       <% else %>
-        <label for="template_shared_link" class="flex items-center my-4 justify-between gap-4 p-4 border border-base-300 rounded-2xl bg-base-100">
+        <label for="template_shared_link" class="flex items-center <%= turbo_native_android? ? 'mb-4' : 'my-4' %> justify-between gap-4 p-4 border border-base-300 rounded-2xl bg-base-100">
           <span><%= t('enable_shared_link') %></span>
           <submit-form data-on="change" class="flex">
             <%= f.check_box :shared_link, { disabled: !can?(:update, @template) || @template.variables_schema.present?, class: 'toggle' }, 'true', 'false' %>