hide pro badge in the native app

app/javascript/elements/emails_textarea.js

@@ -35,7 +35,7 @@ export default class extends HTMLElement {
       counter.innerText = `${count} / ${this.dataset.limit}`
     }
 
-    if (this.dataset.bulkEnabled !== 'true') {
+    if (this.dataset.bulkEnabled !== 'true' && !/Hotwire Native/.test(navigator.userAgent)) {
       if (!bulkMessage) {
         bulkMessage = document.createElement('span')
 

app/views/accounts/show.html.erb

@@ -133,7 +133,7 @@
           <% end %>
         <% end %>
         <% account_config = AccountConfig.find_or_initialize_by(account: current_account, key: AccountConfig::ALLOW_TO_DECLINE_KEY) %>
-        <% if can?(:manage, account_config) %>
+        <% if can?(:manage, account_config) && (!turbo_native_app? || !Docuseal.multitenant? || can?(:manage, :disable_decline)) %>
           <%= form_for account_config, url: account_configs_path, method: :post do |f| %>
             <%= f.hidden_field :key %>
             <div class="flex items-center justify-between gap-4 py-2.5">
@@ -156,7 +156,7 @@
           <% end %>
         <% end %>
         <% account_config = AccountConfig.find_or_initialize_by(account: current_account, key: AccountConfig::ALLOW_TO_DELEGATE_KEY) %>
-        <% if can?(:manage, account_config) %>
+        <% if can?(:manage, account_config) && (!turbo_native_app? || !Docuseal.multitenant? || can?(:manage, :delegate_form)) %>
           <%= form_for account_config, url: account_configs_path, method: :post do |f| %>
             <%= f.hidden_field :key %>
             <div class="flex items-center justify-between gap-4 py-2.5">

app/views/notifications_settings/index.html.erb

@@ -22,7 +22,7 @@
       <% end %>
     </div>
     <%= render 'bcc_form', config: @bcc_config %>
-    <% unless can?(:manage, :personalization_restricted) %>
+    <% unless can?(:manage, :personalization_restricted) || (turbo_native_app? && !can?(:manage, :email_reminders)) %>
       <div class="flex justify-between items-end mb-4 mt-8">
         <h2 class="text-2xl md:text-3xl font-bold">
           <%= t('sign_request_email_reminders') %>

app/views/personalization_settings/show.html.erb

@@ -10,10 +10,12 @@
       <%= render 'documents_copy_email_form' %>
       <%= render 'submitter_completed_email_form' %>
     </div>
-    <p class="text-3xl md:text-4xl font-bold mb-4 mt-8">
+    <% if !turbo_native_app? || can?(:manage, :custom_logo) %>
-      <%= t('company_logo') %>
+      <p class="text-3xl md:text-4xl font-bold mb-4 mt-8">
-    </p>
+        <%= t('company_logo') %>
-    <%= render 'logo_form' %>
+      </p>
+      <%= render 'logo_form' %>
+    <% end %>
     <p class="text-3xl md:text-4xl font-bold mb-4 mt-8">
       <%= t('submission_form') %>
     </p>

app/views/shared/_native_navbar.html.erb

@@ -14,7 +14,7 @@
   <% if can?(:create, ::Template) && controller_name.in?(%w[templates_dashboard submissions_dashboard template_folders]) %>
     <% folder_name = @template_folder&.full_name %>
     <native-action data-placement="create" data-icon="upload" data-native="upload" data-label="<%= t('upload') %>" data-url="<%= templates_upload_path(folder_name: folder_name) %>" data-accept="image/*, application/pdf, application/zip, application/json<%= ", #{Templates::CreateAttachments::DOCUMENT_EXTENSIONS.join(', ')}" if Docuseal.advanced_formats? %>"></native-action>
-    <native-action data-placement="create" data-icon="scan" data-native="scan" data-label="Scan" data-url="<%= templates_upload_path(folder_name: folder_name) %>"></native-action>
+    <native-action data-placement="create" data-icon="scan" data-native="scan" data-label="<%= t('scan') %>" data-url="<%= templates_upload_path(folder_name: folder_name) %>"></native-action>
     <% if Docuseal.multitenant? %>
       <native-action data-placement="create" data-icon="brand_gdrive">
         <%= link_to 'Google Drive', new_template_path(modal_tab: 'google_drive', folder_name: folder_name), data: { turbo_frame: :modal } %>

app/views/shared/_settings_nav.html.erb

@@ -42,7 +42,7 @@
               <%= 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 %>
+          <% if can?(:read, EncryptedConfig.new(key: 'submitter_invitation_sms', account: current_account)) && true_user == current_user && (!turbo_native_app? || can?(:manage, :sms_verification)) %>
             <li>
               <%= link_to 'SMS', settings_sms_path, class: 'text-base hover:bg-base-300' %>
             </li>
@@ -83,7 +83,7 @@
             </li>
           <% end %>
         <% end %>
-        <% if !Docuseal.demo? && can?(:manage, EncryptedConfig) && (current_user != true_user || !current_account.linked_account_account) %>
+        <% if !Docuseal.demo? && !turbo_native_app? && 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') %>
@@ -104,7 +104,7 @@
               <% end %>
             </li>
           <% end %>
-          <% if (!Docuseal.multitenant? || can?(:manage, :saml_sso)) && can?(:read, EncryptedConfig.new(key: 'saml_configs', account: current_account)) && true_user == current_user %>
+          <% if (!Docuseal.multitenant? || can?(:manage, :saml_sso)) && can?(:read, EncryptedConfig.new(key: 'saml_configs', account: current_account)) && true_user == current_user && (!turbo_native_app? || can?(:manage, :saml_sso)) %>
             <li>
               <%= link_to 'SSO', settings_sso_index_path, class: 'text-base hover:bg-base-300' %>
             </li>

app/views/submissions/_send_sms_button.html.erb

@@ -1,5 +1,7 @@
-<div class="mt-2 mb-1">
+<% unless turbo_native_app? %>
-  <div class="tooltip tooltip-no-touch w-full" data-tip="<%= t('unlock_with_docuseal_pro') %>">
+  <div class="mt-2 mb-1">
-    <%= 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 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>
-</div>
+<% end %>

app/views/submissions/new.html.erb

@@ -6,7 +6,7 @@
 <% recipient_form_fields = Accounts.load_recipient_form_fields(current_account) if prefillable_fields.blank? %>
 <% can_send_emails = Accounts.can_send_emails?(current_account) %>
 <% only_detailed = require_phone_2fa || require_email_2fa || prefillable_fields.present? || recipient_form_fields.present? %>
-<% with_list = @template.variables_schema.blank? %>
+<% with_list = @template.variables_schema.blank? && (!turbo_native_app? || can?(:manage, :bulk_send)) %>
 <% variables_form = render 'variables_form', schema: @template.variables_schema if @template.variables_schema.present? && @template.variables_schema.any? { |_, v| !v['disabled'] } %>
 <%= 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 ? nil : [t('via_phone'), 'phone'], [t('detailed'), 'detailed'], with_list ? [t('upload_list'), 'list'] : nil].compact %>

app/views/templates_code_modal/_placeholder.html.erb

@@ -1,15 +1,17 @@
-<div class="alert">
+<% unless turbo_native_app? %>
-  <%= svg_icon('info_circle', class: 'w-6 h-6') %>
+  <div class="alert">
-  <div>
+    <%= svg_icon('info_circle', class: 'w-6 h-6') %>
-    <p class="font-bold">
+    <div>
-      <%= t('api_and_embedding') %>
+      <p class="font-bold">
-    </p>
+        <%= t('api_and_embedding') %>
-    <p class="text-gray-700">
+      </p>
-      <%= t('unlock_with_docuseal_pro') %>
+      <p class="text-gray-700">
-      <br>
+        <%= t('unlock_with_docuseal_pro') %>
-      <a class="link font-medium" target="_blank" href="<%= Docuseal.multitenant? ? console_redirect_index_path(redir: "#{Docuseal::CONSOLE_URL}/plans") : "#{Docuseal::CLOUD_URL}/sign_up?#{{ redir: "#{Docuseal::CONSOLE_URL}/on_premises" }.to_query}" %>" data-turbo="false">
+        <br>
-        <%= t('learn_more') %>
+        <a class="link font-medium" target="_blank" href="<%= Docuseal.multitenant? ? console_redirect_index_path(redir: "#{Docuseal::CONSOLE_URL}/plans") : "#{Docuseal::CLOUD_URL}/sign_up?#{{ redir: "#{Docuseal::CONSOLE_URL}/on_premises" }.to_query}" %>" data-turbo="false">
-      </a>
+          <%= t('learn_more') %>
-    </p>
+        </a>
+      </p>
+    </div>
   </div>
-</div>
+<% end %>

app/views/users/_role_select.html.erb

@@ -12,9 +12,11 @@
       </span>
     </label>
   <% end %>
-  <a class="text-sm mt-3 px-4 py-2 bg-base-300 rounded-full block" target="_blank" href="<%= Docuseal.multitenant? ? console_redirect_index_path(redir: "#{Docuseal::CONSOLE_URL}/plans") : "#{Docuseal::CLOUD_URL}/sign_up?#{{ redir: "#{Docuseal::CONSOLE_URL}/on_premises" }.to_query}" %>">
+  <% unless turbo_native_app? %>
-    <%= svg_icon('info_circle', class: 'w-4 h-4 inline align-text-bottom') %>
+    <a class="text-sm mt-3 px-4 py-2 bg-base-300 rounded-full block" target="_blank" href="<%= Docuseal.multitenant? ? console_redirect_index_path(redir: "#{Docuseal::CONSOLE_URL}/plans") : "#{Docuseal::CLOUD_URL}/sign_up?#{{ redir: "#{Docuseal::CONSOLE_URL}/on_premises" }.to_query}" %>">
-    <%= t('unlock_more_user_roles_with_docuseal_pro') %>
+      <%= svg_icon('info_circle', class: 'w-4 h-4 inline align-text-bottom') %>
-    <span class="link font-medium"><%= t('learn_more') %></span>
+      <%= t('unlock_more_user_roles_with_docuseal_pro') %>
-  </a>
+      <span class="link font-medium"><%= t('learn_more') %></span>
+    </a>
+  <% end %>
 </div>

config/locales/i18n.yml

@@ -412,6 +412,7 @@ en: &en
   powered_by: Powered by
   qr_code: QR Code
   print: Print
+  scan: Scan
   scan_the_qr_code_above_with_your_phone_camera_to_open_and_sign_this_document: Scan the QR code above with your phone camera to open and sign this document.
   count_documents_signed_with_html: '<b>%{count}</b> documents signed with'
   storage: Storage
@@ -1550,6 +1551,7 @@ es: &es
   powered_by: Desarrollado por
   qr_code: Código QR
   print: Imprimir
+  scan: Escanear
   scan_the_qr_code_above_with_your_phone_camera_to_open_and_sign_this_document: Escanea el código QR de arriba con la cámara de tu teléfono para abrir y firmar este documento.
   count_documents_signed_with_html: '<b>%{count}</b> documentos firmados con'
   storage: Almacenamiento
@@ -2692,6 +2694,7 @@ it: &it
   powered_by: Fornito da
   qr_code: Codice QR
   print: Stampa
+  scan: Scansiona
   scan_the_qr_code_above_with_your_phone_camera_to_open_and_sign_this_document: Scansiona il codice QR qui sopra con la fotocamera del tuo telefono per aprire e firmare questo documento.
   count_documents_signed_with_html: '<b>%{count}</b> documenti firmati con'
   storage: Archiviazione
@@ -3820,6 +3823,7 @@ fr: &fr
   powered_by: Propulsé par
   qr_code: Code QR
   print: Imprimer
+  scan: Scanner
   scan_the_qr_code_above_with_your_phone_camera_to_open_and_sign_this_document: Scannez le code QR ci-dessus avec l'appareil photo de votre téléphone pour ouvrir et signer ce document.
   count_documents_signed_with_html: "<b>%{count}</b> documents signés avec"
   storage: Stockage
@@ -4958,6 +4962,7 @@ pt: &pt
   powered_by: Desenvolvido por
   qr_code: Código QR
   print: Imprimir
+  scan: Digitalizar
   scan_the_qr_code_above_with_your_phone_camera_to_open_and_sign_this_document: Escaneie o código QR acima com a câmera do seu telefone para abrir e assinar este documento.
   count_documents_signed_with_html: '<b>%{count}</b> documentos assinados com'
   storage: Armazenamento
@@ -6099,6 +6104,7 @@ de: &de
   powered_by: Bereitgestellt von
   qr_code: QR-Code
   print: Drucken
+  scan: Scannen
   scan_the_qr_code_above_with_your_phone_camera_to_open_and_sign_this_document: Scannen Sie den QR-Code oben mit Ihrer Handykamera, um dieses Dokument zu öffnen und zu unterzeichnen.
   count_documents_signed_with_html: '<b>%{count}</b> Dokumente signiert mit'
   storage: Speicher
@@ -7768,6 +7774,7 @@ nl: &nl
   powered_by: Aangedreven door
   qr_code: QR-code
   print: Afdrukken
+  scan: Scannen
   scan_the_qr_code_above_with_your_phone_camera_to_open_and_sign_this_document: Scan de bovenstaande QR-code met je telefooncamera om dit document te openen en te ondertekenen.
   count_documents_signed_with_html: "<b>%{count}</b> documenten ondertekend met"
   storage: Opslag