fix signature toggle

fix build
normalize client ip
2026-11-06 06:52:33 -05:00 · 2024-06-03 12:31:40 +03:00 · 2024-06-03 12:01:09 +03:00 · 2024-06-03 08:57:14 +03:00 · 2024-06-02 21:24:21 +03:00 · 2024-06-02 18:36:59 +03:00
104 changed files with 1767 additions and 465 deletions
@@ -2,7 +2,7 @@ FROM ruby:3.3.1-alpine3.18 as fonts

 WORKDIR /fonts

-RUN apk --no-cache add fontforge wget && wget https://github.com/satbyy/go-noto-universal/releases/download/v7.0/GoNotoKurrent-Regular.ttf && wget https://github.com/satbyy/go-noto-universal/releases/download/v7.0/GoNotoKurrent-Bold.ttf && wget https://github.com/impallari/DancingScript/raw/master/fonts/DancingScript-Regular.otf && wget https://cdn.jsdelivr.net/gh/notofonts/notofonts.github.io/fonts/NotoSansSymbols2/hinted/ttf/NotoSansSymbols2-Regular.ttf && wget https://github.com/Maxattax97/gnu-freefont/raw/master/ttf/FreeSans.ttf && wget https://github.com/impallari/DancingScript/raw/master/OFL.txt
+RUN apk --no-cache add fontforge wget && wget https://github.com/satbyy/go-noto-universal/releases/download/v7.0/GoNotoKurrent-Regular.ttf && wget https://github.com/satbyy/go-noto-universal/releases/download/v7.0/GoNotoKurrent-Bold.ttf && wget https://github.com/impallari/DancingScript/raw/master/fonts/v2031/DancingScript-Regular.otf && wget https://cdn.jsdelivr.net/gh/notofonts/notofonts.github.io/fonts/NotoSansSymbols2/hinted/ttf/NotoSansSymbols2-Regular.ttf && wget https://github.com/Maxattax97/gnu-freefont/raw/master/ttf/FreeSans.ttf && wget https://github.com/impallari/DancingScript/raw/master/OFL.txt

 RUN fontforge -lang=py -c 'font1 = fontforge.open("FreeSans.ttf"); font2 = fontforge.open("NotoSansSymbols2-Regular.ttf"); font1.mergeFonts(font2); font1.generate("FreeSans.ttf")'

@@ -24,7 +24,6 @@ gem 'lograge'
 gem 'mysql2', require: false
 gem 'oj'
 gem 'pagy'
-gem 'pdf-reader'
 gem 'pg', require: false
 gem 'premailer-rails'
 gem 'pretender'
@@ -1,7 +1,6 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    Ascii85 (1.1.0)
    actioncable (7.1.3.2)
      actionpack (= 7.1.3.2)
      activesupport (= 7.1.3.2)
@@ -78,7 +77,6 @@ GEM
      tzinfo (~> 2.0)
    addressable (2.8.6)
      public_suffix (>= 2.0.2, < 6.0)
-    afm (0.2.2)
    annotate (3.2.0)
      activerecord (>= 3.2, < 8.0)
      rake (>= 10.4, < 14.0)
@@ -117,7 +115,7 @@ GEM
      erubi (~> 1.4)
      parser (>= 2.4)
      smart_properties
-    bigdecimal (3.1.7)
+    bigdecimal (3.1.8)
    bindex (0.8.1)
    bootsnap (1.18.3)
      msgpack (~> 1.2)
@@ -262,21 +260,20 @@ GEM
      os (>= 0.9, < 2.0)
      signet (>= 0.16, < 2.a)
    hashdiff (1.1.0)
-    hashery (2.1.2)
-    hexapdf (0.40.0)
+    hexapdf (0.42.0)
      cmdparse (~> 3.0, >= 3.0.3)
      geom2d (~> 0.4, >= 0.4.1)
      openssl (>= 2.2.1)
    htmlentities (4.3.4)
    httpclient (2.8.3)
-    i18n (1.14.4)
+    i18n (1.14.5)
      concurrent-ruby (~> 1.0)
    image_processing (1.12.2)
      mini_magick (>= 4.9.5, < 5)
      ruby-vips (>= 2.0.17, < 3)
    io-console (0.7.2)
-    irb (1.12.0)
-      rdoc
+    irb (1.13.1)
+      rdoc (>= 4.0.0)
      reline (>= 0.4.2)
    jmespath (1.6.2)
    json (2.7.2)
@@ -312,7 +309,7 @@ GEM
    mini_magick (4.12.0)
    mini_mime (1.1.5)
    mini_portile2 (2.8.6)
-    minitest (5.22.3)
+    minitest (5.23.0)
    msgpack (1.7.2)
    multi_json (1.15.0)
    multipart-post (2.4.0)
@@ -330,12 +327,12 @@ GEM
    net-smtp (0.4.0)
      net-protocol
    nio4r (2.7.1)
-    nokogiri (1.16.4)
+    nokogiri (1.16.5)
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
-    nokogiri (1.16.4-aarch64-linux)
+    nokogiri (1.16.5-aarch64-linux)
      racc (~> 1.4)
-    nokogiri (1.16.4-x86_64-linux)
+    nokogiri (1.16.5-x86_64-linux)
      racc (~> 1.4)
    oj (3.16.3)
      bigdecimal (>= 3.0)
@@ -348,12 +345,6 @@ GEM
    parser (3.3.1.0)
      ast (~> 2.4.1)
      racc
-    pdf-reader (2.12.0)
-      Ascii85 (~> 1.0)
-      afm (~> 0.2.1)
-      hashery (~> 2.0)
-      ruby-rc4
-      ttfunk
    pg (1.5.6)
    premailer (1.23.0)
      addressable
@@ -375,17 +366,17 @@ GEM
    public_suffix (5.0.5)
    puma (6.4.2)
      nio4r (~> 2.0)
-    racc (1.7.3)
-    rack (2.2.9)
+    racc (1.8.0)
+    rack (3.0.11)
    rack-proxy (0.7.7)
      rack
-    rack-session (1.0.2)
-      rack (< 3)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
    rack-test (2.1.0)
      rack (>= 1.3)
-    rackup (1.0.0)
-      rack (< 3)
-      webrick
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
    rails (7.1.3.2)
      actioncable (= 7.1.3.2)
      actionmailbox (= 7.1.3.2)
@@ -429,7 +420,7 @@ GEM
    redis-client (0.22.0)
      connection_pool
    regexp_parser (2.9.0)
-    reline (0.5.1)
+    reline (0.5.7)
      io-console (~> 0.5)
    representable (3.2.0)
      declarative (< 0.1.0)
@@ -497,7 +488,6 @@ GEM
    rubocop-rspec_rails (2.28.3)
      rubocop (~> 1.40)
    ruby-progressbar (1.13.0)
-    ruby-rc4 (0.1.5)
    ruby-vips (2.2.1)
      ffi (~> 1.12)
    ruby2_keywords (0.0.5)
@@ -506,7 +496,7 @@ GEM
      rubyzip (>= 1.3.0)
    rubyzip (2.3.2)
    semantic_range (3.0.0)
-    shakapacker (7.2.3)
+    shakapacker (8.0.0)
      activesupport (>= 5.2)
      package_json
      rack-proxy (>= 0.6.1)
@@ -537,8 +527,6 @@ GEM
    thor (1.3.1)
    timeout (0.4.1)
    trailblazer-option (0.1.2)
-    ttfunk (1.8.0)
-      bigdecimal (~> 3.1)
    turbo-rails (2.0.5)
      actionpack (>= 6.0.0)
      activejob (>= 6.0.0)
@@ -571,7 +559,7 @@ GEM
    websocket-extensions (0.1.5)
    xpath (3.2.0)
      nokogiri (~> 1.8)
-    zeitwerk (2.6.13)
+    zeitwerk (2.6.14)

 PLATFORMS
  aarch64-linux
@@ -609,7 +597,6 @@ DEPENDENCIES
  mysql2
  oj
  pagy
-  pdf-reader
  pg
  premailer-rails
  pretender
@@ -22,7 +22,7 @@ module Api
                                                 audit_trail_attachment: :blob))

      render json: {
-        data: submissions.as_json(serialize_params),
+        data: submissions.as_json(Submissions::SerializeForApi::SERIALIZE_PARAMS),
        pagination: {
          count: submissions.size,
          next: submissions.last&.id,
@@ -44,29 +44,7 @@ module Api
        @submission.audit_trail_attachment = Submissions::GenerateAuditTrail.call(@submission)
      end

-      serialized_submitters = submitters.map { |submitter| Submitters::SerializeForApi.call(submitter) }
-
-      json = @submission.as_json(
-        serialize_params.deep_merge(
-          include: { submission_events: { only: %i[id submitter_id event_type event_timestamp] } }
-        )
-      )
-
-      if submitters.all?(&:completed_at?)
-        last_submitter = submitters.max_by(&:completed_at)
-
-        json[:documents] = serialized_submitters.find { |e| e['id'] == last_submitter.id }['documents']
-        json[:status] = 'completed'
-        json[:completed_at] = last_submitter.completed_at
-      else
-        json[:documents] = []
-        json[:status] = 'pending'
-        json[:completed_at] = nil
-      end
-
-      json[:submitters] = serialized_submitters
-
-      render json:
+      render json: Submissions::SerializeForApi.call(@submission, submitters)
    end

    def create
@@ -85,6 +63,10 @@ module Api

      submissions = create_submissions(@template, params)

+      submissions.each do |submission|
+        SendSubmissionCreatedWebhookRequestJob.perform_later(submission)
+      end
+
      Submissions.send_signature_requests(submissions)

      submissions.each do |submission|
@@ -153,22 +135,6 @@ module Api
      end
    end

-    def serialize_params
-      {
-        only: %i[id source submitters_order created_at updated_at archived_at],
-        methods: %i[audit_log_url],
-        include: {
-          submitters: { only: %i[id slug uuid name email phone
-                                 completed_at opened_at sent_at
-                                 created_at updated_at external_id metadata],
-                        methods: %i[status application_key] },
-          template: { only: %i[id name external_id created_at updated_at],
-                      methods: %i[folder_name] },
-          created_by_user: { only: %i[id email first_name last_name] }
-        }
-      }
-    end
-
    def submissions_params
      permitted_attrs = [
        :send_email, :send_sms, :bcc_completed, :completed_redirect_url, :reply_to, :go_to_last,
@@ -9,6 +9,8 @@ class ConsoleRedirectController < ApplicationController
      params[:redir] = Docuseal.multitenant? ? "#{Docuseal::CONSOLE_URL}/plans" : "#{Docuseal::CONSOLE_URL}/on_premise"
    end

+    params[:redir] = "#{Docuseal::CONSOLE_URL}/manage" if request.path == '/manage'
+
    return redirect_to(new_user_session_path({ redir: params[:redir] }.compact)) if true_user.blank?

    auth = JsonWebToken.encode(uuid: true_user.uuid,
@@ -33,7 +33,11 @@ class StartFormController < ApplicationController

      assign_submission_attributes(@submitter, @template) if @submitter.new_record?

+      is_new_record = @submitter.new_record?
+
      if @submitter.save
+        SendSubmissionCreatedWebhookRequestJob.perform_later(@submitter.submission) if is_new_record
+
        redirect_to submit_form_path(@submitter.slug)
      else
        render :show
@@ -44,6 +44,10 @@ class SubmissionsController < ApplicationController
                                           params: params.merge('send_completed_email' => true))
      end

+    submissions.each do |submission|
+      SendSubmissionCreatedWebhookRequestJob.perform_later(submission)
+    end
+
    Submissions.send_signature_requests(submissions)

    redirect_to template_path(@template), notice: 'New recipients have been added'
@@ -16,13 +16,16 @@ class SubmissionsDebugController < ApplicationController
        render 'submit_form/show'
      end
      f.pdf do
-        if params[:audit]
-          Submissions::GenerateAuditTrail.call(@submitter.submission)
-        else
-          Submissions::GenerateResultAttachments.call(@submitter)
-        end
+        result =
+          if params[:audit]
+            Submissions::GenerateAuditTrail.call(@submitter.submission)
+          elsif params[:combined]
+            Submissions::GenerateCombinedAttachment.call(@submitter)
+          else
+            Submissions::GenerateResultAttachments.call(@submitter)
+          end

-        send_data ActiveStorage::Attachment.where(name: params[:audit] ? :audit_trail : :documents).last.download,
+        send_data Array.wrap(result).first.download,
                  filename: 'debug.pdf',
                  disposition: 'inline',
                  type: 'application/pdf'
@@ -33,7 +33,17 @@ class SubmissionsDownloadController < ApplicationController
      return head :not_found
    end

-    render json: build_urls(last_submitter)
+    if params[:combined]
+      url = build_combined_url(submitter)
+
+      if url
+        render json: [url]
+      else
+        head :not_found
+      end
+    else
+      render json: build_urls(last_submitter)
+    end
  end

  private
@@ -47,4 +57,14 @@ class SubmissionsDownloadController < ApplicationController
      ActiveStorage::Blob.proxy_url(attachment.blob, expires_at: FILES_TTL.from_now.to_i)
    end
  end
+
+  def build_combined_url(submitter)
+    return if submitter.submission.submitters.exists?(completed_at: nil)
+    return if submitter.submission.submitters.order(:completed_at).last != submitter
+
+    attachment = submitter.submission.combined_document_attachment
+    attachment ||= Submissions::GenerateCombinedAttachment.call(submitter)
+
+    ActiveStorage::Blob.proxy_url(attachment.blob, expires_at: FILES_TTL.from_now.to_i)
+  end
 end
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class SubmitFormDrawSignatureController < ApplicationController
+  layout false
+
+  around_action :with_browser_locale, only: %i[show]
+  skip_before_action :authenticate_user!
+  skip_authorization_check
+
+  def show
+    @submitter = Submitter.find_by!(slug: params[:slug])
+
+    return redirect_to submit_form_completed_path(@submitter.slug) if @submitter.completed_at?
+
+    if @submitter.submission.template.archived_at? || @submitter.submission.archived_at?
+      return redirect_to submit_form_path(@submitter.slug)
+    end
+
+    render :show
+  end
+end
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class SubmitFormValuesController < ApplicationController
+  skip_before_action :authenticate_user!
+  skip_authorization_check
+
+  def index
+    submitter = Submitter.find_by!(slug: params[:submit_form_slug])
+
+    return render json: {} if submitter.completed_at?
+    return render json: {} if submitter.submission.template.archived_at? || submitter.submission.archived_at?
+
+    value = submitter.values[params['field_uuid']]
+    attachment = submitter.attachments.where(created_at: params[:after]..).find_by(uuid: value) if value.present?
+
+    render json: {
+      value:,
+      attachment: attachment&.as_json(only: %i[uuid], methods: %i[url filename content_type])
+    }, head: :ok
+  end
+end
@@ -25,7 +25,7 @@ class SubmittersAutocompleteController < ApplicationController

      term = "#{params[:q].downcase}%"

-      submitters.where(column.matches(term, false, true))
+      submitters.where(column.matches(term))
    else
      Submitters.search(submitters, params[:q])
    end
@@ -4,7 +4,9 @@ class TemplateDocumentsController < ApplicationController
  load_and_authorize_resource :template

  def create
-    return head :unprocessable_entity if params[:blobs].blank? && params[:files].blank?
+    if params[:blobs].blank? && params[:files].blank?
+      return render json: { error: 'File is missing' }, status: :unprocessable_entity
+    end

    old_fields_hash = @template.fields.hash

@@ -17,6 +17,9 @@ class TemplatesPreferencesController < ApplicationController
  private

  def template_params
-    params.require(:template).permit(preferences: %i[bcc_completed request_email_subject request_email_body])
+    params.require(:template).permit(
+      preferences: %i[bcc_completed request_email_subject request_email_body
+                      documents_copy_email_subject documents_copy_email_body]
+    )
  end
 end
@@ -26,6 +26,8 @@ class TemplatesUploadsController < ApplicationController
  rescue StandardError => e
    Rollbar.error(e) if defined?(Rollbar)

+    raise if Rails.env.local?
+
    redirect_to root_path, alert: 'Unable to upload file'
  end

@@ -1,9 +1,13 @@
 # frozen_string_literal: true

 class TimestampServerController < ApplicationController
+  HASH_ALGORITHM = 'SHA256'
+
  before_action :build_encrypted_config
  authorize_resource :encrypted_config

+  TimestampError = Class.new(StandardError)
+
  def create
    return head :not_found if Docuseal.multitenant?

@@ -14,25 +18,29 @@ class TimestampServerController < ApplicationController
    else
      redirect_back fallback_location: settings_notifications_path, alert: 'Unable to save'
    end
-  rescue HexaPDF::Error, SocketError, Submissions::TimestampHandler::TimestampError, OpenSSL::Timestamp::TimestampError
+  rescue SocketError, TimestampError, OpenSSL::Timestamp::TimestampError
    redirect_back fallback_location: settings_notifications_path, alert: 'Invalid Timeserver'
  end

  private

  def test_timeserver_url(url)
-    pdf = HexaPDF::Document.new
-    pdf.pages.add
+    req = OpenSSL::Timestamp::Request.new
+    req.algorithm = HASH_ALGORITHM
+    req.message_imprint = OpenSSL::Digest.digest(HASH_ALGORITHM, 'test')

-    pkcs = Accounts.load_signing_pkcs(current_account)
+    uri = Addressable::URI.parse(url)

-    pdf.sign(StringIO.new,
-             reason: 'Test',
-             certificate: pkcs.certificate,
-             key: pkcs.key,
-             signature_size: 10_000,
-             certificate_chain: pkcs.ca_certs || [],
-             timestamp_handler: Submissions::TimestampHandler.new(tsa_url: url))
+    conn = Faraday.new(uri.origin) do |c|
+      c.basic_auth(uri.user, uri.password) if uri.password.present?
+    end
+
+    response = conn.post(uri.path, req.to_der,
+                         'content-type' => 'application/timestamp-query')
+
+    raise TimestampError if response.status != 200 || response.body.blank?
+
+    response
  end

  def load_encrypted_config
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+class UserInitialsController < ApplicationController
+  before_action :load_user_config
+  authorize_resource :user_config
+
+  def edit; end
+
+  def update
+    file = params[:file]
+
+    return redirect_to settings_profile_index_path, notice: 'Unable to save initials' if file.blank?
+
+    blob = ActiveStorage::Blob.create_and_upload!(io: file.open,
+                                                  filename: file.original_filename,
+                                                  content_type: file.content_type)
+
+    attachment = ActiveStorage::Attachment.create!(
+      blob:,
+      name: 'initials',
+      record: current_user
+    )
+
+    if @user_config.update(value: attachment.uuid)
+      redirect_to settings_profile_index_path, notice: 'Initials has been saved'
+    else
+      redirect_to settings_profile_index_path, notice: 'Unable to save initials'
+    end
+  end
+
+  def destroy
+    @user_config.destroy
+
+    redirect_to settings_profile_index_path, notice: 'Initials has been removed'
+  end
+
+  private
+
+  def load_user_config
+    @user_config =
+      UserConfig.find_or_initialize_by(user: current_user, key: UserConfig::INITIALS_KEY)
+  end
+end
@@ -27,6 +27,7 @@ class UsersController < ApplicationController
    if existing_user
      existing_user.archived_at = nil
      existing_user.assign_attributes(user_params)
+      existing_user.account = current_account

      @user = existing_user
    end
@@ -7,6 +7,7 @@ class WebhookPreferencesController < ApplicationController
    form.completed
    template.created
    template.updated
+    submission.created
    submission.archived
  ].freeze

@@ -41,26 +41,6 @@ document.addEventListener('keyup', (e) => {
  }
 })

-window.customElements.define('toggle-visible', ToggleVisible)
-window.customElements.define('disable-hidden', DisableHidden)
-window.customElements.define('turbo-modal', TurboModal)
-window.customElements.define('file-dropzone', FileDropzone)
-window.customElements.define('menu-active', MenuActive)
-window.customElements.define('clipboard-copy', ClipboardCopy)
-window.customElements.define('dynamic-list', DynamicList)
-window.customElements.define('download-button', DownloadButton)
-window.customElements.define('set-origin-url', SetOriginUrl)
-window.customElements.define('set-timezone', SetTimezone)
-window.customElements.define('autoresize-textarea', AutoresizeTextarea)
-window.customElements.define('submitters-autocomplete', SubmittersAutocomplete)
-window.customElements.define('folder-autocomplete', FolderAutocomplete)
-window.customElements.define('signature-form', SignatureForm)
-window.customElements.define('submit-form', SubmitForm)
-window.customElements.define('prompt-password', PromptPassword)
-window.customElements.define('emails-textarea', EmailsTextarea)
-window.customElements.define('toggle-cookies', ToggleCookies)
-window.customElements.define('toggle-on-submit', ToggleOnSubmit)
-
 document.addEventListener('turbo:before-fetch-request', encodeMethodIntoRequestBody)
 document.addEventListener('turbo:submit-end', async (event) => {
  const resp = event.detail?.formSubmission?.result?.fetchResponse?.response
@@ -84,7 +64,29 @@ document.addEventListener('turbo:submit-end', async (event) => {
  URL.revokeObjectURL(url)
 })

-window.customElements.define('template-builder', class extends HTMLElement {
+const safeRegisterElement = (name, element, options = {}) => !window.customElements.get(name) && window.customElements.define(name, element, options)
+
+safeRegisterElement('toggle-visible', ToggleVisible)
+safeRegisterElement('disable-hidden', DisableHidden)
+safeRegisterElement('turbo-modal', TurboModal)
+safeRegisterElement('file-dropzone', FileDropzone)
+safeRegisterElement('menu-active', MenuActive)
+safeRegisterElement('clipboard-copy', ClipboardCopy)
+safeRegisterElement('dynamic-list', DynamicList)
+safeRegisterElement('download-button', DownloadButton)
+safeRegisterElement('set-origin-url', SetOriginUrl)
+safeRegisterElement('set-timezone', SetTimezone)
+safeRegisterElement('autoresize-textarea', AutoresizeTextarea)
+safeRegisterElement('submitters-autocomplete', SubmittersAutocomplete)
+safeRegisterElement('folder-autocomplete', FolderAutocomplete)
+safeRegisterElement('signature-form', SignatureForm)
+safeRegisterElement('submit-form', SubmitForm)
+safeRegisterElement('prompt-password', PromptPassword)
+safeRegisterElement('emails-textarea', EmailsTextarea)
+safeRegisterElement('toggle-cookies', ToggleCookies)
+safeRegisterElement('toggle-on-submit', ToggleOnSubmit)
+
+safeRegisterElement('template-builder', class extends HTMLElement {
  connectedCallback () {
    this.appElem = document.createElement('div')

@@ -116,7 +118,7 @@ window.customElements.define('template-builder', class extends HTMLElement {
  }
 })

-window.customElements.define('import-list', class extends HTMLElement {
+safeRegisterElement('import-list', class extends HTMLElement {
  connectedCallback () {
    this.appElem = document.createElement('div')

@@ -0,0 +1,113 @@
+import SignaturePad from 'signature_pad'
+import { cropCanvasAndExportToPNG } from './submission_form/crop_canvas'
+
+window.customElements.define('draw-signature', class extends HTMLElement {
+  connectedCallback () {
+    const scale = 3
+
+    this.canvas.width = this.canvas.parentNode.clientWidth * scale
+    this.canvas.height = this.canvas.parentNode.clientHeight * scale
+
+    this.canvas.getContext('2d').scale(scale, scale)
+
+    this.pad = new SignaturePad(this.canvas)
+
+    this.pad.addEventListener('endStroke', () => {
+      this.updateSubmitButtonVisibility()
+    })
+
+    this.clearButton.addEventListener('click', (e) => {
+      e.preventDefault()
+
+      this.clearSignaturePad()
+    })
+
+    this.form.addEventListener('submit', (e) => {
+      e.preventDefault()
+
+      this.submitButton.disabled = true
+
+      this.submitImage().then((data) => {
+        this.valueInput.value = data.uuid
+
+        return fetch(this.form.action, {
+          method: 'PUT',
+          body: new FormData(this.form)
+        }).then((response) => {
+          this.form.classList.add('hidden')
+          this.success.classList.remove('hidden')
+
+          return response
+        })
+      }).finally(() => {
+        this.submitButton.disabled = false
+      })
+    })
+  }
+
+  clearSignaturePad () {
+    this.pad.clear()
+    this.updateSubmitButtonVisibility()
+  }
+
+  updateSubmitButtonVisibility () {
+    if (this.pad.isEmpty()) {
+      this.submitButton.style.display = 'none'
+      this.placeholderButton.style.display = 'block'
+    } else {
+      this.submitButton.style.display = 'block'
+      this.placeholderButton.style.display = 'none'
+    }
+  }
+
+  async submitImage () {
+    return new Promise((resolve, reject) => {
+      cropCanvasAndExportToPNG(this.canvas, { errorOnTooSmall: true }).then(async (blob) => {
+        const file = new File([blob], 'signature.png', { type: 'image/png' })
+
+        const formData = new FormData()
+
+        formData.append('file', file)
+        formData.append('submitter_slug', this.dataset.slug)
+        formData.append('name', 'attachments')
+
+        return fetch('/api/attachments', {
+          method: 'POST',
+          body: formData
+        }).then((resp) => resp.json()).then((attachment) => {
+          return resolve(attachment)
+        })
+      }).catch((error) => {
+        return reject(error)
+      })
+    })
+  }
+
+  get submitButton () {
+    return this.querySelector('button[type="submit"]')
+  }
+
+  get clearButton () {
+    return this.querySelector('button[aria-label="Clear"]')
+  }
+
+  get placeholderButton () {
+    return this.querySelector('button[disabled]')
+  }
+
+  get canvas () {
+    return this.querySelector('canvas')
+  }
+
+  get valueInput () {
+    return this.querySelector('input[name^="values"]')
+  }
+
+  get form () {
+    return this.querySelector('form')
+  }
+
+  get success () {
+    return this.querySelector('#success')
+  }
+})
@@ -17,13 +17,18 @@ export default targetable(class extends HTMLElement {

    this.toggleState()

-    fetch(this.dataset.src).then((response) => response.json()).then((urls) => {
-      const isSafariIos = /iPhone|iPad|iPod/i.test(navigator.userAgent)
+    fetch(this.dataset.src).then(async (response) => {
+      if (response.ok) {
+        const urls = await response.json()
+        const isSafariIos = /iPhone|iPad|iPod/i.test(navigator.userAgent)

-      if (isSafariIos && urls.length > 1) {
-        this.downloadSafariIos(urls)
+        if (isSafariIos && urls.length > 1) {
+          this.downloadSafariIos(urls)
+        } else {
+          this.downloadUrls(urls)
+        }
      } else {
-        this.downloadUrls(urls)
+        alert('Failed to download files')
      }
    })
  }
@@ -45,11 +45,7 @@ export default class extends HTMLElement {
      this.currentFetch.then(async (resp) => {
        const items = await resp.json()

-        if (q.length < 3) {
-          resolve(items.filter((e) => e[this.dataset.field].startsWith(q)))
-        } else {
-          resolve(items)
-        }
+        resolve(items)
      }).catch(() => {
        resolve([])
      }).finally(() => {
@@ -0,0 +1,21 @@
+export default class extends HTMLElement {
+  connectedCallback () {
+    this.button.disabled = false
+
+    this.form.addEventListener('submit', () => {
+      this.button.disabled = true
+    })
+  }
+
+  disconnectedCallback () {
+    this.button.disabled = false
+  }
+
+  get button () {
+    return this.querySelector('[type="submit"]')
+  }
+
+  get form () {
+    return this.querySelector('form') || this.closest('form')
+  }
+}
@@ -2,9 +2,13 @@ import { createApp, reactive } from 'vue'

 import Form from './submission_form/form'
 import DownloadButton from './elements/download_button'
+import ToggleSubmit from './elements/toggle_submit'

-window.customElements.define('download-button', DownloadButton)
-window.customElements.define('submission-form', class extends HTMLElement {
+const safeRegisterElement = (name, element, options = {}) => !window.customElements.get(name) && window.customElements.define(name, element, options)
+
+safeRegisterElement('download-button', DownloadButton)
+safeRegisterElement('toggle-submit', ToggleSubmit)
+safeRegisterElement('submission-form', class extends HTMLElement {
  connectedCallback () {
    this.appElem = document.createElement('div')

@@ -20,6 +24,7 @@ window.customElements.define('submission-form', class extends HTMLElement {
      authenticityToken: document.querySelector('meta[name="csrf-token"]')?.content,
      values: reactive(JSON.parse(this.dataset.values)),
      completedButton: JSON.parse(this.dataset.completedButton || '{}'),
+      withQrButton: true,
      completedMessage: JSON.parse(this.dataset.completedMessage || '{}'),
      completedRedirectUrl: this.dataset.completedRedirectUrl,
      attachments: reactive(JSON.parse(this.dataset.attachments)),
@@ -0,0 +1,34 @@
+import Rollbar from 'rollbar/dist/rollbar.umd'
+
+const token = document.querySelector('meta[name="rollbar-token"]')?.getAttribute('content')
+
+if (token) {
+  window.Rollbar ||= new Rollbar({
+    accessToken: token,
+    captureUncaught: true,
+    captureUnhandledRejections: true,
+    captureIp: false,
+    autoInstrument: false,
+    ignoredMessages: [
+      /Failed to fetch/i,
+      /NetworkError/i,
+      /Load failed/i,
+      /Clipboard write is not allowed/i
+    ],
+    transform (payload) {
+      payload.body.telemetry = []
+
+      const string = JSON.stringify(payload)
+
+      return JSON.parse(string.replace(/(\/[des]\/)\w{6}/g, (_, m) => m))
+    },
+    payload: {
+      client: {
+        javascript: {
+          source_map_enabled: true
+        }
+      },
+      environment: 'production'
+    }
+  })
+}
@@ -197,13 +197,18 @@ export default {
    download () {
      this.isDownloading = true

-      fetch(this.baseUrl + `/submitters/${this.submitterSlug}/download`).then((response) => response.json()).then((urls) => {
-        const isSafariIos = /iPhone|iPad|iPod/i.test(navigator.userAgent)
+      fetch(this.baseUrl + `/submitters/${this.submitterSlug}/download`).then(async (response) => {
+        if (response.ok) {
+          const urls = await response.json()
+          const isSafariIos = /iPhone|iPad|iPod/i.test(navigator.userAgent)

-        if (isSafariIos && urls.length > 1) {
-          this.downloadSafariIos(urls)
+          if (isSafariIos && urls.length > 1) {
+            this.downloadSafariIos(urls)
+          } else {
+            this.downloadUrls(urls)
+          }
        } else {
-          this.downloadUrls(urls)
+          alert('Failed to download files')
        }
      })
    },
@@ -326,6 +326,7 @@
            :attachments-index="attachmentsIndex"
            :button-text="buttonText"
            :with-disclosure="withDisclosure"
+            :with-qr-button="withQrButton"
            :submitter-slug="submitterSlug"
            :show-field-names="showFieldNames"
            @attached="attachments.push($event)"
@@ -384,7 +385,7 @@
        </div>
        <div
          v-if="currentField.type !== 'payment' || submittedValues[currentField.uuid]"
-          :class="withDisclosure && currentField.type === 'signature' ? 'mt-2' : 'mt-6 md:mt-8'"
+          :class="currentField.type === 'signature' ? 'mt-2' : 'mt-6 md:mt-8'"
        >
          <button
            id="submit_form_button"
@@ -398,7 +399,7 @@
                v-if="isSubmitting"
                class="mr-1 animate-spin"
              />
-              <span v-else>
+              <span>
                {{ buttonText }}
              </span><span
                v-if="isSubmitting"
@@ -578,6 +579,11 @@ export default {
      required: false,
      default: true
    },
+    withQrButton: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
    withTypedSignature: {
      type: Boolean,
      required: false,
@@ -618,6 +624,11 @@ export default {
      required: false,
      default: false
    },
+    dryRun: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
    attribution: {
      type: Boolean,
      required: false,
@@ -774,7 +785,7 @@ export default {
      this.isFormVisible = value
    },
    currentStepFields (value) {
-      if (isEmpty(value)) {
+      if (isEmpty(value) && this.currentStep > 0) {
        this.currentStep -= 1
      }
    }
@@ -967,14 +978,16 @@ export default {
      this.$nextTick(() => {
        this.recalculateButtonDisabledKey = Math.random()

-        if (scrollToArea) {
-          this.scrollIntoField(step[0])
+        if (!this.isCompleted) {
+          if (scrollToArea) {
+            this.scrollIntoField(step[0])

-          this.$refs.form.querySelector('input[type="date"], input[type="number"], input[type="text"], select')?.focus()
-        }
+            this.$refs.form.querySelector('input[type="date"], input[type="number"], input[type="text"], select')?.focus()
+          }

-        if (clickUpload && !this.values[this.currentField.uuid] && ['file', 'image'].includes(this.currentField.type)) {
-          this.$refs.form.querySelector('input[type="file"]')?.click()
+          if (clickUpload && !this.values[this.currentField.uuid] && ['file', 'image'].includes(this.currentField.type)) {
+            this.$refs.form.querySelector('input[type="file"]')?.click()
+          }
        }
      })
    },
@@ -1030,7 +1043,7 @@ export default {
        const formData = new FormData(this.$refs.form)
        const isLastStep = this.currentStep === this.stepFields.length - 1

-        if (isLastStep && !emptyRequiredField) {
+        if (isLastStep && !emptyRequiredField && !this.dryRun) {
          formData.append('completed', 'true')
        }

@@ -5,6 +5,8 @@ const en = {
  esignature_disclosure: 'eSignature Disclosure',
  signature: 'Signature',
  initials: 'Initials',
+  drawn_signature_on_a_touchscreen_device: 'Drawn signature on a touchscreen device',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Scan the QR code with the camera app to open the form on mobile and draw your signature',
  date: 'Date',
  number: 'Number',
  image: 'Image',
@@ -68,6 +70,8 @@ const en = {
 }

 const es = {
+  drawn_signature_on_a_touchscreen_device: 'Firma dibujada en un dispositivo con pantalla táctil',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Escanea el código QR con la aplicación de la cámara para abrir el formulario en el móvil y dibujar tu firma',
  by_clicking_you_agree_to_the: 'Al hacer clic en "{button}", usted acepta el',
  electronic_signature_disclosure: 'Divulgación de Firma Electrónica',
  esignature_disclosure: 'Divulgación de eFirma',
@@ -136,6 +140,8 @@ const es = {
 }

 const it = {
+  drawn_signature_on_a_touchscreen_device: 'Firma disegnata su un dispositivo con schermo tattile',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Scansiona il codice QR con l\'app della fotocamera per aprire il modulo sul cellulare e disegnare la tua firma',
  by_clicking_you_agree_to_the: 'Cliccando su "{button}", accetti il',
  electronic_signature_disclosure: 'Divulgazione della Firma Elettronica',
  esignature_disclosure: 'Divulgazione della eFirma',
@@ -204,6 +210,8 @@ const it = {
 }

 const de = {
+  drawn_signature_on_a_touchscreen_device: 'Gezeichnete Unterschrift auf einem Touchscreen-Gerät',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Scannen Sie den QR-Code mit der Kamera-App, um das Formular auf dem Handy zu öffnen und Ihre Unterschrift zu zeichnen',
  by_clicking_you_agree_to_the: 'Durch Klicken auf "{button}" stimmen Sie zu, dass Sie die',
  electronic_signature_disclosure: 'Elektronische Unterschriftenoffenlegung',
  esignature_disclosure: 'eSignatur Offenlegung',
@@ -272,6 +280,8 @@ const de = {
 }

 const fr = {
+  drawn_signature_on_a_touchscreen_device: 'Signature dessinée sur un appareil à écran tactile',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Scannez le code QR avec l\'application de l\'appareil photo pour ouvrir le formulaire sur mobile et dessiner votre signature',
  by_clicking_you_agree_to_the: 'En cliquant sur "{button}", vous acceptez la',
  electronic_signature_disclosure: 'Divulgation de Signature Électronique',
  esignature_disclosure: 'Divulgation de la eSignature',
@@ -340,6 +350,8 @@ const fr = {
 }

 const pl = {
+  drawn_signature_on_a_touchscreen_device: 'Podpis odręczny na urządzeniu z ekranem dotykowym',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Zeskanuj kod QR za pomocą aplikacji aparatu, aby otworzyć formularz na telefonie i narysować swój podpis',
  by_clicking_you_agree_to_the: 'Klikając na "{button}", zgadzasz się na',
  electronic_signature_disclosure: 'Ujawnienie Elektronicznej Sygnatury',
  esignature_disclosure: 'Ujawnienie ePodpisu',
@@ -408,6 +420,8 @@ const pl = {
 }

 const uk = {
+  drawn_signature_on_a_touchscreen_device: 'Підпис на сенсорному пристрої',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Скануйте QR-код за допомогою програми камери, щоб відкрити форму на мобільному пристрої та намалювати свій підпис',
  by_clicking_you_agree_to_the: 'Натиснувши на "{button}", ви погоджуєтеся з',
  electronic_signature_disclosure: 'Розголошення Електронного Підпису',
  esignature_disclosure: 'Розголошення еПідпису',
@@ -476,6 +490,8 @@ const uk = {
 }

 const cs = {
+  drawn_signature_on_a_touchscreen_device: 'Namalovaný podpis na dotykovém zařízení',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Naskenujte QR kód pomocí aplikace fotoaparátu, abyste otevřeli formulář na mobilním zařízení a nakreslili svůj podpis',
  by_clicking_you_agree_to_the: 'Kliknutím na "{button}" souhlasíte s',
  electronic_signature_disclosure: 'Zveřejněním Elektronického Podpisu',
  esignature_disclosure: 'Zveřejnění ePodpisu',
@@ -544,6 +560,8 @@ const cs = {
 }

 const pt = {
+  drawn_signature_on_a_touchscreen_device: 'Assinatura desenhada em um dispositivo com tela sensível ao toque',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Escaneie o código QR com o aplicativo da câmera para abrir o formulário no celular e desenhar sua assinatura',
  by_clicking_you_agree_to_the: 'Ao clicar em "{button}", você concorda com o',
  electronic_signature_disclosure: 'Divulgação de Assinatura Eletrônica',
  esignature_disclosure: 'Divulgação da eAssinatura',
@@ -612,6 +630,8 @@ const pt = {
 }

 const he = {
+  drawn_signature_on_a_touchscreen_device: 'חתימה שנוצרה במכשיר עם מסך מגע',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'סרוק את קוד ה-QR באמצעות אפליקציית המצלמה כדי לפתוח את הטופס במובייל ולצייר את החתימה שלך',
  by_clicking_you_agree_to_the: 'על ידי לחיצה על "{button}", אתה מסכים ל',
  electronic_signature_disclosure: 'חשיפת חתימה אלקטרונית',
  esignature_disclosure: 'חשיפת ה-eחתימה',
@@ -681,6 +701,8 @@ const he = {
 }

 const nl = {
+  drawn_signature_on_a_touchscreen_device: 'Getekende handtekening op een apparaat met een touchscreen',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Scan de QR-code met de camera-app om het formulier op mobiel te openen en uw handtekening te tekenen',
  by_clicking_you_agree_to_the: 'Door op "{button}" te klikken, gaat u akkoord met de',
  electronic_signature_disclosure: 'Openbaarmaking van Elektronische Handtekening',
  esignature_disclosure: 'Openbaarmaking van eHandtekening',
@@ -750,6 +772,8 @@ const nl = {
 }

 const ar = {
+  drawn_signature_on_a_touchscreen_device: 'توقيع مرسوم على جهاز بشاشة تعمل باللمس',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'امسح رمز الاستجابة السريعة باستخدام تطبيق الكاميرا لفتح النموذج على الهاتف المحمول ورسم توقيعك',
  by_clicking_you_agree_to_the: 'بالنقر فوق "{button}"، أنت توافق على',
  electronic_signature_disclosure: 'كشف التوقيع الإلكتروني',
  esignature_disclosure: 'كشف التوقيع الإلكتروني',
@@ -819,6 +843,8 @@ const ar = {
 }

 const ko = {
+  drawn_signature_on_a_touchscreen_device: '터치스크린 장치에서 그린 서명',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: '카메라 앱으로 QR 코드를 스캔하여 모바일에서 양식을 열고 서명을 그리세요',
  by_clicking_you_agree_to_the: '"{button}"를 클릭함으로써, 다음에 동의하게 됩니다',
  electronic_signature_disclosure: '전자 서명 공개',
  esignature_disclosure: '전자 서명 공개',
@@ -189,7 +189,7 @@ export default {
    this.$nextTick(() => {
      if (this.$refs.canvas) {
        this.$refs.canvas.width = this.$refs.canvas.parentNode.clientWidth * scale
-        this.$refs.canvas.height = (this.$refs.canvas.parentNode.clientWidth / 3) * scale
+        this.$refs.canvas.height = (this.$refs.canvas.parentNode.clientWidth / 4.5) * scale

        this.$refs.canvas.getContext('2d').scale(scale, scale)
      }
@@ -208,7 +208,7 @@ export default {
        entries.forEach(entry => {
          if (entry.isIntersecting) {
            this.$refs.canvas.width = this.$refs.canvas.parentNode.clientWidth * scale
-            this.$refs.canvas.height = (this.$refs.canvas.parentNode.clientWidth / 3) * scale
+            this.$refs.canvas.height = (this.$refs.canvas.parentNode.clientWidth / 4.5) * scale

            this.$refs.canvas.getContext('2d').scale(scale, scale)

@@ -28,7 +28,7 @@
            id="type_text_button"
            href="#"
            class="btn btn-outline btn-sm font-medium"
-            @click.prevent="toggleTextInput"
+            @click.prevent="[toggleTextInput(), hideQr()]"
          >
            <IconSignature :width="16" />
            <span class="hidden sm:inline">
@@ -45,7 +45,7 @@
            id="type_text_button"
            href="#"
            class="btn btn-outline btn-sm font-medium inline-flex flex-nowrap"
-            @click.prevent="toggleTextInput"
+            @click.prevent="[toggleTextInput(), hideQr()]"
          >
            <IconTextSize :width="16" />
            <span class="hidden sm:inline">
@@ -87,7 +87,7 @@
          v-else
          href="#"
          class="btn btn-outline btn-sm font-medium"
-          @click.prevent="clear"
+          @click.prevent="[clear(), hideQr()]"
        >
          <IconReload :width="16" />
          {{ t('clear') }}
@@ -123,12 +123,56 @@
      :src="attachmentsIndex[modelValue || computedPreviousValue].url"
      class="mx-auto bg-white border border-base-300 rounded max-h-72"
    >
-    <canvas
-      v-show="!modelValue && !computedPreviousValue"
-      ref="canvas"
-      style="padding: 1px; 0"
-      class="bg-white border border-base-300 rounded-2xl w-full"
-    />
+    <div class="relative">
+      <div
+        v-if="withQrButton"
+        class="absolute top-1.5 right-1.5 tooltip hidden md:inline"
+        :data-tip="t('drawn_signature_on_a_touchscreen_device')"
+      >
+        <a
+          v-if="!isShowQr && !isSignatureStarted && !isTextSignature && !modelValue"
+          href="#"
+          class="btn btn-sm btn-circle btn-ghost"
+          @click.prevent="showQr"
+        >
+          <IconQrcode />
+        </a>
+      </div>
+      <canvas
+        v-show="!modelValue && !computedPreviousValue"
+        ref="canvas"
+        style="padding: 1px; 0"
+        class="bg-white border border-base-300 rounded-2xl w-full"
+      />
+      <div
+        v-show="isShowQr"
+        class="top-0 bottom-0 right-0 left-0 absolute bg-base-content/10 rounded-2xl"
+      >
+        <div
+          class="absolute top-1.5 right-1.5 tooltip"
+        >
+          <a
+            href="#"
+            class="btn btn-sm btn-circle btn-normal btn-outline"
+            @click.prevent="hideQr"
+          >
+            <IconX />
+          </a>
+        </div>
+        <div class="flex items-center justify-center w-full h-full p-4">
+          <div
+            v-if="withQrButton"
+            ref="qr"
+            class="bg-white p-4 rounded-xl h-full"
+          >
+            <canvas
+              ref="qrCanvas"
+              class="h-full"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
    <input
      v-if="isTextSignature"
      id="signature_text_input"
@@ -140,7 +184,14 @@
      @input="updateWrittenSignature"
    >
    <div
-      v-if="withDisclosure"
+      v-if="isShowQr"
+      dir="auto"
+      class="text-base-content/60 text-xs text-center w-full mt-1"
+    >
+      {{ t('scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature') }}
+    </div>
+    <div
+      v-else-if="withDisclosure"
      dir="auto"
      class="text-base-content/60 text-xs text-center w-full mt-1"
    >
@@ -156,11 +207,15 @@
        </span>
      </a>
    </div>
+    <div
+      v-else
+      class="mt-5 md:mt-7"
+    />
  </div>
 </template>

 <script>
-import { IconReload, IconCamera, IconSignature, IconTextSize, IconArrowsDiagonalMinimize2 } from '@tabler/icons-vue'
+import { IconReload, IconCamera, IconSignature, IconTextSize, IconArrowsDiagonalMinimize2, IconQrcode, IconX } from '@tabler/icons-vue'
 import { cropCanvasAndExportToPNG } from './crop_canvas'
 import SignaturePad from 'signature_pad'
 import AppearsOn from './appears_on'
@@ -176,7 +231,9 @@ export default {
    AppearsOn,
    IconReload,
    IconCamera,
+    IconQrcode,
    MarkdownContent,
+    IconX,
    IconTextSize,
    IconSignature,
    IconArrowsDiagonalMinimize2
@@ -201,6 +258,11 @@ export default {
      required: false,
      default: false
    },
+    withQrButton: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
    buttonText: {
      type: String,
      required: false,
@@ -231,6 +293,7 @@ export default {
  data () {
    return {
      isSignatureStarted: !!this.previousValue,
+      isShowQr: false,
      isUsePreviousValue: true,
      isTextSignature: this.field.preferences?.format === 'typed',
      uploadImageInputKey: Math.random().toString()
@@ -253,6 +316,18 @@ export default {

        this.$refs.canvas.getContext('2d').scale(scale, scale)
      }
+
+      if (this.withQrButton) {
+        import('qr-creator').then(({ default: Qr }) => {
+          Qr.render({
+            text: `${document.location.origin}/p/${this.submitterSlug}?f=${this.field.uuid.split('-')[0]}`,
+            radius: 0.0,
+            ecLevel: 'H',
+            background: null,
+            size: 132
+          }, this.$refs.qrCanvas)
+        })
+      }
    })

    if (this.$refs.canvas) {
@@ -282,6 +357,7 @@ export default {
  },
  beforeUnmount () {
    this.intersectionObserver?.disconnect()
+    this.stopCheckSignature()
  },
  methods: {
    remove () {
@@ -303,6 +379,41 @@ export default {
        })
      }
    },
+    showQr () {
+      this.isShowQr = true
+
+      this.startCheckSignature()
+    },
+    hideQr () {
+      this.isShowQr = false
+
+      this.stopCheckSignature()
+    },
+    startCheckSignature () {
+      const after = JSON.stringify(new Date())
+
+      this.checkSignatureInterval = setInterval(() => {
+        this.checkSignature({ after })
+      }, 2000)
+    },
+    stopCheckSignature () {
+      if (this.checkSignatureInterval) {
+        clearInterval(this.checkSignatureInterval)
+      }
+    },
+    checkSignature (params = {}) {
+      return fetch(this.baseUrl + '/s/' + this.submitterSlug + '/values?field_uuid=' + this.field.uuid + '&after=' + params.after, {
+        method: 'GET'
+      }).then(async (resp) => {
+        const { attachment } = await resp.json()
+
+        if (attachment?.uuid) {
+          this.$emit('attached', attachment)
+          this.$emit('update:model-value', attachment.uuid)
+          this.hideQr()
+        }
+      })
+    },
    clear () {
      this.pad.clear()

@@ -1116,7 +1116,13 @@ export default {
      if (!this.isAllRequiredFieldsAdded) {
        e.preventDefault()

-        return alert(this.t('add_all_required_fields_to_continue'))
+        const fields = this.defaultRequiredFields?.filter((f) => {
+          return !this.template.fields?.some((field) => field.name === f.name)
+        })
+
+        if (fields?.length) {
+          return alert(this.t('add_all_required_fields_to_continue') + ': ' + fields.map((f) => f.name).join(', '))
+        }
      }

      if (!this.template.fields.length) {
@@ -1127,7 +1133,13 @@ export default {
    },
    onSaveClick () {
      if (!this.isAllRequiredFieldsAdded) {
-        return alert(this.t('add_all_required_fields_to_continue'))
+        const fields = this.defaultRequiredFields?.filter((f) => {
+          return !this.template.fields?.some((field) => field.name === f.name)
+        })
+
+        if (fields?.length) {
+          return alert(this.t('add_all_required_fields_to_continue') + ': ' + fields.map((f) => f.name).join(', '))
+        }
      }

      if (this.template.fields.length) {
@@ -57,7 +57,7 @@
          class="flex items-center space-x-1"
        >
          <button
-            v-if="field && !field.areas.length"
+            v-if="field && !field.areas?.length"
            :title="t('draw')"
            class="relative cursor-pointer text-transparent group-hover:text-base-content"
            @click="$emit('set-draw', { field })"
@@ -1,6 +1,8 @@
 # frozen_string_literal: true

 class SendFormCompletedWebhookRequestJob < ApplicationJob
+  queue_as :webhooks
+
  USER_AGENT = 'DocuSeal.co Webhook'

  MAX_ATTEMPTS = 10
@@ -1,6 +1,8 @@
 # frozen_string_literal: true

 class SendFormStartedWebhookRequestJob < ApplicationJob
+  queue_as :webhooks
+
  USER_AGENT = 'DocuSeal.co Webhook'

  MAX_ATTEMPTS = 10
@@ -1,6 +1,8 @@
 # frozen_string_literal: true

 class SendFormViewedWebhookRequestJob < ApplicationJob
+  queue_as :webhooks
+
  USER_AGENT = 'DocuSeal.co Webhook'

  MAX_ATTEMPTS = 10
@@ -1,6 +1,8 @@
 # frozen_string_literal: true

 class SendSubmissionArchivedWebhookRequestJob < ApplicationJob
+  queue_as :webhooks
+
  USER_AGENT = 'DocuSeal.co Webhook'

  MAX_ATTEMPTS = 10
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+class SendSubmissionCreatedWebhookRequestJob < ApplicationJob
+  queue_as :webhooks
+
+  USER_AGENT = 'DocuSeal.co Webhook'
+
+  MAX_ATTEMPTS = 10
+
+  def perform(submission, params = {})
+    attempt = params[:attempt].to_i
+    url = Accounts.load_webhook_url(submission.account)
+
+    return if url.blank?
+
+    preferences = Accounts.load_webhook_preferences(submission.account)
+
+    return if preferences['submission.created'].blank?
+
+    resp = begin
+      Faraday.post(url,
+                   {
+                     event_type: 'submission.created',
+                     timestamp: Time.current,
+                     data: Submissions::SerializeForApi.call(submission)
+                   }.to_json,
+                   'Content-Type' => 'application/json',
+                   'User-Agent' => USER_AGENT)
+    rescue Faraday::Error
+      nil
+    end
+
+    if (resp.nil? || resp.status.to_i >= 400) && attempt <= MAX_ATTEMPTS &&
+       (!Docuseal.multitenant? || submission.account.account_configs.exists?(key: :plan))
+      SendSubmissionCreatedWebhookRequestJob.set(wait: (2**attempt).minutes)
+                                            .perform_later(submission, {
+                                                             attempt: attempt + 1,
+                                                             last_status: resp&.status.to_i
+                                                           })
+    end
+  end
+end
@@ -1,6 +1,8 @@
 # frozen_string_literal: true

 class SendTemplateCreatedWebhookRequestJob < ApplicationJob
+  queue_as :webhooks
+
  USER_AGENT = 'DocuSeal.co Webhook'

  MAX_ATTEMPTS = 10
@@ -1,6 +1,8 @@
 # frozen_string_literal: true

 class SendTemplateUpdatedWebhookRequestJob < ApplicationJob
+  queue_as :webhooks
+
  USER_AGENT = 'DocuSeal.co Webhook'

  MAX_ATTEMPTS = 10
@@ -76,9 +76,15 @@ class SubmitterMailer < ApplicationMailer
      submitter, with_audit_log: @email_config.nil? || @email_config.value['attach_audit_log'] != false
    )

+    @subject = @submitter.template.preferences['documents_copy_email_subject'].presence
+    @subject ||= @email_config.value['subject'] if @email_config
+
+    @body = @submitter.template.preferences['documents_copy_email_body'].presence
+    @body ||= @email_config.value['body'] if @email_config
+
    subject =
-      if @email_config
-        ReplaceEmailVariables.call(@email_config.value['subject'], submitter:)
+      if @subject.present?
+        ReplaceEmailVariables.call(@subject, submitter:)
      else
        'Your document copy'
      end
@@ -52,6 +52,7 @@ class Submission < ApplicationRecord
  attribute :slug, :string, default: -> { SecureRandom.base58(14) }

  has_one_attached :audit_trail
+  has_one_attached :combined_document

  has_many :template_schema_documents,
           ->(e) { where(uuid: (e.template_schema.presence || e.template.schema).pluck('attachment_uuid')) },
@@ -50,6 +50,7 @@ class User < ApplicationRecord
  EMAIL_REGEXP = /[^@;,<>\s]+@[^@;,<>\s]+/

  has_one_attached :signature
+  has_one_attached :initials

  belongs_to :account
  has_one :access_token, dependent: :destroy
@@ -22,6 +22,7 @@
 #
 class UserConfig < ApplicationRecord
  SIGNATURE_KEY = 'signature'
+  INITIALS_KEY = 'initials'
  RECEIVE_COMPLETED_EMAIL = 'receive_completed_email'

  belongs_to :user
@@ -3,7 +3,7 @@
  <div class="flex-grow max-w-xl mx-auto">
    <h1 class="text-4xl font-bold mb-4">Account</h1>
    <%= form_for '', url: settings_account_path, method: :patch, html: { autocomplete: 'off', class: 'space-y-4' } do |f| %>
-      <%= f.fields_for current_account do |ff| %>
+      <%= fields_for current_account do |ff| %>
        <div class="form-control">
          <%= ff.label :name, 'Company Name', class: 'label' %>
          <%= ff.text_field :name, required: true, class: 'base-input', dir: 'auto' %>
@@ -23,7 +23,7 @@
      <% end %>
      <% encrypted_config = @encrypted_config || EncryptedConfig.find_or_initialize_by(account: current_account, key: EncryptedConfig::APP_URL_KEY) %>
      <% if !Docuseal.multitenant? && can?(:manage, encrypted_config) && !current_account.testing? %>
-        <%= f.fields_for encrypted_config do |ff| %>
+        <%= fields_for encrypted_config do |ff| %>
          <div class="form-control">
            <%= ff.label :value, 'App URL', class: 'label' %>
            <%= ff.text_field :value, autocomplete: 'off', class: 'base-input' %>
@@ -1,10 +1,12 @@
 <div class="text-center">
  <div class="join">
    <a href="https://docuseal.co<%= request.fullpath.gsub('docuseal.eu', 'docuseal.co') %>" class="btn bg-base-200 join-item w-32  <%= 'bg-base-300' if request.host == 'docuseal.co' %>">
-      🌎 Global
+      <%= svg_icon 'world', class: 'w-5 h-5' %>
+      Global
    </a>
    <a href="https://docuseal.eu<%= request.fullpath.gsub('docuseal.co', 'docuseal.eu') %>" class="btn bg-base-200 join-item w-32 <%= 'bg-base-300' if request.host == 'docuseal.eu' %>">
-      🇪🇺 Europe
+      <%= svg_icon 'eu_flag', class: 'w-5 h-5' %>
+      Europe
    </a>
  </div>
 </div>
@@ -123,7 +123,7 @@
        <% end %>
      </div>
    <% end %>
-    <% account_config = AccountConfig.where(account: current_account, key: AccountConfig::ESIGNING_PREFERENCE_KEY).first_or_initialize(value: 'multiple') %>
+    <% account_config = AccountConfig.where(account: current_account, key: AccountConfig::ESIGNING_PREFERENCE_KEY).first_or_initialize(value: 'single') %>
    <% 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">
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+  <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+  <path d="M6 9l6 6l6 -6" />
+</svg>
@@ -0,0 +1,125 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" version="1.1" viewBox="0 0 1000 1000">
+  <defs />
+  <path fill="#039" d="M8,195.25 C178.83,110.03 349.03,140.83 521.26,167.28 C676.47,191.12 833.42,211.85 992,132.75 L992,804.75 C821.17,889.97 650.97,859.17 478.74,832.72 C323.53,808.88 166.58,788.15 8,867.25 L8,195.25" />
+  <path fill="#fc0" d="M500,238.67 L488.74,272.43 L506.07,280.88 L500,238.67" />
+  <path fill="#fc0" d="M500,238.67 L511.26,275.92 L493.93,279 L500,238.67" />
+  <path fill="#fc0" d="M534.66,269.79 L498.22,264.19 L498.22,282.85 L534.66,269.79" />
+  <path fill="#fc0" d="M534.66,269.79 L505.18,287.21 L494.47,270.45 L534.66,269.79" />
+  <path fill="#fc0" d="M521.42,309.51 L510.16,272.27 L492.83,275.36 L521.42,309.51" />
+  <path fill="#fc0" d="M521.42,309.51 L491.94,283.01 L502.65,269.57 L521.42,309.51" />
+  <path fill="#fc0" d="M465.34,259.13 L501.78,264.74 L501.78,283.41 L465.34,259.13" />
+  <path fill="#fc0" d="M465.34,259.13 L494.82,285.61 L505.53,272.16 L465.34,259.13" />
+  <path fill="#fc0" d="M478.58,302.9 L489.84,269.13 L507.17,277.58 L478.58,302.9" />
+  <path fill="#fc0" d="M478.58,302.9 L508.06,285.51 L497.35,268.75 L478.58,302.9" />
+  <path fill="#fc0" d="M500,686.67 L488.74,720.43 L506.07,728.88 L500,686.67" />
+  <path fill="#fc0" d="M500,686.67 L511.26,723.92 L493.93,727 L500,686.67" />
+  <path fill="#fc0" d="M534.66,717.79 L498.22,712.19 L498.22,730.85 L534.66,717.79" />
+  <path fill="#fc0" d="M534.66,717.79 L505.18,735.21 L494.47,718.45 L534.66,717.79" />
+  <path fill="#fc0" d="M521.42,757.51 L510.16,720.27 L492.83,723.36 L521.42,757.51" />
+  <path fill="#fc0" d="M521.42,757.51 L491.94,731.01 L502.65,717.57 L521.42,757.51" />
+  <path fill="#fc0" d="M465.34,707.13 L501.78,712.74 L501.78,731.41 L465.34,707.13" />
+  <path fill="#fc0" d="M465.34,707.13 L494.82,733.61 L505.53,720.16 L465.34,707.13" />
+  <path fill="#fc0" d="M478.58,750.9 L489.84,717.13 L507.17,725.58 L478.58,750.9" />
+  <path fill="#fc0" d="M478.58,750.9 L508.06,733.51 L497.35,716.75 L478.58,750.9" />
+  <path fill="#fc0" d="M281.33,438.24 L270.07,473.54 L287.4,479.69 L281.33,438.24" />
+  <path fill="#fc0" d="M281.33,438.24 L292.6,474.11 L275.27,479.39 L281.33,438.24" />
+  <path fill="#fc0" d="M315.99,465.59 C303.97,464.84 291.94,464.29 279.55,464 L279.55,482.66 L315.99,465.59" />
+  <path fill="#fc0" d="M315.99,465.59 L286.51,486.13 L275.8,470.76 C289.06,468.76 302.33,467.06 315.99,465.59" />
+  <path fill="#fc0" d="M302.76,506.59 L291.49,470.59 L274.16,475.89 L302.76,506.59" />
+  <path fill="#fc0" d="M302.76,506.59 L273.27,483.67 L283.98,468.81 L302.76,506.59" />
+  <path fill="#fc0" d="M246.67,463.91 C258.7,463.69 270.72,463.75 283.12,464.09 L283.12,482.75 C271.09,476.27 259.06,470.03 246.67,463.91" />
+  <path fill="#fc0" d="M246.67,463.91 L276.16,485.87 L286.87,471.04 C273.6,468.37 260.34,465.98 246.67,463.91" />
+  <path fill="#fc0" d="M259.91,505.52 L271.17,470.08 L288.5,476.25 L259.91,505.52" />
+  <path fill="#fc0" d="M259.91,505.52 L289.4,484.08 L278.69,468.67 L259.91,505.52" />
+  <path fill="#fc0" d="M369.24,317.99 L398.73,299.53 L388.02,283.1 L369.24,317.99" />
+  <path fill="#fc0" d="M369.24,317.99 L380.51,283.75 L397.84,291.62 L369.24,317.99" />
+  <path fill="#fc0" d="M356.01,274.87 L385.49,300.04 L396.2,286.25 L356.01,274.87" />
+  <path fill="#fc0" d="M356.01,274.87 L392.45,278.94 L392.45,297.61 L356.01,274.87" />
+  <path fill="#fc0" d="M390.67,252.93 L379.4,287.09 L396.73,294.96 L390.67,252.93" />
+  <path fill="#fc0" d="M390.67,252.93 L401.93,289.85 L384.6,293.47 L390.67,252.93" />
+  <path fill="#fc0" d="M412.09,323.22 L382.6,297.55 L393.31,283.75 L412.09,323.22" />
+  <path fill="#fc0" d="M412.09,323.22 L400.83,286.23 L383.5,289.87 L412.09,323.22" />
+  <path fill="#fc0" d="M425.33,283.29 L395.84,301.31 L385.13,284.9 L425.33,283.29" />
+  <path fill="#fc0" d="M425.33,283.29 L388.88,278.51 L388.88,297.17 L425.33,283.29" />
+  <path fill="#fc0" d="M332.05,396.47 L320.79,360.14 L303.46,364.88 L332.05,396.47" />
+  <path fill="#fc0" d="M332.05,396.47 L302.57,372.63 L313.28,358.12 L332.05,396.47" />
+  <path fill="#fc0" d="M289.21,394.02 L318.69,373.56 L307.98,357.82 L289.21,394.02" />
+  <path fill="#fc0" d="M289.21,394.02 L300.47,358.97 L317.8,365.71 L289.21,394.02" />
+  <path fill="#fc0" d="M275.97,351.92 L305.45,374.93 L316.16,360.45 C302.9,357.36 289.63,354.51 275.97,351.92" />
+  <path fill="#fc0" d="M275.97,351.92 C288,352.16 300.02,352.64 312.41,353.37 L312.41,372.04 L275.97,351.92" />
+  <path fill="#fc0" d="M345.29,355.85 L315.81,375.53 L305.1,359.81 C318.36,358.25 331.62,356.95 345.29,355.85" />
+  <path fill="#fc0" d="M345.29,355.85 L308.85,353.17 L308.85,371.83 L345.29,355.85" />
+  <path fill="#fc0" d="M310.63,327.47 L321.89,363.69 L304.56,368.42 L310.63,327.47" />
+  <path fill="#fc0" d="M310.63,327.47 L299.37,362.4 L316.7,369.12 L310.63,327.47" />
+  <path fill="#fc0" d="M345.29,579.85 L308.85,577.17 L308.85,595.83 L345.29,579.85" />
+  <path fill="#fc0" d="M345.29,579.85 L315.81,599.53 L305.1,583.81 C318.36,582.25 331.62,580.95 345.29,579.85" />
+  <path fill="#fc0" d="M332.05,620.47 L320.79,584.14 L303.46,588.88 L332.05,620.47" />
+  <path fill="#fc0" d="M332.05,620.47 L302.57,596.63 L313.28,582.12 L332.05,620.47" />
+  <path fill="#fc0" d="M289.21,618.02 L318.69,597.56 L307.98,581.82 L289.21,618.02" />
+  <path fill="#fc0" d="M289.21,618.02 L300.47,582.97 L317.8,589.71 L289.21,618.02" />
+  <path fill="#fc0" d="M310.63,551.47 L321.89,587.69 L304.56,592.42 L310.63,551.47" />
+  <path fill="#fc0" d="M310.63,551.47 L299.37,586.4 L316.7,593.12 L310.63,551.47" />
+  <path fill="#fc0" d="M275.97,575.92 C288,576.16 300.02,576.64 312.41,577.37 L312.41,596.04 L275.97,575.92" />
+  <path fill="#fc0" d="M275.97,575.92 L305.45,598.93 L316.16,584.45 C302.9,581.36 289.63,578.51 275.97,575.92" />
+  <path fill="#fc0" d="M425.33,671.27 L388.88,666.49 L388.88,685.15 L425.33,671.27" />
+  <path fill="#fc0" d="M425.33,671.27 L395.84,689.29 L385.13,672.88 L425.33,671.27" />
+  <path fill="#fc0" d="M412.09,711.2 L400.83,674.21 L383.5,677.84 L412.09,711.2" />
+  <path fill="#fc0" d="M412.09,711.2 L382.6,685.53 L393.31,671.73 L412.09,711.2" />
+  <path fill="#fc0" d="M369.24,705.97 L398.73,687.51 L388.02,671.08 L369.24,705.97" />
+  <path fill="#fc0" d="M369.24,705.97 L380.51,671.73 L397.84,679.6 L369.24,705.97" />
+  <path fill="#fc0" d="M390.67,640.91 L401.93,677.83 L384.6,681.45 L390.67,640.91" />
+  <path fill="#fc0" d="M390.67,640.91 L379.4,675.07 L396.73,682.94 L390.67,640.91" />
+  <path fill="#fc0" d="M356.01,662.85 L392.45,666.92 L392.45,685.59 L356.01,662.85" />
+  <path fill="#fc0" d="M356.01,662.85 L385.49,688.02 L396.2,674.23 L356.01,662.85" />
+  <path fill="#fc0" d="M718.67,487.09 L729.93,522.81 L712.6,528.19 L718.67,487.09" />
+  <path fill="#fc0" d="M718.67,487.09 L707.4,522.24 L724.73,528.5 L718.67,487.09" />
+  <path fill="#fc0" d="M684.01,511.33 C696.03,512.09 708.06,512.63 720.45,512.93 L720.45,531.6 L684.01,511.33" />
+  <path fill="#fc0" d="M684.01,511.33 L713.49,534.68 L724.2,519.85 C710.94,517.34 697.67,514.52 684.01,511.33" />
+  <path fill="#fc0" d="M697.24,553.82 L708.51,518.8 L725.84,525.04 L697.24,553.82" />
+  <path fill="#fc0" d="M697.24,553.82 L726.73,532.85 L716.02,517.51 L697.24,553.82" />
+  <path fill="#fc0" d="M753.33,513.02 C741.3,513.24 729.28,513.17 716.88,512.84 L716.88,531.51 C728.91,525.67 740.93,519.59 753.33,513.02" />
+  <path fill="#fc0" d="M753.33,513.02 L723.84,534.95 L713.13,519.57 C726.4,517.73 739.66,515.59 753.33,513.02" />
+  <path fill="#fc0" d="M740.09,554.89 L728.83,519.32 L711.5,524.68 L740.09,554.89" />
+  <path fill="#fc0" d="M740.09,554.89 L710.6,532.44 L721.31,517.64 L740.09,554.89" />
+  <path fill="#fc0" d="M630.76,354.44 L601.27,329.01 L611.98,315.24 L630.76,354.44" />
+  <path fill="#fc0" d="M630.76,354.44 L619.49,317.67 L602.16,321.33 L630.76,354.44" />
+  <path fill="#fc0" d="M643.99,314.07 L614.51,332.79 L603.8,316.38 L643.99,314.07" />
+  <path fill="#fc0" d="M643.99,314.07 L607.55,310 L607.55,328.67 L643.99,314.07" />
+  <path fill="#fc0" d="M609.33,284.42 L620.6,321.27 L603.27,324.95 L609.33,284.42" />
+  <path fill="#fc0" d="M609.33,284.42 L598.07,318.52 L615.4,326.43 L609.33,284.42" />
+  <path fill="#fc0" d="M587.91,349.21 L617.4,330.99 L606.69,314.59 L587.91,349.21" />
+  <path fill="#fc0" d="M587.91,349.21 L599.17,315.18 L616.5,323.09 L587.91,349.21" />
+  <path fill="#fc0" d="M574.67,305.66 L604.16,331.52 L614.87,317.73 L574.67,305.66" />
+  <path fill="#fc0" d="M574.67,305.66 L611.12,310.44 L611.12,329.11 L574.67,305.66" />
+  <path fill="#fc0" d="M667.95,439.93 L679.21,405.25 L696.54,412.05 L667.95,439.93" />
+  <path fill="#fc0" d="M667.95,439.93 L697.43,419.88 L686.72,404.19 L667.95,439.93" />
+  <path fill="#fc0" d="M710.79,442.39 L681.31,418.95 L692.02,404.5 L710.79,442.39" />
+  <path fill="#fc0" d="M710.79,442.39 L699.53,406.42 L682.2,411.22 L710.79,442.39" />
+  <path fill="#fc0" d="M724.03,401.01 L694.55,421.89 L683.84,406.16 C697.1,404.74 710.36,403.06 724.03,401.01" />
+  <path fill="#fc0" d="M724.03,401.01 C712,400.77 699.98,400.28 687.59,399.55 L687.59,418.22 L724.03,401.01" />
+  <path fill="#fc0" d="M654.71,397.08 L684.19,421.29 L694.9,406.8 C681.64,403.85 668.38,400.63 654.71,397.08" />
+  <path fill="#fc0" d="M654.71,397.08 L691.15,399.76 L691.15,418.42 L654.71,397.08" />
+  <path fill="#fc0" d="M689.37,373.86 L678.11,408.65 L695.44,415.47 L689.37,373.86" />
+  <path fill="#fc0" d="M689.37,373.86 L700.63,409.95 L683.3,414.76 L689.37,373.86" />
+  <path fill="#fc0" d="M654.71,621.08 L691.15,623.76 L691.15,642.42 L654.71,621.08" />
+  <path fill="#fc0" d="M654.71,621.08 L684.19,645.29 L694.9,630.8 C681.64,627.85 668.38,624.63 654.71,621.08" />
+  <path fill="#fc0" d="M667.95,663.93 L679.21,629.25 L696.54,636.05 L667.95,663.93" />
+  <path fill="#fc0" d="M667.95,663.93 L697.43,643.88 L686.72,628.19 L667.95,663.93" />
+  <path fill="#fc0" d="M710.79,666.39 L681.31,642.95 L692.02,628.5 L710.79,666.39" />
+  <path fill="#fc0" d="M710.79,666.39 L699.53,630.42 L682.2,635.22 L710.79,666.39" />
+  <path fill="#fc0" d="M689.37,597.86 L678.11,632.65 L695.44,639.47 L689.37,597.86" />
+  <path fill="#fc0" d="M689.37,597.86 L700.63,633.95 L683.3,638.76 L689.37,597.86" />
+  <path fill="#fc0" d="M724.03,625.01 C712,624.77 699.98,624.28 687.59,623.55 L687.59,642.22 L724.03,625.01" />
+  <path fill="#fc0" d="M724.03,625.01 L694.55,645.89 L683.84,630.16 C697.1,628.74 710.36,627.06 724.03,625.01" />
+  <path fill="#fc0" d="M574.67,693.64 L611.12,698.42 L611.12,717.09 L574.67,693.64" />
+  <path fill="#fc0" d="M574.67,693.64 L604.16,719.5 L614.87,705.71 L574.67,693.64" />
+  <path fill="#fc0" d="M587.91,737.19 L599.17,703.16 L616.5,711.07 L587.91,737.19" />
+  <path fill="#fc0" d="M587.91,737.19 L617.4,718.97 L606.69,702.57 L587.91,737.19" />
+  <path fill="#fc0" d="M630.76,742.42 L601.27,716.99 L611.98,703.22 L630.76,742.42" />
+  <path fill="#fc0" d="M630.76,742.42 L619.49,705.65 L602.16,709.31 L630.76,742.42" />
+  <path fill="#fc0" d="M609.33,672.41 L598.07,706.49 L615.4,714.41 L609.33,672.41" />
+  <path fill="#fc0" d="M609.33,672.41 L620.6,709.25 L603.27,712.93 L609.33,672.41" />
+  <path fill="#fc0" d="M643.99,702.05 L607.55,697.98 L607.55,716.65 L643.99,702.05" />
+  <path fill="#fc0" d="M643.99,702.05 L614.51,720.77 L603.8,704.36 L643.99,702.05" />
+  <path fill="#1A1A1A" opacity="0.2" d="M8,195.25 C178.83,110.03 349.03,140.83 521.26,167.28 C676.47,191.12 833.42,211.85 992,132.75 L992,804.75 C821.17,889.97 650.97,859.17 478.74,832.72 C323.53,808.88 166.58,788.15 8,867.25 L8,195.25 M39.25,214.64 L39.25,819.14 C345.81,690.88 650.43,915.18 960.75,785.36 L960.75,180.86 C654.19,309.12 349.57,84.82 39.25,214.64" />
+</svg>
@@ -0,0 +1,50 @@
+<svg version="1.1" class="<%= local_assigns[:class] %>" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+   y="0px" viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
+  <g>
+    <g>
+      <path style="fill:#FFCA28;" d="M17.57,62.68c-2.79-4.01-3.91-7.79-1.18-10.08c2.31-1.94,5.71-2.31,9.91,2.54
+      c0,0,12.55,14.58,16.87,18.63c0.98,0.91,2.2,1.05,3.31-0.1c0.94-0.98,0.6-1.83-0.2-3c0,0-17.69-26.3-20.01-29.51
+      c-3.87-5.37-2.38-8.84-0.59-10.49c2.49-2.31,6.87-2.77,10.94,2.81l21.42,28.67c0.65,0.69,1.7,0.79,2.47,0.25
+      c0.1-0.07,0.2-0.14,0.3-0.21c0.79-0.56,1.02-1.63,0.54-2.47c-3.75-6.53-18.67-32.55-20.86-37.29c-2.52-5.47-1.44-8.25,1.23-9.86
+      c3.17-1.91,6.15-1.77,9.71,3.52c3.86,5.76,18.85,30.01,22.66,36.53c0.5,0.85,1.57,1.17,2.45,0.74c0.01-0.01,0.03-0.01,0.04-0.02
+      c0.84-0.41,1.6-1.24,1.25-2.42c-2.08-6.86-12.29-28.22-14.43-33.13c-2.93-6.71-1.5-8.99,1.53-10.53c3.18-1.61,6.49-0.34,8.74,4.14
+      c1.52,3.04,28.21,51.61,28.21,51.61c-0.39-7.24,1.44-12.37,3-17.52c2.84-9.37,9.71-14.24,14.69-12.05
+      c2.59,1.14,3.06,3.41,2.78,5.15c-0.56,3.38-2.94,13.85-3.4,22.05c-1.08,19.22,4.73,41.37-16.92,55.29
+      c-14.49,9.32-30.02,7.68-40.28,0.51C49.31,107.75,19.85,65.96,17.57,62.68z" />
+      <path style="fill:#EDA600;" d="M117.68,51.77c-1.81,7.61-2.05,16.95-1.99,20.93c0.24,15.51,0.16,28.93-15.39,41.19
+      c-1.91,1.51-7.9,5.19-14.87,7.11c-2.24,0.61-1.39,1.33-0.01,1.17c7.61-0.88,13.38-4.16,16.59-6.23
+      c21.64-13.92,16.32-35.92,17.4-55.14c0.46-8.2,2.96-21.1,2.92-22.21C122.28,37.48,119.49,44.16,117.68,51.77z" />
+      <path style="fill:#EDA600;" d="M77.53,52.57c0,0-1.55,0.01-3.02-2.04C70.1,44.4,56.27,21.25,52.29,15.57
+      c-4.54-6.48-8.77-4-9.73-3.48c0,0,3.48,0.12,5.4,2.97c3.92,5.81,18.78,31.85,23.47,37.44C74.46,56.11,77.53,52.57,77.53,52.57z" />
+      <path style="fill:#EDA600;" d="M22.71,54.54c1.36,1.46,13.3,15.63,17.7,19.58c3.78,3.39,6.6-0.93,6.6-0.93s-1.39,0.19-3.29-1.24
+      c-4.72-3.57-15.9-16.3-18.42-18.98c-3.74-3.98-7.22-1.49-7.96-1.04C17.35,51.93,19.49,51.1,22.71,54.54z" />
+      <path style="fill:#EDA600;" d="M61.59,61.26c0,0-1.28,0.93-3.63-1.82c-1.71-2.01-21.34-25.96-21.34-25.96
+      c-4.92-6.01-8.79-4.22-9.59-3.76c0,0,2.47-0.13,5.36,3.2c1.32,1.52,22.27,28.23,23.11,29.14C58.57,65.41,61.41,62.53,61.59,61.26z
+      " />
+      <path style="fill:#EDA600;" d="M101.8,57.83c0,0-26.01-43.61-27.67-46.58c-3.69-6.59-7.98-4.57-8.71-4.24c0,0,2.39-0.68,5.2,4.1
+      c1.5,2.54,20.61,36.9,26.71,47.88c0.48,2.05,0.44,4.72-1.1,6.44c-5.52,6.19-12.56,12.51-10.49,28.18
+      c0.52,3.97,1.99,7.73,3.08,9.54c1.38,2.27,2.97,1.41,2.27-0.29c-0.47-1.15-1.22-3.86-1.37-5.02c-0.7-5.4-3.06-14.84,7.52-26.16
+      C99.03,69.79,103.58,64.08,101.8,57.83z" />
+    </g>
+    <g>
+      <path style="fill:#B0BEC5;" d="M103.49,30.96c-1.39-4.93-3.55-9.45-6.35-13.37c-2.52-3.53-5.57-6.57-9.05-9.01
+      c-0.44-0.31-1-1.27-0.52-2.2s1.52-0.81,1.91-0.65c4.35,1.79,7.91,4.88,10.85,9.12c3.49,5.04,5.22,9.79,6.11,15.1
+      c0.1,0.58,0.08,1.8-1.16,2.12C104.05,32.39,103.63,31.44,103.49,30.96z" />
+    </g>
+    <g>
+      <path style="fill:#B0BEC5;" d="M96.69,36.25c-1.39-4.93-3.55-9.45-6.35-13.37c-2.52-3.53-5.57-6.57-9.05-9.01
+      c-0.44-0.31-1-1.27-0.52-2.2c0.48-0.94,1.52-0.81,1.91-0.65c4.35,1.79,7.91,4.88,10.85,9.12c3.49,5.04,5.22,9.79,6.11,15.1
+      c0.1,0.58,0.08,1.8-1.16,2.12C97.26,37.68,96.83,36.74,96.69,36.25z" />
+    </g>
+    <g>
+      <path style="fill:#B0BEC5;" d="M8.56,77.46c1.72,4.83,4.17,9.19,7.22,12.92c2.75,3.35,5.99,6.19,9.62,8.4
+      c0.46,0.28,1.08,1.2,0.66,2.16c-0.42,0.97-1.46,0.91-1.87,0.78c-4.46-1.5-8.22-4.35-11.43-8.39c-3.81-4.8-5.86-9.42-7.1-14.66
+      c-0.14-0.58-0.2-1.79,1.02-2.19C7.9,76.08,8.39,76.99,8.56,77.46z" />
+    </g>
+    <g>
+      <path style="fill:#B0BEC5;" d="M14.99,71.73c1.72,4.83,4.17,9.19,7.22,12.92c2.75,3.35,5.99,6.19,9.62,8.4
+      c0.46,0.28,1.08,1.2,0.66,2.16c-0.42,0.97-1.46,0.91-1.87,0.78c-4.46-1.5-8.22-4.35-11.43-8.39c-3.81-4.8-5.86-9.42-7.1-14.66
+      c-0.14-0.58-0.2-1.79,1.02-2.19C14.33,70.34,14.82,71.26,14.99,71.73z" />
+    </g>
+  </g>
+</svg>
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+  <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+  <path d="M3 12a9 9 0 1 0 18 0a9 9 0 0 0 -18 0" />
+  <path d="M3.6 9h16.8" />
+  <path d="M3.6 15h16.8" />
+  <path d="M11.5 3a17 17 0 0 0 0 18" />
+  <path d="M12.5 3a17 17 0 0 1 0 18" />
+</svg>
@@ -1,5 +1,8 @@
 <div class="max-w-xl mx-auto px-2">
-  <h1 class="text-4xl font-bold text-center my-8">👋 Welcome to <%= Docuseal.product_name %></h1>
+  <h1 class="flex text-4xl font-bold items-center justify-center my-8 space-x-2">
+    <%= svg_icon('waving_hand', class: 'h-10 w-10') %>
+    <span>Welcome to <%= Docuseal.product_name %></span>
+  </h1>
  <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put, class: 'space-y-6' }) do |f| %>
    <div class="space-y-2">
      <%= render 'devise/shared/error_messages', resource: %>
@@ -1,4 +1,4 @@
 <title>
-  DocuSeal | Open Source Document Filling and Signing
+  <%= content_for(:html_title) || 'DocuSeal | Open Source Document Signing' %>
 </title>
 <%= render 'shared/meta' %>
@@ -5,7 +5,12 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <%= csrf_meta_tags %>
    <%= csp_meta_tag %>
-    <%= javascript_pack_tag 'application', defer: true %>
+    <% if ENV['ROLLBAR_CLIENT_TOKEN'] %>
+      <meta name="rollbar-token" content="<%= ENV.fetch('ROLLBAR_CLIENT_TOKEN', nil) %>">
+      <%= javascript_pack_tag 'rollbar', 'application', defer: true %>
+    <% else %>
+      <%= javascript_pack_tag 'application', defer: true %>
+    <% end %>
    <%= stylesheet_pack_tag 'application', media: 'all' %>
    <%= render 'shared/posthog' if ENV['POSTHOG_TOKEN'] %>
    <%= render 'shared/plausible' if !signed_in? && ENV['PLAUSIBLE_DOMAIN'] %>
@@ -5,7 +5,12 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <%= csrf_meta_tags %>
    <%= csp_meta_tag %>
-    <%= javascript_pack_tag 'form', defer: true %>
+    <% if ENV['ROLLBAR_CLIENT_TOKEN'] %>
+      <meta name="rollbar-token" content="<%= ENV.fetch('ROLLBAR_CLIENT_TOKEN', nil) %>">
+      <%= javascript_pack_tag 'rollbar', 'form', defer: true %>
+    <% else %>
+      <%= javascript_pack_tag 'form', defer: true %>
+    <% end %>
    <%= stylesheet_pack_tag 'form', media: 'all' %>
    <%= render 'shared/posthog' if ENV['POSTHOG_TOKEN'] %>
  </head>
@@ -5,7 +5,12 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <%= csrf_meta_tags %>
    <%= csp_meta_tag %>
-    <%= javascript_pack_tag 'application', defer: true %>
+    <% if ENV['ROLLBAR_CLIENT_TOKEN'] %>
+      <meta name="rollbar-token" content="<%= ENV.fetch('ROLLBAR_CLIENT_TOKEN', nil) %>">
+      <%= javascript_pack_tag 'rollbar', 'application', defer: true %>
+    <% else %>
+      <%= javascript_pack_tag 'application', defer: true %>
+    <% end %>
    <%= stylesheet_pack_tag 'application', media: 'all' %>
    <%= render 'shared/posthog' if ENV['POSTHOG_TOKEN'] %>
  </head>
@@ -31,6 +31,15 @@
      </div>
    <% end %>
    <a href="<%= edit_user_signature_path %>" data-turbo-frame="modal" class="base-button w-full">Update Signature</a>
+    <p class="text-2xl font-bold mt-8 mb-4">Initials</p>
+    <% initials = UserConfigs.load_initials(current_user) %>
+    <% if initials %>
+      <div class="flex justify-center mb-4 relative">
+        <%= button_to button_title(title: 'Remove', disabled_with: 'Removing'), user_initials_path, method: :delete, class: 'right-0 top-0 absolute link' %>
+        <img src="<%= initials.url %>" style="max-height: 200px; width: auto" width="<%= initials.metadata['width'] %>" height="<%= initials.metadata['height'] %>">
+      </div>
+    <% end %>
+    <a href="<%= edit_user_initials_path %>" data-turbo-frame="modal" class="base-button w-full">Update Initials</a>
    <% if true_user == current_user && !current_account.testing? %>
      <p class="text-2xl font-bold mt-8 mb-4">Change Password</p>
      <%= form_for current_user, url: update_password_settings_profile_index_path, method: :patch, html: { autocomplete: 'off', class: 'space-y-4' } do |f| %>
@@ -1,8 +1,11 @@
 <div class="max-w-xl mx-auto px-2">
-  <h1 class="text-4xl font-bold text-center my-8">Initial Setup 👋</h1>
+  <h1 class="flex text-4xl font-bold items-center justify-center my-8 space-x-2">
+    <span>Initial Setup</span>
+    <%= svg_icon('waving_hand', class: 'h-10 w-10') %>
+  </h1>
  <%= form_for '', html: { class: 'space-y-6' }, url: setup_index_path do |f| %>
    <div class="space-y-2">
-      <%= f.fields_for @user do |ff| %>
+      <%= fields_for @user do |ff| %>
        <div class="grid gap-2 md:grid-cols-2 md:gap-4">
          <div class="form-control">
            <%= ff.label :first_name, class: 'label' %>
@@ -14,30 +17,30 @@
          </div>
        </div>
      <% end %>
-      <%= f.fields_for @user do |ff| %>
+      <%= fields_for @user do |ff| %>
        <div class="form-control">
          <%= ff.label :email, class: 'label' %>
          <%= ff.email_field :email, required: true, class: 'base-input' %>
        </div>
      <% end %>
-      <%= f.fields_for @account do |ff| %>
-        <set-timezone data-input-id="_account_timezone"></set-timezone>
+      <%= fields_for @account do |ff| %>
+        <set-timezone data-input-id="account_timezone"></set-timezone>
        <%= ff.hidden_field :timezone %>
        <div class="form-control">
          <%= ff.label :name, 'Company name', class: 'label' %>
          <%= ff.text_field :name, required: true, class: 'base-input' %>
        </div>
      <% end %>
-      <%= f.fields_for @user do |ff| %>
+      <%= fields_for @user do |ff| %>
        <div class="form-control">
          <%= ff.label :password, class: 'label' %>
          <%= ff.password_field :password, required: true, placeholder: '************', class: 'base-input' %>
        </div>
      <% end %>
-      <%= f.fields_for @encrypted_config do |ff| %>
+      <%= fields_for @encrypted_config do |ff| %>
        <div class="form-control">
          <% if @encrypted_config.value.blank? %>
-            <set-origin-url data-input-id="_encrypted_config_value"></set-origin-url>
+            <set-origin-url data-input-id="encrypted_config_value"></set-origin-url>
          <% end %>
          <%= ff.label :value, 'App URL', class: 'label' %>
          <%= ff.text_field :value, required: true, class: 'base-input' %>
@@ -1,21 +1,25 @@
 <% if Docuseal.demo? || (request.path != '/' && !devise_controller?) %>
  <meta name="robots" content="noindex">
 <% end %>
-<meta name="description" content="Open source, self-hosted tool to streamline document filling and signing. Create custom PDF forms to complete and sign with an easy to use online tool.">
-<meta property="og:title" content="DocuSeal | Open Source Document Filling and Signing">
-<meta property="og:description" content="Open source, self-hosted tool to streamline document filling and signing. Create custom PDF forms to complete and sign with an easy to use online tool.">
+<% title = content_for(:html_title) || 'DocuSeal | Open Source Document Filling and Signing' %>
+<% description = content_for(:html_description) || 'Open source, self-hosted tool to streamline document filling and signing. Create custom PDF forms to complete and sign with an easy to use online tool.' %>
+<meta name="description" content="<%= description %>">
+<meta property="og:title" content="<%= title %>">
+<meta property="og:description" content="<%= description %>">
 <meta property="og:type" content="website">
 <meta property="og:url" content="<%= root_url %>">
 <meta property="og:site_name" content="DocuSeal">
-<meta property="og:image" content="<%= image_pack_url('images/preview.png') %>">
-<meta property="og:image:width" content="800">
-<meta property="og:image:height" content="800">
-<meta name="twitter:image" content="<%= image_pack_url('images/preview.png') %>">
+<% unless content_for(:disable_image_preview) %>
+  <meta property="og:image" content="<%= image_pack_url('images/preview.png') %>">
+  <meta property="og:image:width" content="800">
+  <meta property="og:image:height" content="800">
+  <meta name="twitter:image" content="<%= image_pack_url('images/preview.png') %>">
+<% end %>
 <meta name="twitter:card" content="summary">
 <meta name="twitter:creator" content="@docusealco">
 <meta name="twitter:site" content="@docusealco">
-<meta name="twitter:title" content="DocuSeal | Open Source Document Filling and Signing">
-<meta name="twitter:description" content="Open source, self-hosted tool to streamline document filling and signing. Create custom PDF forms to complete and sign with an easy to use online tool.">
+<meta name="twitter:title" content="<%= title %>">
+<meta name="twitter:description" content="<%= description %>">
 <link rel="apple-touch-icon" sizes="180x180" href="/apple-icon-180x180.png">
 <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
 <link rel="icon" type="image/png" sizes="96x96" href="/favicon-96x96.png">
@@ -26,10 +26,10 @@
        <label tabindex="0" class="cursor-pointer bg-base-content text-purple-300 rounded-full p-2 w-9 justify-center flex">
          <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 whitespace-nowrap text-right">
+        <ul tabindex="0" class="z-10 dropdown-content p-2 mt-2 shadow menu text-base bg-base-100 rounded-box w-40 text-right">
          <li>
            <%= link_to settings_profile_index_path, class: 'flex items-center' do %>
-              <%= svg_icon('adjustments', class: 'w-5 h-5 stroke-2') %>
+              <%= svg_icon('adjustments', class: 'w-5 h-5 flex-shrink-0 stroke-2') %>
              <span class="mr-1">Profile</span>
            <% end %>
          </li>
@@ -60,7 +60,7 @@
          </li>
        <% end %>
      <% end %>
-      <% if !Docuseal.demo? && can?(:manage, EncryptedConfig) && (current_user != true_user || !current_account.testing?) %>
+      <% if !Docuseal.demo? && can?(:manage, EncryptedConfig) && (current_user != true_user || !current_account.linked_account_account) %>
        <li>
          <%= link_to Docuseal.multitenant? ? console_redirect_index_path(redir: "#{Docuseal::CONSOLE_URL}/plans") : "#{Docuseal::CLOUD_URL}/sign_up?#{{ redir: "#{Docuseal::CONSOLE_URL}/on_premise" }.to_query}", class: 'text-base hover:bg-base-300', data: { prefetch: false } do %>
            Plans
@@ -20,14 +20,14 @@
      <%= t('form_has_been_submitted_already') %>
    </div>
    <% if Docuseal.multitenant? || Accounts.can_send_emails?(@submitter.account) %>
-      <div>
-        <%= button_to button_title(title: t('send_copy_to_email'), disabled_with: t('sending'), icon: svg_icon('mail_forward', class: 'w-6 h-6')), send_submission_email_index_path, params: { submitter_slug: @submitter.slug }, form: { onsubmit: 'event.submitter.disabled = true' }, class: 'base-button w-full' %>
-      </div>
+      <toggle-submit class="block">
+        <%= button_to button_title(title: t('send_copy_to_email'), disabled_with: t('sending'), icon: svg_icon('mail_forward', class: 'w-6 h-6')), send_submission_email_index_path, params: { submitter_slug: @submitter.slug }, class: 'base-button w-full' %>
+      </toggle-submit>
    <% end %>
    <% if @template.submitters.to_a.size == 1 && %w[api embed].exclude?(@submitter.submission.source) && @submitter.account.account_configs.find_or_initialize_by(key: AccountConfig::ALLOW_TO_RESUBMIT).value != false %>
-      <div>
-        <%= button_to button_title(title: t('resubmit'), disabled_with: t('resubmit'), icon: svg_icon('reload', class: 'w-6 h-6')), start_form_path(@template.slug), params: { submitter: { email: params[:email] }, resubmit: @submitter.slug }, method: :put, form: { onsubmit: 'event.submitter.disabled = true' }, class: 'white-button w-full' %>
-      </div>
+      <toggle-submit class="block">
+        <%= button_to button_title(title: t('resubmit'), disabled_with: t('resubmit'), icon: svg_icon('reload', class: 'w-6 h-6')), start_form_path(@template.slug), params: { submitter: { email: params[:email] }, resubmit: @submitter.slug }, method: :put, class: 'white-button w-full' %>
+      </toggle-submit>
    <% end %>
  </div>
 </div>
@@ -1,3 +1,5 @@
+<% content_for(:html_title, "#{@template.name} | DocuSeal") %>
+<% content_for(:html_description, "#{@template.account.name} has invited you to fill and sign documents online effortlessly with a secure, fast, and user-friendly digital document signing solution.") %>
 <div class="max-w-md mx-auto px-2 mt-12 mb-4">
  <div class="space-y-6 mx-auto">
    <div class="space-y-6">
@@ -24,15 +26,15 @@
      </div>
    </div>
    <% unless @template.archived_at? %>
-      <%= form_for @submitter, url: start_form_path(@template.slug), data: { turbo_frame: :_top }, method: :put, html: { class: 'space-y-4', onsubmit: 'event.submitter.disabled = true' } do |f| %>
+      <%= form_for @submitter, url: start_form_path(@template.slug), data: { turbo_frame: :_top }, method: :put, html: { class: 'space-y-4' } do |f| %>
        <div dir="auto" class="form-control !mt-0">
          <%= f.label :email, t('email'), class: 'label' %>
          <%= f.email_field :email, value: current_user&.email || params[:email] || @submitter.email, required: true, class: 'base-input', placeholder: t('provide_your_email_to_start') %>
          <%= @error_message %>
        </div>
-        <div dir="auto" class="form-control">
+        <toggle-submit dir="auto" class="form-control">
          <%= f.button button_title(title: t('start'), disabled_with: t('starting')), class: 'base-button' %>
-        </div>
+        </toggle-submit>
      <% end %>
    <% end %>
  </div>
@@ -1,3 +1,6 @@
+<% if params[:controller] == 'submissions_preview' %>
+  <%= render 'submissions/preview_tags' %>
+<% end %>
 <div style="max-width: 1600px" class="mx-auto pl-4">
  <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 ? template_path(@submission.template) : '/' %>" class="flex items-center space-x-3 py-1">
@@ -14,16 +17,42 @@
        </a>
      <% end %>
      <% if last_submitter = @submission.submitters.to_a.select(&:completed_at?).max_by(&:completed_at) %>
-        <download-button data-src="<%= submitter_download_index_path(last_submitter.slug, { sig: params[:sig] }.compact) %>" class="base-button">
-          <span class="flex items-center justify-center space-x-2" data-target="download-button.defaultButton">
-            <%= svg_icon('download', class: 'w-6 h-6') %>
-            <span class="hidden md:inline">Download</span>
-          </span>
-          <span class="flex items-center justify-center space-x-2 hidden" data-target="download-button.loadingButton">
-            <%= svg_icon('loader', class: 'w-6 h-6 animate-spin') %>
-            <span class="hidden md:inline">Downloading</span>
-          </span>
-        </download-button>
+        <% is_all_completed = @submission.submitters.to_a.all?(&:completed_at?) %>
+        <div class="join relative">
+          <download-button data-src="<%= submitter_download_index_path(last_submitter.slug, { sig: params[:sig] }.compact) %>" class="base-button <%= '!rounded-r-none !pr-2' if is_all_completed %>">
+            <span class="flex items-center justify-center space-x-2" data-target="download-button.defaultButton">
+              <%= svg_icon('download', class: 'w-6 h-6') %>
+              <span class="hidden md:inline">Download</span>
+            </span>
+            <span class="flex items-center justify-center space-x-2 hidden" data-target="download-button.loadingButton">
+              <%= svg_icon('loader', class: 'w-6 h-6 animate-spin') %>
+              <span class="hidden md:inline">Downloading</span>
+            </span>
+          </download-button>
+          <% if is_all_completed %>
+            <div class="dropdown dropdown-end">
+              <label tabindex="0" class="base-button !rounded-l-none !pl-1 !pr-2 !border-l-neutral-500">
+                <span class="text-sm align-text-top">
+                  <%= svg_icon('chevron_down', class: 'w-6 h-6 flex-shrink-0 stroke-2') %>
+                </span>
+              </label>
+              <ul tabindex="0" class="z-10 dropdown-content p-2 mt-2 shadow menu text-base bg-base-100 rounded-box text-right">
+                <li>
+                  <download-button data-src="<%= submitter_download_index_path(last_submitter.slug, { sig: params[:sig], combined: true }.compact) %>" class="flex items-center">
+                    <span class="flex items-center justify-center space-x-2" data-target="download-button.defaultButton">
+                      <%= svg_icon('download', class: 'w-6 h-6 flex-shrink-0') %>
+                      <span class="whitespace-nowrap">Download combined PDF</span>
+                    </span>
+                    <span class="flex items-center justify-center space-x-2 hidden" data-target="download-button.loadingButton">
+                      <%= svg_icon('loader', class: 'w-6 h-6 animate-spin') %>
+                      <span>Downloading</span>
+                    </span>
+                  </download-button>
+                </li>
+              </ul>
+            </div>
+          <% end %>
+        </div>
      <% elsif @submission.submitters.to_a.size == 1 %>
        <%= render 'shared/clipboard_copy', text: start_form_url(slug: @submission.template.slug), class: 'base-button', icon_class: 'w-6 h-6 text-white', copy_title: 'Copy Share Link', copied_title: 'Copied to Clipboard' %>
      <% end %>
@@ -77,7 +106,7 @@
      <% submitter_field_counters = Hash.new { 0 } %>
      <% (@submission.template_submitters || @submission.template.submitters).each_with_index do |item, index| %>
        <% submitter = @submission.submitters.find { |e| e.uuid == item['uuid'] } %>
-        <div class="sticky -top-1 bg-base-100 pt-1 -mt-1 z-10">
+        <div class="sticky -top-1 bg-base-100 pt-1 -mt-1">
          <div class="border border-base-300 rounded-md px-2 py-1 mb-1">
            <div class="flex items-center space-x-1">
              <span class="mx-1 w-3 h-3 rounded-full <%= colors[index] %>"></span>
@@ -1,4 +1,4 @@
-<% is_show_tabs = @pagy.pages > 1 || params[:status].present? %>
+<% is_show_tabs = @pagy.count >= 5 || params[:status].present? %>
 <% if Docuseal.demo? %><%= render 'shared/demo_alert' %><% end %>
 <div class="flex justify-between mb-4 items-center">
  <div class="flex items-center">
@@ -56,7 +56,7 @@
    <%= render partial: 'templates/submission', collection: @submissions, locals: { with_template: true } %>
  </div>
 <% end %>
-<% if params[:q].blank? && @pagy.count < 5 %>
+<% if params[:q].blank? && params[:status].blank? && @pagy.count < 5 %>
  <%= render 'templates/dropzone' %>
 <% end %>
 <% if @submissions.present? || params[:q].blank? %>
@@ -1,3 +1,4 @@
+<%= render 'submissions/preview_tags' %>
 <div class="max-w-md mx-auto px-2 mt-12 mb-4">
  <div class="space-y-6 mx-auto">
    <div class="space-y-6">
@@ -21,15 +22,15 @@
      </div>
    </div>
    <% if Docuseal.multitenant? || Accounts.can_send_emails?(@submission.account) %>
-      <%= form_for '', url: send_submission_email_index_path, method: :post, html: { class: 'space-y-4', onsubmit: 'event.submitter.disabled = true' } do |f| %>
+      <%= form_for '', url: send_submission_email_index_path, method: :post, html: { class: 'space-y-4' } do |f| %>
        <div dir="auto" class="form-control !mt-0">
          <%= f.hidden_field :submission_slug, value: @submission.slug %>
          <%= f.label :email, t('email'), class: 'label' %>
          <%= f.email_field :email, value: current_user&.email || params[:email], required: true, class: 'base-input', placeholder: t('send_copy_to_email') %>
        </div>
-        <div dir="auto" class="form-control">
+        <toggle-submit dir="auto" class="form-control">
          <%= f.button button_title(title: t('send_copy_to_email'), disabled_with: t('starting')), class: 'base-button' %>
-        </div>
+        </toggle-submit>
      <% end %>
      <% if Docuseal.multitenant? %>
        <div class="divider uppercase"><%= t('or') %></div>
@@ -18,7 +18,9 @@
    </div>
    <div>
      <% if (Docuseal.multitenant? || Accounts.can_send_emails?(@submitter.account)) && @submitter.email.present? %>
-        <%= button_to button_title(title: t('send_copy_to_email'), disabled_with: t('sending'), icon: svg_icon('mail_forward', class: 'w-6 h-6')), send_submission_email_index_path, params: { submitter_slug: @submitter.slug }, form: { onsubmit: 'event.submitter.disabled = true' }, class: 'white-button w-full' %>
+        <toggle-submit>
+          <%= button_to button_title(title: t('send_copy_to_email'), disabled_with: t('sending'), icon: svg_icon('mail_forward', class: 'w-6 h-6')), send_submission_email_index_path, params: { submitter_slug: @submitter.slug }, class: 'white-button w-full' %>
+        </toggle-submit>
        <% if @submitter.submission.template.submitters.size != 1 %>
          <div class="divider uppercase"><%= t('or') %></div>
        <% else %>
@@ -40,9 +42,9 @@
    </div>
    <% if @submitter.submission.template.submitters.size == 1 && %w[api embed].exclude?(@submitter.submission.source) && @submitter.account.account_configs.find_or_initialize_by(key: AccountConfig::ALLOW_TO_RESUBMIT).value != false && !@submitter.template.archived_at? %>
      <div class="divider uppercase"><%= t('or') %></div>
-      <div>
-        <%= button_to button_title(title: t('resubmit'), disabled_with: t('resubmit'), icon: svg_icon('reload', class: 'w-6 h-6')), start_form_path(@submitter.submission.template.slug), params: { submitter: { email: @submitter.email, phone: @submitter.phone, name: @submitter.name }, resubmit: @submitter.slug }, method: :put, form: { onsubmit: 'event.submitter.disabled = true' }, class: 'white-button w-full' %>
-      </div>
+      <toggle-submit class="block">
+        <%= button_to button_title(title: t('resubmit'), disabled_with: t('resubmit'), icon: svg_icon('reload', class: 'w-6 h-6')), start_form_path(@submitter.submission.template.slug), params: { submitter: { email: @submitter.email, phone: @submitter.phone, name: @submitter.name }, resubmit: @submitter.slug }, method: :put, class: 'white-button w-full' %>
+      </toggle-submit>
    <% end %>
  </div>
 </div>
@@ -1,3 +1,5 @@
+<% content_for(:html_title, "#{@submitter.submission.template.name} | DocuSeal") %>
+<% content_for(:html_description, "#{@submitter.account.name} has invited you to fill and sign documents online effortlessly with a secure, fast, and user-friendly digital document signing solution.") %>
 <% fields_index = Templates.build_field_areas_index(@submitter.submission.template_fields || @submitter.submission.template.fields) %>
 <% values = @submitter.submission.submitters.reduce({}) { |acc, sub| acc.merge(sub.values) } %>
 <% attachments_index = ActiveStorage::Attachment.where(record: @submitter.submission.submitters, name: :attachments).preload(:blob).index_by(&:uuid) %>
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html data-theme="docuseal" lang="en">
+  <head>
+    <%= render 'layouts/head_tags' %>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <%= csrf_meta_tags %>
+    <%= csp_meta_tag %>
+    <% if ENV['ROLLBAR_CLIENT_TOKEN'] %>
+      <meta name="rollbar-token" content="<%= ENV.fetch('ROLLBAR_CLIENT_TOKEN', nil) %>">
+      <%= javascript_pack_tag 'rollbar', 'draw', defer: true %>
+    <% else %>
+      <%= javascript_pack_tag 'draw', defer: true %>
+    <% end %>
+    <%= stylesheet_pack_tag 'form', media: 'all' %>
+    <%= render 'shared/posthog' if ENV['POSTHOG_TOKEN'] %>
+  </head>
+  <body>
+    <draw-signature data-slug="<%= params[:slug] %>" class="flex items-center h-screen p-2 justify-center">
+      <%= form_for '', url: submit_form_path(params[:slug]), html: { style: 'max-width: 900px; width: 100%; margin-bottom: 120px' }, method: :put do |f| %>
+        <input value="" type="hidden" name="values[<%= (@submitter.submission.template_fields || @submitter.template.fields).find { |f| f['type'] == 'signature' && f['uuid'].starts_with?(params[:f]) }['uuid'] %>]">
+        <div class="font-semibold text-4xl text-center w-full mb-2">
+          Draw Signature
+        </div>
+        <div class="w-full bg-white rounded-2xl border relative" style="height: 300px">
+          <canvas class="w-full"></canvas>
+          <button aria-label="Clear" class="btn btn-ghost btn-sm font-medium top-0 right-0 absolute mt-1 mr-1">
+            <%= svg_icon('reload', class: 'w-5 h-5') %>
+            <span class="inline">Clear</span>
+          </button>
+        </div>
+        <div class="mt-4">
+          <button disabled class="base-button w-full">
+            Submit
+          </button>
+          <%= f.button button_title(title: 'Submit'), class: 'base-button w-full', style: 'display: none' %>
+        </div>
+      <% end %>
+      <div id="success" class="text-center p-2 hidden" style="margin-bottom: 100px">
+        <div class="flex items-center space-x-1 items-center justify-center text-2xl font-semibold mb-2">
+          <%= svg_icon('circle_check', class: 'text-green-600') %>
+          <span>
+            Signature Uploaded
+          </span>
+        </div>
+        <div>
+          Return back to your desktop device to complete the form or <a class="link" href="<%= submit_form_path(params[:slug]) %>">continue on mobile</a>
+        </div>
+      </div>
+    </draw-signature>
+  </body>
+</html>
@@ -1,5 +1,5 @@
-<% if @email_config %>
-  <%= render 'custom_content', content: @email_config.value['body'], submitter: @submitter, sig: @sig %>
+<% if @body.present? %>
+  <%= render 'custom_content', content: @body, submitter: @submitter, sig: @sig %>
 <% else %>
  <p>Hi there,</p>
  <p>Please check the copy of your "<%= @submitter.submission.template.name %>" submission in the email attachments.</p>
@@ -23,7 +23,7 @@
            </div>
          </span>
        </div>
-        <input id="file_dropzone_input" name="files[]" class="hidden" data-action="change:file-dropzone#onSelectFiles" data-target="file-dropzone.input" type="file" accept="image/*, application/pdf<%= ', .docx, .doc, .xlsx, .xls' if Docuseal.multitenant? %>" multiple>
+        <input id="file_dropzone_input" name="files[]" class="hidden" data-action="change:file-dropzone#onSelectFiles" data-target="file-dropzone.input" type="file" accept="image/*, application/pdf<%= ', .docx, .doc, .xlsx, .xls, .odt, .rtf' if Docuseal.multitenant? %>" multiple>
      </div>
    </label>
  </file-dropzone>
@@ -14,6 +14,6 @@
    </span>
  </button>
  <input type="hidden" name="form_id" value="<%= form_id %>">
-  <input id="upload_template" name="files[]" class="hidden" onchange="this.form.requestSubmit()" type="file" accept="image/*, application/pdf<%= ', .docx, .doc, .xlsx, .xls' if Docuseal.multitenant? %>" multiple>
+  <input id="upload_template" name="files[]" class="hidden" onchange="this.form.requestSubmit()" type="file" accept="image/*, application/pdf<%= ', .docx, .doc, .xlsx, .xls, .odt, .rtf' if Docuseal.multitenant? %>" multiple>
  <input hidden name="folder_name" value="<%= local_assigns[:folder_name] %>">
 <% end %>
@@ -57,20 +57,6 @@
  <div class="space-y-4">
    <%= render partial: 'submission', collection: @submissions, locals: { template: @template } %>
  </div>
-  <% view_archived_html = capture do %>
-    <% if @template.submissions.where.not(archived_at: nil).exists? && !@template.archived_at? %>
-      <div>
-        <a href="<%= template_archived_index_path(@template) %>" class="link text-sm">View Archived</a>
-      </div>
-    <% end %>
-  <% end %>
-  <% if @pagy.pages > 1 %>
-    <%= render 'shared/pagination', pagy: @pagy, items_name: 'submissions', left_additional_html: view_archived_html %>
-  <% else %>
-    <div class="mt-2">
-      <%= view_archived_html %>
-    </div>
-  <% end %>
 <% else %>
  <div class="card bg-base-200">
    <div class="card-body text-center py-16">
@@ -102,3 +88,17 @@
    </div>
  </div>
 <% end %>
+<% view_archived_html = capture do %>
+  <% if @template.submissions.where.not(archived_at: nil).exists? && !@template.archived_at? %>
+    <div>
+      <a href="<%= template_archived_index_path(@template) %>" class="link text-sm">View Archived</a>
+    </div>
+  <% end %>
+<% end %>
+<% if @pagy.pages > 1 %>
+  <%= render 'shared/pagination', pagy: @pagy, items_name: 'submissions', left_additional_html: view_archived_html %>
+<% else %>
+  <div class="mt-2">
+    <%= view_archived_html %>
+  </div>
+<% end %>
@@ -17,32 +17,6 @@
    </toggle-visible>
  <% end %>
  <div id="general" class="px-5 mb-4">
-    <%= form_for @template, url: template_preferences_path(@template), method: :post, html: { autocomplete: 'off', class: 'mt-1' } do |f| %>
-      <toggle-on-submit data-element-id="email_saved_alert"></toggle-on-submit>
-      <%= f.fields_for :preferences, Struct.new(:request_email_subject, :request_email_body).new(*(@template.preferences.values_at('request_email_subject', 'request_email_body').compact_blank.presence || AccountConfigs.find_or_initialize_for_key(current_account, AccountConfig::SUBMITTER_INVITATION_EMAIL_KEY).value.values_at('subject', 'body'))) do |ff| %>
-        <div class="form-control">
-          <%= ff.label :request_email_subject, 'Email subject', class: 'label' %>
-          <%= ff.text_field :request_email_subject, required: true, class: 'base-input', dir: 'auto' %>
-        </div>
-        <div class="form-control">
-          <div class="flex items-center">
-            <%= ff.label :request_email_body, 'Email body', class: 'label' %>
-            <span class="tooltip tooltip-right" data-tip="Use following placeholders text: <%= AccountConfig::DEFAULT_VALUES.dig(AccountConfig::SUBMITTER_INVITATION_EMAIL_KEY, 'body').scan(/{{.*?}}/).join(', ') %>">
-              <%= svg_icon('info_circle', class: 'w-4 h-4') %>
-            </span>
-          </div>
-          <autoresize-textarea>
-            <%= ff.text_area :request_email_body, required: true, class: 'base-input w-full py-2', dir: 'auto' %>
-          </autoresize-textarea>
-        </div>
-      <% end %>
-      <div class="form-control pt-2">
-        <%= f.button button_title(title: 'Save', disabled_with: 'Saving'), class: 'base-button' %>
-        <div class="flex justify-center">
-          <span id="email_saved_alert" class="text-sm invisible font-normal mt-0.5">Changes have been saved</span>
-        </div>
-      </div>
-    <% end %>
    <%= form_for @template, url: template_preferences_path(@template), method: :post, html: { autocomplete: 'off', class: 'mt-2' } do |f| %>
      <toggle-on-submit data-element-id="bcc_saved_alert"></toggle-on-submit>
      <%= f.fields_for :preferences, Struct.new(:bcc_completed).new(@template.preferences['bcc_completed']) do |ff| %>
@@ -65,6 +39,76 @@
      </div>
    <% end %>
    <%= render 'templates_code_modal/preferences' %>
+    <div class="join join-vertical w-full !rounded-2xl mb-1.5 mt-2.5">
+      <div class="collapse collapse-arrow join-item border border-base-300">
+        <input type="checkbox" name="accordion">
+        <div class="collapse-title text-xl font-medium">
+          Signature request email
+        </div>
+        <div class="collapse-content">
+          <%= form_for @template, url: template_preferences_path(@template), method: :post, html: { autocomplete: 'off', class: 'mt-1' } do |f| %>
+            <toggle-on-submit data-element-id="email_saved_alert1"></toggle-on-submit>
+            <%= f.fields_for :preferences, Struct.new(:request_email_subject, :request_email_body).new(*(@template.preferences.values_at('request_email_subject', 'request_email_body').compact_blank.presence || AccountConfigs.find_or_initialize_for_key(current_account, AccountConfig::SUBMITTER_INVITATION_EMAIL_KEY).value.values_at('subject', 'body'))) do |ff| %>
+              <div class="form-control">
+                <%= ff.label :request_email_subject, 'Email subject', class: 'label' %>
+                <%= ff.text_field :request_email_subject, required: true, class: 'base-input', dir: 'auto' %>
+              </div>
+              <div class="form-control">
+                <div class="flex items-center">
+                  <%= ff.label :request_email_body, 'Email body', class: 'label' %>
+                  <span class="tooltip tooltip-right" data-tip="Use following placeholders text: <%= AccountConfig::DEFAULT_VALUES.dig(AccountConfig::SUBMITTER_INVITATION_EMAIL_KEY, 'body').scan(/{{.*?}}/).join(', ') %>">
+                    <%= svg_icon('info_circle', class: 'w-4 h-4') %>
+                  </span>
+                </div>
+                <autoresize-textarea>
+                  <%= ff.text_area :request_email_body, required: true, class: 'base-input w-full py-2', dir: 'auto' %>
+                </autoresize-textarea>
+              </div>
+            <% end %>
+            <div class="form-control pt-2">
+              <%= f.button button_title(title: 'Save', disabled_with: 'Saving'), class: 'base-button' %>
+              <div class="flex justify-center">
+                <span id="email_saved_alert1" class="text-sm invisible font-normal mt-0.5">Changes have been saved</span>
+              </div>
+            </div>
+          <% end %>
+        </div>
+      </div>
+      <div class="collapse collapse-arrow join-item border border-base-300">
+        <input type="checkbox" name="accordion">
+        <div class="collapse-title text-xl font-medium">
+          Documents copy email
+        </div>
+        <div class="collapse-content">
+          <%= form_for @template, url: template_preferences_path(@template), method: :post, html: { autocomplete: 'off', class: 'mt-1' } do |f| %>
+            <toggle-on-submit data-element-id="email_saved_alert2"></toggle-on-submit>
+            <%= f.fields_for :preferences, Struct.new(:documents_copy_email_subject, :documents_copy_email_body).new(*(@template.preferences.values_at('documents_copy_email_subject', 'documents_copy_email_body').compact_blank.presence || AccountConfigs.find_or_initialize_for_key(current_account, AccountConfig::SUBMITTER_DOCUMENTS_COPY_EMAIL_KEY).value.values_at('subject', 'body'))) do |ff| %>
+              <div class="form-control">
+                <%= ff.label :documents_copy_email_subject, 'Email subject', class: 'label' %>
+                <%= ff.text_field :documents_copy_email_subject, required: true, class: 'base-input', dir: 'auto' %>
+              </div>
+              <div class="form-control">
+                <div class="flex items-center">
+                  <%= ff.label :documents_copy_email_body, 'Email body', class: 'label' %>
+                  <span class="tooltip tooltip-right" data-tip="Use following placeholders text: <%= AccountConfig::DEFAULT_VALUES.dig(AccountConfig::SUBMITTER_INVITATION_EMAIL_KEY, 'body').scan(/{{.*?}}/).join(', ') %>">
+                    <%= svg_icon('info_circle', class: 'w-4 h-4') %>
+                  </span>
+                </div>
+                <autoresize-textarea>
+                  <%= ff.text_area :documents_copy_email_body, required: true, class: 'base-input w-full py-2', dir: 'auto' %>
+                </autoresize-textarea>
+              </div>
+            <% end %>
+            <div class="form-control pt-2">
+              <%= f.button button_title(title: 'Save', disabled_with: 'Saving'), class: 'base-button' %>
+              <div class="flex justify-center">
+                <span id="email_saved_alert2" class="text-sm invisible font-normal mt-0.5">Changes have been saved</span>
+              </div>
+            </div>
+          <% end %>
+        </div>
+      </div>
+    </div>
  </div>
  <% if show_api %>
    <div id="api" class="hidden mt-2 mb-4 px-5">
@@ -0,0 +1,55 @@
+<%= render 'shared/turbo_modal', title: 'Update Initials' do %>
+  <% options = [%w[Draw draw], %w[Upload upload]] %>
+  <toggle-visible data-element-ids="<%= options.map(&:last).to_json %>" class="relative text-center mt-4 block">
+    <div class="join">
+      <% 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 %>
+          </label>
+        </span>
+      <% end %>
+    </div>
+  </toggle-visible>
+  <div id="draw" class="mt-3">
+    <%= form_for @user_config, url: user_initials_path, method: :put, data: { turbo_frame: :_top }, html: { autocomplete: :off, enctype: 'multipart/form-data' } do |f| %>
+      <signature-form class="relative block">
+        <a class="absolute top-1 right-1 link text-sm" data-target="signature-form.clear" href="#">Clear</a>
+        <canvas data-target="signature-form.canvas" class="bg-white border border-base-300 rounded"></canvas>
+        <input name="file" class="hidden" data-target="signature-form.input" type="file" accept="image/png,image/jpeg,image/jpg">
+        <div class="form-control mt-4">
+          <%= f.button button_title(title: 'Save', disabled_with: 'Saving'), class: 'base-button', data: { target: 'signature-form.button' } %>
+        </div>
+      </signature-form>
+    <% end %>
+  </div>
+  <div id="upload" class="hidden mt-3">
+    <%= form_for @user_config, url: user_initials_path, method: :put, data: { turbo_frame: :_top }, html: { autocomplete: :off, enctype: 'multipart/form-data' } do |f| %>
+      <file-dropzone data-submit-on-upload="true" class="w-full">
+        <label for="file" class="w-full block h-32 relative bg-base-200 hover:bg-base-200/70 rounded-md border border-base-content border-dashed">
+          <div class="absolute top-0 right-0 left-0 bottom-0 flex items-center justify-center">
+            <div class="flex flex-col items-center">
+              <span data-target="file-dropzone.icon">
+                <%= svg_icon('cloud_upload', class: 'w-10 h-10') %>
+              </span>
+              <span data-target="file-dropzone.loading" class="hidden">
+                <%= svg_icon('loader', class: 'w-10 h-10 animate-spin') %>
+              </span>
+              <div class="font-medium mb-1">
+                Upload Initials
+              </div>
+              <div class="text-xs">
+                <span class="font-medium">Click to upload</span> or drag and drop
+              </div>
+            </div>
+            <input id="file" name="file" class="hidden" data-action="change:file-dropzone#onSelectFiles" data-target="file-dropzone.input" type="file" accept="image/png,image/jpeg,image/jpg">
+          </div>
+        </label>
+      </file-dropzone>
+      <div class="form-control mt-4">
+        <%= f.button button_title(title: 'Save', disabled_with: 'Saving'), class: 'base-button' %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
@@ -5,9 +5,14 @@
      <h1 class="text-4xl font-bold"><%= params[:status].to_s.titleize %> Users</h1>
      <div class="flex items-center space-x-4">
        <% if can?(:create, User.new(account: current_account)) %>
-          <%= link_to new_user_path, class: 'btn btn-primary btn-md gap-2', data: { turbo_frame: 'modal' } do %>
-            <%= svg_icon('plus', class: 'w-6 h-6') %>
-            <span>New User</span>
+          <%= render 'users/extra_buttons' %>
+          <% if content_for(:add_user_button) %>
+            <%= content_for(:add_user_button) %>
+          <% else %>
+            <%= link_to new_user_path, class: 'btn btn-primary btn-md gap-2', data: { turbo_frame: 'modal' } do %>
+              <%= svg_icon('plus', class: 'w-6 h-6') %>
+              <span>New User</span>
+            <% end %>
          <% end %>
        <% end %>
      </div>
@@ -50,7 +55,7 @@
                <%= user.last_sign_in_at ? l(user.last_sign_in_at.in_time_zone(current_account.timezone), format: :short, locale: current_account.locale) : '-' %>
              </td>
              <td class="flex items-center space-x-2 justify-end">
-                <% if can?(:update, user) %>
+                <% if can?(:update, user) && user.archived_at.blank? %>
                  <%= link_to edit_user_path(user), class: 'btn btn-outline btn-xs', title: 'Edit', data: { turbo_frame: 'modal' } do %>
                    Edit
                  <% end %>
@@ -61,7 +66,7 @@
                  <% end %>
                <% end %>
                <% if params[:status].present? && can?(:manage, user) && user != current_user %>
-                  <%= button_to user_path(user), method: :put, params: { user: { archived_at: nil } }, class: 'btn btn-outline btn-secondary btn-xs', title: 'Unarchive', data: { turbo_confirm: 'Are you sure?' } do %>
+                  <%= button_to user_path(user), method: :put, params: { user: { archived_at: nil } }, class: 'btn btn-outline btn-xs', title: 'Unarchive', data: { turbo_confirm: 'Are you sure?' } do %>
                    Unarchive
                  <% end %>
                <% end %>
@@ -15,22 +15,24 @@
          </div>
        <% end %>
        <% preference = current_account.account_configs.find_by(key: AccountConfig::WEBHOOK_PREFERENCES_KEY)&.value || {} %>
-        <div class="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-5 mt-2 gap-y-2">
-          <% WebhookPreferencesController::EVENTS.each do |event| %>
-            <%= form_for '', url: webhook_preferences_path, method: :post do |f| %>
-              <%= f.hidden_field :event, value: event %>
-              <% uuid = SecureRandom.uuid %>
-              <div class="flex">
-                <label for="<%= uuid %>" class="flex items-center space-x-2">
-                  <%= f.check_box :value, class: 'base-checkbox', checked: preference[event] || (!preference.key?(event) && event.starts_with?('form.')), onchange: 'this.form.requestSubmit()', id: uuid %>
-                  <span>
-                    <%= event %>
-                  </span>
-                </label>
-              </div>
+        <% WebhookPreferencesController::EVENTS.group_by { |e| e.include?('form') }.each do |_, events| %>
+          <div class="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-4 mt-2 gap-y-2">
+            <% events.each do |event| %>
+              <%= form_for '', url: webhook_preferences_path, method: :post do |f| %>
+                <%= f.hidden_field :event, value: event %>
+                <% uuid = SecureRandom.uuid %>
+                <div class="flex">
+                  <label for="<%= uuid %>" class="flex items-center space-x-2">
+                    <%= f.check_box :value, class: 'base-checkbox', checked: preference[event] || (!preference.key?(event) && event.starts_with?('form.')), onchange: 'this.form.requestSubmit()', id: uuid %>
+                    <span>
+                      <%= event %>
+                    </span>
+                  </label>
+                </div>
+              <% end %>
            <% end %>
-          <% end %>
-        </div>
+          </div>
+        <% end %>
      </div>
    </div>
    <% submitter = current_account.submitters.where.not(completed_at: nil).order(:id).last %>
@@ -11,6 +11,7 @@ require 'active_job/railtie'
 require 'rails/health_controller'

 require_relative '../lib/api_path_consider_json_middleware'
+require_relative '../lib/normalize_client_ip_middleware'

 Bundler.require(*Rails.groups)

@@ -32,6 +33,7 @@ module DocuSeal
    config.action_view.frozen_string_literal = true

    config.middleware.insert_before ActionDispatch::Static, Rack::Deflater
+    config.middleware.insert_before ActionDispatch::Static, NormalizeClientIpMiddleware
    config.middleware.insert_before ActionDispatch::Static, ApiPathConsiderJsonMiddleware

    config.generators.system_tests = nil
@@ -2,6 +2,8 @@

 require 'active_support/core_ext/integer/time'

+Rails.backtrace_cleaner.remove_silencers!
+
 Rails.application.configure do
  config.after_initialize do
    Bullet.enable        = true
@@ -52,7 +52,7 @@ Rails.application.configure do
    end

  config.active_storage.resolve_model_to_route = :rails_storage_proxy if ENV['ACTIVE_STORAGE_PUBLIC'] != 'true'
-  config.active_storage.service_urls_expire_in = 15.minutes
+  config.active_storage.service_urls_expire_in = 4.hours

  # Mount Action Cable outside main process or domain.
  # config.action_cable.mount_path = nil
@@ -136,13 +136,14 @@ Rails.application.configure do
        end

      {
-        fwd: controller.request.ip,
+        fwd: controller.request.remote_ip,
        params: {
          id: params[:id],
          sig: (params[:signed_uuid] || params[:signed_id]).to_s.split('--').first,
          slug: (params[:slug] ||
                 params[:submitter_slug] ||
                 params[:submission_slug] ||
+                 params[:submit_form_slug] ||
                 params[:template_slug]).to_s.last(5)
        }.compact_blank,
        host: controller.request.host,
@@ -154,7 +155,7 @@ Rails.application.configure do

    config.lograge.custom_payload do |controller|
      {
-        fwd: controller.request.ip
+        fwd: controller.request.remote_ip
      }
    end
  end
@@ -16,7 +16,7 @@ Rails.application.configure do
  # Eager loading loads your whole application. When running a single test locally,
  # this probably isn't necessary. It's a good idea to do in a continuous integration
  # system, or in some way before deploying your code.
-  config.eager_load = ENV['CI'].present?
+  config.eager_load = true

  # Configure public file server for tests with Cache-Control for performance.
  config.public_file_server.enabled = true
@@ -14,6 +14,13 @@ module HexaPDF
  end

  module Type
+    class Page
+      # fix NoMethodError (undefined method `color_space' for an instance of HexaPDF::Type::Page)
+      def color_space(name)
+        GlobalConfiguration.constantize('color_space.map', name).new
+      end
+    end
+
    # fix NoMethodError: undefined method `field_value' for #<HexaPDF::Type::AcroForm::Field
    module AcroForm
      class Field
@@ -50,11 +50,13 @@ Rails.application.routes.draw do
  resources :enquiries, only: %i[create]
  resources :users, only: %i[new create edit update destroy]
  resource :user_signature, only: %i[edit update destroy]
+  resource :user_initials, only: %i[edit update destroy]
  resources :submissions_archived, only: %i[index], path: 'submissions/archived'
  resources :submissions, only: %i[index], controller: 'submissions_dashboard'
  resources :submissions, only: %i[show destroy]
  resources :console_redirect, only: %i[index]
  resources :upgrade, only: %i[index], controller: 'console_redirect'
+  resources :manage, only: %i[index], controller: 'console_redirect'
  resource :testing_account, only: %i[show destroy]
  resources :testing_api_settings, only: %i[index]
  resources :submitters_autocomplete, only: %i[index]
@@ -104,9 +106,12 @@ Rails.application.routes.draw do
  end

  resources :submit_form, only: %i[show update], path: 's', param: 'slug' do
+    resources :values, only: %i[index], controller: 'submit_form_values'
    get :completed
  end

+  resources :submit_form_draw_signature, only: %i[show], path: 'p', param: 'slug'
+
  resources :submissions_preview, only: %i[show], path: 'e', param: 'slug' do
    get :completed
  end
@@ -1,5 +1,6 @@
 queues:
  - [default, 1]
+  - [webhooks, 1]
  - [mailers, 1]
  - [recurrent, 1]
  - [rollbar, 1]
@@ -1,8 +1,8 @@
-const { globalMutableWebpackConfig, merge } = require('shakapacker')
+const { generateWebpackConfig, merge } = require('shakapacker')
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
 const { VueLoaderPlugin } = require('vue-loader')

-const configs = merge(globalMutableWebpackConfig, {
+const configs = generateWebpackConfig({
  resolve: {
    extensions: ['.css', '.scss', '.vue']
  },
@@ -12,12 +12,19 @@ const configs = merge(globalMutableWebpackConfig, {
  optimization: {
    runtimeChunk: false,
    splitChunks: {
+      chunks (chunk) {
+        return chunk.name !== 'rollbar'
+      },
      cacheGroups: {
        default: false,
        applicationVendors: {
          test: /\/node_modules\//,
          chunks: chunk => chunk.name === 'application'
        },
+        drawVendors: {
+          test: /\/node_modules\//,
+          chunks: chunk => chunk.name === 'draw'
+        },
        formVendors: {
          test: /\/node_modules\//,
          chunks: chunk => chunk.name === 'form'
@@ -31,6 +31,17 @@ module Accounts
    new_account
  end

+  def users_count(account)
+    rel = User.where(account_id: account.id).or(
+      User.where(account_id: account.account_linked_accounts
+                                           .where.not(account_type: :testing)
+                                           .select(:linked_account_id))
+    )
+
+    rel.where.not(account: account.linked_accounts.where.not(archived_at: nil))
+       .where.not(role: :integration).active.count
+  end
+
  def find_or_create_testing_user(account)
    user = User.where(role: :admin).order(:id).find_by(account: account.testing_accounts)

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class NormalizeClientIpMiddleware
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    if env['HTTP_CLIENT_IP'].present? && env['HTTP_X_CLIENT_IP'].present? &&
+       env['HTTP_CLIENT_IP'].starts_with?("#{env['HTTP_X_CLIENT_IP']}:")
+      env['HTTP_CLIENT_IP'] = env['HTTP_X_CLIENT_IP']
+    end
+
+    @app.call(env)
+  end
+end
@@ -1,96 +0,0 @@
-# frozen_string_literal: true
-
-class PdfProcessor < HexaPDF::Content::Processor
-  attr_accessor :handler, :serializer
-
-  class ParseTextHandler
-    attr_accessor :pos, :num, :search_chars, :handler
-
-    def initialize(handler)
-      @num = 0
-      @pos = 0
-
-      @handler = handler
-      @search_chars = handler.search_chars
-    end
-
-    TJS = %i[TJ Tj].freeze
-
-    def call(processor, operator, operands)
-      return unless TJS.include?(operator)
-
-      processor.send(:decode_text, *operands).chars.each do |char|
-        handler.tokens << [char, [@num, @pos]] if search_chars.include?(char)
-
-        @pos += 1
-      end
-
-      @pos = 0
-      @num += 1
-    rescue HexaPDF::Error => e
-      Rails.logger.error(e.message)
-
-      @pos = 0
-      @num += 1
-    end
-  end
-
-  def initialize(page)
-    super
-
-    @serializer = HexaPDF::Serializer.new
-  end
-
-  def serialize(operator, operands)
-    operators[operator].serialize(serializer, *operands)
-  end
-
-  def process(operator, operands = [])
-    super
-
-    handler.call(self, operator, operands)
-  end
-
-  def self.call(data, process_handler, result_handler, acc = {}, remove_tags: true)
-    doc = HexaPDF::Document.new(io: StringIO.new(data))
-
-    doc.pages.each do |page|
-      processor = PdfProcessor.new(page)
-      process_handler_instance = process_handler.new
-      processor.handler = ParseTextHandler.new(process_handler_instance)
-
-      page.process_contents(processor)
-
-      if process_handler_instance.tokens?
-        processor = PdfProcessor.new(page)
-        processor.handler = process_handler_instance
-
-        page.process_contents(processor)
-
-        page.contents = process_handler_instance.contents if process_handler_instance.result.present? && remove_tags
-      end
-
-      page[:Annots].to_a.each do |annot|
-        next unless annot
-
-        text = annot[:Contents].to_s.squish
-
-        next unless text.starts_with?('{{') && text.ends_with?('}}')
-
-        result_handler.call({ text:, rect: annot[:Rect] }, page, acc)
-
-        page[:Annots].delete(annot)
-      end
-
-      process_handler_instance.result.each do |item|
-        result_handler.call(item, page, acc)
-      end
-    end
-
-    new_io = StringIO.new
-
-    doc.write(new_io, validate: false)
-
-    [new_io.tap(&:rewind).read, acc]
-  end
-end
@@ -11,6 +11,7 @@ module Submissions
    module_function

    def call(submitter)
+      return [] unless submitter
      return submitter.documents if ApplicationRecord.uncached { submitter.document_generation_events.complete.exists? }

      events =
@@ -54,7 +55,7 @@ module Submissions
            DocumentGenerationEvent.where(submitter:).order(:created_at).last
          end

-        break submitter.documents if last_event.event_name.in?(%w[complete fail])
+        break submitter.documents.reload if last_event.event_name.in?(%w[complete fail])

        raise WaitForCompleteTimeout if total_wait_time > CHECK_COMPLETE_TIMEOUT
      end
@@ -12,7 +12,6 @@ module Submissions
                  'Helvetica'
                end

-    SIGN_REASON = 'Signed with DocuSeal.co'
    VERIFIED_TEXT = 'Verified'
    UNVERIFIED_TEXT = 'Unverified'

@@ -31,9 +30,35 @@ module Submissions

    # rubocop:disable Metrics
    def call(submission)
+      document = build_audit_trail(submission)
+
      account = submission.account
+
      pkcs = Accounts.load_signing_pkcs(account)
      tsa_url = Accounts.load_timeserver_url(account)
+
+      io = StringIO.new
+
+      document.trailer.info[:Creator] = "#{Docuseal.product_name} (#{Docuseal::PRODUCT_URL})"
+
+      sign_params = {
+        reason: sign_reason,
+        **Submissions::GenerateResultAttachments.build_signing_params(pkcs, tsa_url)
+      }
+
+      document.sign(io, **sign_params)
+
+      ActiveStorage::Attachment.create!(
+        blob: ActiveStorage::Blob.create_and_upload!(
+          io: StringIO.new(io.string), filename: "Audit Log - #{submission.template.name}.pdf"
+        ),
+        name: 'audit_trail',
+        record: submission
+      )
+    end
+
+    def build_audit_trail(submission)
+      account = submission.account
      verify_url = Rails.application.routes.url_helpers.settings_esign_url(**Docuseal.default_url_options)
      page_size =
        if TimeUtils.timezone_abbr(account.timezone, Time.current.beginning_of_year).in?(US_TIMEZONES)
@@ -299,24 +324,11 @@ module Submissions

      composer.table(events_data, cell_style: { padding: [0, 0, 12, 0], border: { width: 0 } }) if events_data.present?

-      io = StringIO.new
+      composer.document
+    end

-      composer.document.trailer.info[:Creator] = "#{Docuseal.product_name} (#{Docuseal::PRODUCT_URL})"
-
-      sign_params = {
-        reason: SIGN_REASON,
-        **Submissions::GenerateResultAttachments.build_signing_params(pkcs, tsa_url)
-      }
-
-      composer.document.sign(io, **sign_params)
-
-      ActiveStorage::Attachment.create!(
-        blob: ActiveStorage::Blob.create_and_upload!(
-          io: StringIO.new(io.string), filename: "Audit Log - #{submission.template.name}.pdf"
-        ),
-        name: 'audit_trail',
-        record: submission
-      )
+    def sign_reason
+      'Signed with DocuSeal.co'
    end

    def add_logo(column, _submission = nil)
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module Submissions
+  module GenerateCombinedAttachment
+    module_function
+
+    def call(submitter)
+      pdf = build_combined_pdf(submitter)
+
+      submission = submitter.submission
+      account = submission.account
+
+      pkcs = Accounts.load_signing_pkcs(account)
+      tsa_url = Accounts.load_timeserver_url(account)
+
+      io = StringIO.new
+
+      pdf.trailer.info[:Creator] = "#{Docuseal.product_name} (#{Docuseal::PRODUCT_URL})"
+
+      sign_params = {
+        reason: sign_reason,
+        **Submissions::GenerateResultAttachments.build_signing_params(pkcs, tsa_url)
+      }
+
+      pdf.sign(io, **sign_params)
+
+      ActiveStorage::Attachment.create!(
+        blob: ActiveStorage::Blob.create_and_upload!(
+          io: StringIO.new(io.string), filename: "#{submission.template.name}.pdf"
+        ),
+        name: 'combined_document',
+        record: submission
+      )
+    end
+
+    def build_combined_pdf(submitter)
+      pdfs_index = Submissions::GenerateResultAttachments.generate_pdfs(submitter)
+
+      audit_trail = Submissions::GenerateAuditTrail.build_audit_trail(submitter.submission)
+
+      audit_trail.dispatch_message(:complete_objects)
+
+      result = HexaPDF::Document.new
+
+      submitter.submission.template_schema.each do |item|
+        pdf = pdfs_index[item['attachment_uuid']]
+
+        pdf.dispatch_message(:complete_objects)
+
+        pdf.pages.each { |page| result.pages << result.import(page) }
+      end
+
+      audit_trail.pages.each { |page| result.pages << result.import(page) }
+
+      result
+    end
+
+    def sign_reason
+      'Signed with DocuSeal.co'
+    end
+  end
+end
@@ -11,7 +11,6 @@ module Submissions
                end

    SIGN_REASON = 'Signed by %<name>s with DocuSeal.co'
-    SIGN_SIGNLE_REASON = 'Digitally signed with DocuSeal.co'

    RTL_REGEXP = TextUtils::RTL_REGEXP

@@ -40,17 +39,58 @@ module Submissions

    # rubocop:disable Metrics
    def call(submitter)
-      cell_layouter = HexaPDF::Layout::TextLayouter.new(text_valign: :center, text_align: :center)
+      pdfs_index = generate_pdfs(submitter)

      template = submitter.submission.template
+      account = submitter.account
+
+      pkcs = Accounts.load_signing_pkcs(account)
+      tsa_url = Accounts.load_timeserver_url(account)
+
+      image_pdfs = []
+      original_documents = template.documents.preload(:blob)
+
+      result_attachments =
+        submitter.submission.template_schema.map do |item|
+          pdf = pdfs_index[item['attachment_uuid']]
+
+          attachment = build_pdf_attachment(pdf:, submitter:, pkcs:, tsa_url:,
+                                            uuid: item['attachment_uuid'],
+                                            name: item['name'])
+
+          image_pdfs << pdf if original_documents.find { |a| a.uuid == item['attachment_uuid'] }.image?
+
+          attachment
+        end
+
+      return result_attachments.map { |e| e.tap(&:save!) } if image_pdfs.size < 2
+
+      images_pdf =
+        image_pdfs.each_with_object(HexaPDF::Document.new) do |pdf, doc|
+          pdf.pages.each { |page| doc.pages << doc.import(page) }
+        end
+
+      images_pdf_attachment =
+        build_pdf_attachment(
+          pdf: images_pdf,
+          submitter:,
+          tsa_url:,
+          pkcs:,
+          uuid: images_pdf_uuid(original_documents.select(&:image?)),
+          name: template.name
+        )
+
+      (result_attachments + [images_pdf_attachment]).map { |e| e.tap(&:save!) }
+    end
+
+    def generate_pdfs(submitter)
+      cell_layouter = HexaPDF::Layout::TextLayouter.new(text_valign: :center, text_align: :center)

      is_flatten =
        submitter.account.account_configs
                 .find_or_initialize_by(key: AccountConfig::FLATTEN_RESULT_PDF_KEY).value != false

      account = submitter.account
-      pkcs = Accounts.load_signing_pkcs(account)
-      tsa_url = Accounts.load_timeserver_url(account)
      attachments_data_cache = {}

      pdfs_index = build_pdfs_index(submitter, flatten: is_flatten)
@@ -260,40 +300,7 @@ module Submissions
        end
      end

-      image_pdfs = []
-      original_documents = template.documents.preload(:blob)
-
-      result_attachments =
-        submitter.submission.template_schema.map do |item|
-          pdf = pdfs_index[item['attachment_uuid']]
-
-          attachment = build_pdf_attachment(pdf:, submitter:, pkcs:, tsa_url:,
-                                            uuid: item['attachment_uuid'],
-                                            name: item['name'])
-
-          image_pdfs << pdf if original_documents.find { |a| a.uuid == item['attachment_uuid'] }.image?
-
-          attachment
-        end
-
-      return result_attachments.map { |e| e.tap(&:save!) } if image_pdfs.size < 2
-
-      images_pdf =
-        image_pdfs.each_with_object(HexaPDF::Document.new) do |pdf, doc|
-          pdf.pages.each { |page| doc.pages << doc.import(page) }
-        end
-
-      images_pdf_attachment =
-        build_pdf_attachment(
-          pdf: images_pdf,
-          submitter:,
-          tsa_url:,
-          pkcs:,
-          uuid: images_pdf_uuid(original_documents.select(&:image?)),
-          name: template.name
-        )
-
-      (result_attachments + [images_pdf_attachment]).map { |e| e.tap(&:save!) }
+      pdfs_index
    end

    def build_pdf_attachment(pdf:, submitter:, pkcs:, tsa_url:, uuid:, name:)
@@ -376,6 +383,7 @@ module Submissions

        if flatten
          begin
+            pdf.acro_form.create_appearances(force: true) if pdf.acro_form && pdf.acro_form[:NeedAppearances]
            pdf.acro_form&.flatten
          rescue StandardError => e
            Rollbar.error(e) if defined?(Rollbar)
@@ -453,8 +461,10 @@ module Submissions
      format(SIGN_REASON, name:)
    end

-    def single_sign_reason
-      SIGN_SIGNLE_REASON
+    def single_sign_reason(submitter)
+      signers = submitter.submission.submitters.sort_by(&:completed_at).map { |s| s.email || s.name || s.phone }
+
+      format(SIGN_REASON, name: signers.reverse.join(', '))
    end

    def fetch_sign_reason(submitter)
@@ -463,16 +473,18 @@ module Submissions
      config =
        if Docuseal.multitenant?
          AccountConfig.where(account: submitter.account, key: AccountConfig::ESIGNING_PREFERENCE_KEY)
-                       .first_or_initialize(value: 'multiple')
+                       .first_or_initialize(value: 'single')
        else
          AccountConfig.where(key: AccountConfig::ESIGNING_PREFERENCE_KEY)
-                       .first_or_initialize(value: 'multiple')
+                       .first_or_initialize(value: 'single')
        end

      return sign_reason(reason_name) if config.value == 'multiple'

-      return single_sign_reason if !submitter.submission.submitters.exists?(completed_at: nil) &&
-                                   submitter.completed_at == submitter.submission.submitters.maximum(:completed_at)
+      if !submitter.submission.submitters.exists?(completed_at: nil) &&
+         submitter.completed_at == submitter.submission.submitters.maximum(:completed_at)
+        return single_sign_reason(submitter)
+      end

      nil
    end
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Submissions
+  module SerializeForApi
+    SERIALIZE_PARAMS = {
+      only: %i[id slug source submitters_order created_at updated_at archived_at],
+      methods: %i[audit_log_url],
+      include: {
+        submitters: { only: %i[id slug uuid name email phone
+                               completed_at opened_at sent_at
+                               created_at updated_at external_id metadata],
+                      methods: %i[status application_key] },
+        template: { only: %i[id name external_id created_at updated_at],
+                    methods: %i[folder_name] },
+        created_by_user: { only: %i[id email first_name last_name] }
+      }
+    }.freeze
+
+    module_function
+
+    def call(submission, submitters = nil)
+      submitters ||= submission.submitters.preload(documents_attachments: :blob, attachments_attachments: :blob)
+
+      serialized_submitters = submitters.map { |submitter| Submitters::SerializeForApi.call(submitter) }
+
+      json = submission.as_json(
+        SERIALIZE_PARAMS.deep_merge(
+          include: { submission_events: { only: %i[id submitter_id event_type event_timestamp] } }
+        )
+      )
+
+      if submitters.all?(&:completed_at?)
+        last_submitter = submitters.max_by(&:completed_at)
+
+        json[:documents] = serialized_submitters.find { |e| e['id'] == last_submitter.id }['documents']
+        json[:status] = 'completed'
+        json[:completed_at] = last_submitter.completed_at
+      else
+        json[:documents] = []
+        json[:status] = 'pending'
+        json[:completed_at] = nil
+      end
+
+      json[:submitters] = serialized_submitters
+
+      json
+    end
+  end
+end
@@ -36,6 +36,14 @@ module Submitters
        user.first_name
      elsif field_name == 'last name'
        user.last_name
+      elsif field['type'] == 'initials' && (initials = UserConfigs.load_initials(user))
+        attachment = ActiveStorage::Attachment.find_or_create_by!(
+          blob_id: initials.blob_id,
+          name: 'attachments',
+          record: submitter
+        )
+
+        attachment.uuid
      elsif field['type'] == 'signature' && (signature = UserConfigs.load_signature(user))
        attachment = ActiveStorage::Attachment.find_or_create_by!(
          blob_id: signature.blob_id,
@@ -10,6 +10,7 @@ module Templates
    Q = 35
    MAX_WIDTH = 1400
    MAX_NUMBER_OF_PAGES_PROCESSED = 15
+    MAX_FLATTEN_FILE_SIZE = 15.megabytes

    module_function

@@ -43,7 +44,11 @@ module Templates

    def generate_pdf_preview_images(attachment, data)
      ActiveStorage::Attachment.where(name: ATTACHMENT_NAME, record: attachment).destroy_all
-      number_of_pages = HexaPDF::Document.new(io: StringIO.new(data)).pages.size
+
+      pdf = HexaPDF::Document.new(io: StringIO.new(data))
+      number_of_pages = pdf.pages.size
+
+      data = maybe_flatten_form(data, pdf)

      attachment.metadata['pdf'] ||= {}
      attachment.metadata['pdf']['number_of_pages'] = number_of_pages
@@ -69,6 +74,26 @@ module Templates
      end
    end

+    def maybe_flatten_form(data, pdf)
+      return data if data.size > MAX_FLATTEN_FILE_SIZE
+      return data if pdf.acro_form.blank?
+
+      io = StringIO.new
+
+      pdf.acro_form.create_appearances(force: true) if pdf.acro_form[:NeedAppearances]
+      pdf.acro_form.flatten
+
+      pdf.write(io, incremental: false, validate: false)
+
+      io.string
+    rescue StandardError => e
+      raise if Rails.env.development?
+
+      Rollbar.error(e) if defined?(Rollbar)
+
+      data
+    end
+
    def generate_pdf_preview_from_file(attachment, file_path, page_number)
      io = StringIO.new

@@ -10,4 +10,12 @@ module UserConfigs

    ActiveStorage::Attachment.find_by(uuid:, record: user, name: 'signature') if uuid.present?
  end
+
+  def load_initials(user)
+    return if user.blank?
+
+    uuid = user.user_configs.find_or_initialize_by(key: UserConfig::INITIALS_KEY).value
+
+    ActiveStorage::Attachment.find_by(uuid:, record: user, name: 'initials') if uuid.present?
+  end
 end
@@ -19,15 +19,17 @@
    "compression-webpack-plugin": "10.0.0",
    "css-loader": "^6.7.3",
    "css-minimizer-webpack-plugin": "^5.0.0",
-    "daisyui": "^3.2.1",
+    "daisyui": "^3.9.4",
    "mathjs": "^12.4.0",
    "mini-css-extract-plugin": "^2.7.5",
    "postcss": "^8.4.23",
    "postcss-import": "^15.1.0",
    "postcss-loader": "^7.3.0",
+    "qr-creator": "^1.0.0",
+    "rollbar": "^2.26.4",
    "sass": "^1.62.1",
    "sass-loader": "^13.2.2",
-    "shakapacker": "7.2.3",
+    "shakapacker": "8.0.0",
    "signature_pad": "^4.1.5",
    "snarkdown": "^2.0.0",
    "tailwindcss": "^3.3.2",
@@ -42,6 +44,7 @@
    "webpack-dev-server": "^4.15.0",
    "webpack-merge": "5"
  },
+  "packageManager": "yarn@1.0",
  "version": "0.1.0",
  "scripts": {
    "eslint": "./node_modules/eslint/bin/eslint.js \"app/javascript/**/*.{js,vue}\" --fix"
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :account_config do
+    account
+  end
+end
Author	SHA1	Message	Date
Pete Matsyburka	b81cc83027	fix signature toggle	2024-06-03 12:31:40 +03:00
Pete Matsyburka	766d653349	fix build	2024-06-03 12:01:09 +03:00
Pete Matsyburka	98c04eac15	normalize client ip	2024-06-03 08:57:14 +03:00
Pete Matsyburka	c35dfea154	add log	2024-06-02 21:24:21 +03:00
Pete Matsyburka	37a9a86a1d	fix naming	2024-06-02 18:36:59 +03:00
Pete Matsyburka	e9a759055b	allow to upload user initials	2024-06-02 17:06:09 +03:00
Pete Matsyburka	f6c061a57b	allow to draw signature on mobile	2024-06-02 16:02:18 +03:00
Pete Matsyburka	91f3d8ed7e	adjust meta tags	2024-05-31 22:35:59 +03:00
Pete Matsyburka	3b18502d3d	remove onsubmit html event	2024-05-31 14:44:36 +03:00
Pete Matsyburka	df8e79683a	eager load in test	2024-05-31 13:19:33 +03:00
Alex Turchyn	7080e8ea33	fix js errors	2024-05-31 13:08:02 +03:00
Pete Matsyburka	c56f8cb38f	fix autocomplete	2024-05-30 23:38:38 +03:00
Pete Matsyburka	1ceac968b0	fix move existing user	2024-05-30 22:18:32 +03:00
Pete Matsyburka	938ee99cfc	show full error trace in dev	2024-05-29 16:14:07 +03:00
Pete Matsyburka	2367040e45	add slug to submissions response	2024-05-28 00:25:59 +03:00
Pete Matsyburka	df19aabfba	adjust users table	2024-05-27 20:36:52 +03:00
Pete Matsyburka	f7b5bcd52f	add webhooks queue	2024-05-27 14:40:12 +03:00
Pete Matsyburka	a249b0a678	fix pdf form flatten fields	2024-05-27 00:47:14 +03:00
Pete Matsyburka	99bc46b40f	fix erblint	2024-05-26 22:51:16 +03:00
Pete Matsyburka	c1e6f0970d	add file types	2024-05-26 22:38:24 +03:00
Pete Matsyburka	e8c2316bb2	add users count	2024-05-26 20:51:02 +03:00
Pete Matsyburka	9866e5468c	add download combined pdf button	2024-05-26 11:43:47 +03:00
Pete Matsyburka	fc60df7974	fix erblint	2024-05-25 16:59:22 +03:00
Pete Matsyburka	08784d28c7	adjust log ip	2024-05-25 16:25:59 +03:00
Pete Matsyburka	0440ea652f	increase attachment url ttl	2024-05-25 16:25:56 +03:00
Pete Matsyburka	e466562391	use rollbar	2024-05-24 13:35:28 +03:00
Pete Matsyburka	b2c8667c53	safe register element	2024-05-23 14:02:48 +03:00
Pete Matsyburka	d6893079f7	remove breadcrumbs	2024-05-23 13:39:16 +03:00
Pete Matsyburka	ac1d973605	fix loop	2024-05-23 12:45:01 +03:00
Pete Matsyburka	1405fefc85	add sentry	2024-05-23 12:25:25 +03:00
Pete Matsyburka	2a75055fb6	fix pdf parsing	2024-05-22 21:37:23 +03:00
Pete Matsyburka	f84fdd51de	fix builder areas	2024-05-22 15:39:46 +03:00
Alex Turchyn	b38073126e	fix dropdown styles	2024-05-22 15:20:04 +03:00
Alex Turchyn	c6e681195d	upgrade daisyUI to v3.9.4	2024-05-22 13:39:43 +03:00
Pete Matsyburka	53d924be0b	fix build	2024-05-20 20:07:17 +03:00
Pete Matsyburka	d6cf027d5d	fix erblint	2024-05-19 19:44:38 +03:00
Alex Turchyn	ec332bab88	flatten pdf for preview images	2024-05-19 19:25:53 +03:00
Alex Turchyn	8b3b90a7e2	replace emojis	2024-05-19 19:12:17 +03:00
Pete Matsyburka	9047e3bed3	add dry run prop	2024-05-18 22:54:26 +03:00
Pete Matsyburka	72b7391245	add documents copy email to template preferences	2024-05-18 22:03:20 +03:00
Pete Matsyburka	2df05f0327	adjust initials height	2024-05-18 17:51:22 +03:00
Pete Matsyburka	95f3eb0e5d	display filters	2024-05-18 13:58:21 +03:00
Pete Matsyburka	ce8d964ce6	fix ensure result generated	2024-05-17 16:07:08 +03:00
Pete Matsyburka	f0d5fc4e2d	add submission created webhook event	2024-05-17 13:28:10 +03:00
Pete Matsyburka	b4b17d847e	add view archived to template page	2024-05-17 12:08:46 +03:00
Alex Turchyn	fd537e7ac0	upgrade rack 3	2024-05-16 23:26:30 +03:00
Pete Matsyburka	8c271104e1	single digital signature by default	2024-05-16 23:18:48 +03:00
Pete Matsyburka	51edd60d96	update gem	2024-05-16 15:16:59 +03:00
Pete Matsyburka	a265ca1716	remove pdf processor	2024-05-16 13:37:23 +03:00
Pete Matsyburka	a773f63a65	remove pdf reader	2024-05-16 11:56:41 +03:00
Pete Matsyburka	576c8a2e24	fix ensure result generated	2024-05-15 23:49:36 +03:00
Pete Matsyburka	5829de9ee4	adjust required fields alert	2024-05-15 11:42:51 +03:00
Pete Matsyburka	b202941b79	fix tsa settings	2024-05-15 00:21:52 +03:00
Pete Matsyburka	6f6fb74988	adjust plans settings nav	2024-05-14 23:32:11 +03:00
Pete Matsyburka	0137bdbe4c	optimize tsa settings controller	2024-05-12 19:32:09 +03:00