hide pro badge in the iOS app

app/javascript/application.js

@@ -233,7 +233,8 @@ safeRegisterElement('template-builder', class extends HTMLElement {
       currencies: (this.dataset.currencies || '').split(',').filter(Boolean),
       acceptFileTypes: this.dataset.acceptFileTypes,
       showTourStartForm: this.dataset.showTourStartForm === 'true',
-      nativeApp: this.dataset.nativeApp === 'true'
+      nativeApp: this.dataset.nativeApp === 'true',
+      nativeIos: this.dataset.nativeIos === 'true'
     })
 
     this.component = this.app.mount(this.appElem)

app/javascript/template_builder/builder.vue

@@ -886,6 +886,7 @@ export default {
       isPaypalConnected: this.isPaypalConnected,
       withFormula: this.withFormula,
       withConditions: this.withConditions,
+      nativeIos: this.nativeIos,
       withCustomFields: this.withCustomFields,
       isInlineSize: this.isInlineSize,
       defaultDrawFieldType: this.defaultDrawFieldType,
@@ -1108,6 +1109,11 @@ export default {
       required: false,
       default: false
     },
+    nativeIos: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     withFieldsSearch: {
       type: Boolean,
       required: false,

app/javascript/template_builder/field_context_menu.vue

@@ -515,7 +515,7 @@ export default {
     ContextSubmenu,
     ContextModal
   },
-  inject: ['t', 'getFieldTypeIndex', 'template', 'withCustomFields', 'currencies', 'dateFormats', 'locale'],
+  inject: ['t', 'getFieldTypeIndex', 'template', 'withCustomFields', 'currencies', 'dateFormats', 'locale', 'withFormula', 'withConditions', 'nativeIos'],
   props: {
     contextMenu: {
       type: Object,
@@ -608,10 +608,10 @@ export default {
       return !['stamp', 'heading', 'strikethrough'].includes(this.field.type)
     },
     showCondition () {
-      return this.withCondition && !['stamp', 'heading'].includes(this.field.type)
+      return this.withCondition && (this.withConditions || !this.nativeIos) && !['stamp', 'heading'].includes(this.field.type)
     },
     showFormula () {
-      return this.field.type === 'number' || this.field.type === 'payment' || !!this.field.preferences?.formula
+      return (this.field.type === 'number' || this.field.type === 'payment' || !!this.field.preferences?.formula) && (this.withFormula || !this.nativeIos)
     },
     showRequired () {
       return this.withRequired && !['phone', 'stamp', 'verification', 'strikethrough', 'heading'].includes(this.field.type)

app/javascript/template_builder/field_settings.vue

@@ -484,7 +484,7 @@
     </label>
   </li>
   <li
-    v-if="withCondition && field.type != 'stamp' && field.type != 'heading'"
+    v-if="withCondition && (withConditions || !nativeIos) && field.type != 'stamp' && field.type != 'heading'"
     class="field-settings-condition"
   >
     <label
@@ -500,7 +500,7 @@
     </label>
   </li>
   <li
-    v-if="field.type == 'number' || field.preferences?.formula"
+    v-if="(field.type == 'number' || field.preferences?.formula) && (withFormula || !nativeIos)"
     class="field-settings-formula"
   >
     <label
@@ -610,7 +610,7 @@ export default {
     IconTypography,
     IconX
   },
-  inject: ['template', 't', 'dateFormats', 'locale'],
+  inject: ['template', 't', 'dateFormats', 'locale', 'withFormula', 'withConditions', 'nativeIos'],
   props: {
     field: {
       type: Object,

app/javascript/template_builder/fields.vue

@@ -271,7 +271,7 @@
         </div>
       </button>
       <div
-        v-else-if="type == 'phone' && (fieldTypes.length === 0 || fieldTypes.includes(type))"
+        v-else-if="type == 'phone' && !nativeIos && (fieldTypes.length === 0 || fieldTypes.includes(type))"
         class="tooltip tooltip-bottom flex"
         :class="{'tooltip-bottom-end': withPayment, 'tooltip-bottom': !withPayment }"
         :data-tip="t('unlock_sms_verified_phone_number_field_with_paid_plan_use_text_field_for_phone_numbers_without_verification')"
@@ -422,7 +422,7 @@ export default {
     IconBracketsContain,
     DynamicVariables: defineAsyncComponent(() => import(/* webpackChunkName: "dynamic-editor" */ './dynamic_variables'))
   },
-  inject: ['save', 'backgroundColor', 'withPhone', 'withVerification', 'withKba', 'withPayment', 't', 'fieldsDragFieldRef', 'customDragFieldRef', 'baseFetch', 'selectedAreasRef', 'getFieldTypeIndex'],
+  inject: ['save', 'backgroundColor', 'withPhone', 'withVerification', 'withKba', 'withPayment', 'nativeIos', 't', 'fieldsDragFieldRef', 'customDragFieldRef', 'baseFetch', 'selectedAreasRef', 'getFieldTypeIndex'],
   props: {
     fields: {
       type: Array,

app/javascript/template_builder/payment_settings.vue

@@ -199,6 +199,7 @@
         >{{ t('learn_more') }}</a>
       </div>
       <li
+        v-if="withFormula || !nativeIos"
         class="field-settings-formula mb-1"
       >
         <label
@@ -228,7 +229,7 @@
         </label>
       </li>
       <li
-        v-if="withCondition"
+        v-if="withCondition && (withConditions || !nativeIos)"
         class="field-settings-condition mt-1"
       >
         <label
@@ -286,7 +287,7 @@ export default {
     IconBrandStripe,
     IconBrandPaypal
   },
-  inject: ['backgroundColor', 'save', 'currencies', 't', 'isStripeConnected', 'isPaypalConnected', 'withStripe', 'withPaypal'],
+  inject: ['backgroundColor', 'save', 'currencies', 't', 'isStripeConnected', 'isPaypalConnected', 'withStripe', 'withPaypal', 'withFormula', 'withConditions', 'nativeIos'],
   props: {
     field: {
       type: Object,

app/javascript/template_builder/selection_context_menu.vue

@@ -192,7 +192,7 @@ export default {
     ConditionsModal,
     ContextSubmenu
   },
-  inject: ['t', 'save', 'selectedAreasRef', 'getFieldTypeIndex'],
+  inject: ['t', 'save', 'selectedAreasRef', 'getFieldTypeIndex', 'withConditions', 'nativeIos'],
   props: {
     contextMenu: {
       type: Object,
@@ -259,7 +259,7 @@ export default {
       return true
     },
     showCondition () {
-      return this.withCondition
+      return this.withCondition && (this.withConditions || !this.nativeIos)
     },
     fieldNames: FieldType.computed.fieldNames,
     fieldLabels: FieldType.computed.fieldLabels

app/views/esign_settings/_default_signature_row.html.erb

@@ -1,25 +1,27 @@
-<tr class="group">
+<% unless turbo_native_ios? %>
-  <td class="flex items-center space-x-1">
+  <tr class="group">
-    <%= svg_icon('discount_check_filled', class: 'w-6 h-6 shrink-0 text-green-500') %>
+    <td class="flex items-center space-x-1">
-    <span class="flex items-center">
+      <%= svg_icon('discount_check_filled', class: 'w-6 h-6 shrink-0 text-green-500') %>
-      <span class="whitespace-nowrap"><%= t('docuseal_trusted_signature') %></span>
+      <span class="flex items-center">
-      <div class="tooltip tooltip-top ml-1 shrink-0 hidden md:flex" 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="whitespace-nowrap"><%= t('docuseal_trusted_signature') %></span>
-        <%= svg_icon('circle_question', class: 'w-4 h-4 stroke-1 shrink-0') %>
+        <div class="tooltip tooltip-top ml-1 shrink-0 hidden md:flex" 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 whitespace-nowrap">
+        <%= t('unlock_with_docuseal_pro') %>
+      </a>
+    </td>
+    <td>
+      <div class="md:tooltip" data-tip="<%= t('unlock_with_docuseal_pro') %>">
+        <%= button_to settings_esign_path, method: :put, params: { name: Docuseal::AATL_CERT_NAME }, class: 'btn btn-outline btn-neutral btn-xs whitespace-nowrap', title: t('make_default'), disabled: true do %>
+          <%= t('make_default') %>
+        <% end %>
       </div>
-    </span>
+    </td>
-  </td>
+    <td>
-  <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 whitespace-nowrap">
+  </tr>
-      <%= t('unlock_with_docuseal_pro') %>
+<% end %>
-    </a>
-  </td>
-  <td>
-    <div class="md:tooltip" data-tip="<%= t('unlock_with_docuseal_pro') %>">
-      <%= button_to settings_esign_path, method: :put, params: { name: Docuseal::AATL_CERT_NAME }, class: 'btn btn-outline btn-neutral btn-xs whitespace-nowrap', title: t('make_default'), disabled: true do %>
-        <%= t('make_default') %>
-      <% end %>
-    </div>
-  </td>
-  <td>
-  </td>
-</tr>

app/views/shared/_settings_nav.html.erb

@@ -92,11 +92,13 @@
           </li>
         <% end %>
         <% if !Docuseal.demo? && can?(:manage, EncryptedConfig) && (current_user == true_user || current_account.testing?) %>
-          <li>
+          <% if Docuseal.multitenant? || !turbo_native_ios? %>
-            <%= 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 %>
+            <li>
-              <% if Docuseal.multitenant? %> API <% else %> <%= t('console') %> <% end %>
+              <%= 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 %>
-            <% end %>
+                <% if Docuseal.multitenant? %> API <% else %> <%= t('console') %> <% end %>
-          </li>
+              <% end %>
+            </li>
+          <% end %>
           <% 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 %>

app/views/submissions/_send_sms.html.erb

@@ -1,3 +1,5 @@
-<div class="form-control">
+<% unless turbo_native_ios? %>
-  <%= render 'sms_settings/placeholder' %>
+  <div class="form-control">
-</div>
+    <%= render 'sms_settings/placeholder' %>
+  </div>
+<% end %>

app/views/submissions/new.html.erb

@@ -7,9 +7,11 @@
 <% 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? && (!turbo_native_ios? || can?(:manage, :bulk_send)) %>
+<% with_phone = !turbo_native_ios? || can?(:manage, :sms_verification) %>
+<% default_tab = 'email' if default_tab == 'phone' && !with_phone %>
 <% 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 %>
+  <% 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 mt-4 block">
       <div class="flex justify-center">
@@ -29,9 +31,11 @@
       <div id="email" class="<%= 'hidden' if default_tab != 'email' %>">
         <%= render 'email_form', template: @template, variables_form:, can_send_emails:, viewer_submitter_uuids: %>
       </div>
-      <div id="phone" class="<%= 'hidden' if default_tab != 'phone' %>">
+      <% if with_phone %>
-        <%= render 'phone_form', template: @template, variables_form: %>
+        <div id="phone" class="<%= 'hidden' if default_tab != 'phone' %>">
-      </div>
+          <%= render 'phone_form', template: @template, variables_form: %>
+        </div>
+      <% end %>
     <% end %>
     <div id="detailed" class="<%= 'hidden' if !only_detailed && default_tab != 'detailed' %>">
       <%= render 'detailed_form', template: @template, require_phone_2fa:, require_email_2fa:, prefillable_fields:, recipient_form_fields:, variables_form:, can_send_emails:, viewer_submitter_uuids: %>

app/views/templates/edit.html.erb

@@ -10,4 +10,4 @@
 <% account_configs = current_account.account_configs.where(key: [AccountConfig::TEMPLATE_CUSTOM_FIELDS_KEY, AccountConfig::TEMPLATE_DATE_FORMATS_KEY]).to_a %>
 <% custom_fields = account_configs.find { |e| e.key == AccountConfig::TEMPLATE_CUSTOM_FIELDS_KEY }&.value || [] %>
 <% date_formats = account_configs.find { |e| e.key == AccountConfig::TEMPLATE_DATE_FORMATS_KEY }&.value || [] %>
-<template-builder data-native-app="<%= turbo_native_app? %>" class="grid" data-template="<%= @template_data.to_json %>" data-custom-fields="<%= custom_fields.to_json %>" data-date-formats="<%= date_formats.to_json %>" data-with-sign-yourself-button="<%= !@template.archived_at? %>" data-with-fields-detection="true" data-with-send-button="<%= !@template.archived_at? && can?(:create, @template.submissions.new(account: current_account)) %>" data-with-revisions-menu="<%= @template.template_versions.exists? %>" data-locale="<%= I18n.locale %>" data-show-tour-start-form="<%= @show_tour_start_form %>"></template-builder>
+<template-builder data-native-app="<%= turbo_native_app? %>" data-native-ios="<%= turbo_native_ios? %>" class="grid" data-template="<%= @template_data.to_json %>" data-custom-fields="<%= custom_fields.to_json %>" data-date-formats="<%= date_formats.to_json %>" data-with-sign-yourself-button="<%= !@template.archived_at? %>" data-with-fields-detection="true" data-with-send-button="<%= !@template.archived_at? && can?(:create, @template.submissions.new(account: current_account)) %>" data-with-revisions-menu="<%= @template.template_versions.exists? %>" data-locale="<%= I18n.locale %>" data-show-tour-start-form="<%= @show_tour_start_form %>"></template-builder>