Merge from docusealco/wip

use ubuntu latest build
fix document controller
2026-08-07 15:25:16 +00:00 · 2025-02-17 22:55:09 +02:00 · 2025-02-17 22:49:14 +02:00 · 2025-02-17 18:45:52 +02:00 · 2025-02-17 12:46:44 +02:00 · 2025-02-17 12:36:04 +02:00
422 changed files with 18667 additions and 3774 deletions
@@ -7,13 +7,13 @@ jobs:
    name: Rubocop
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
      - name: Install Ruby
        uses: ruby/setup-ruby@v1
        with:
-          ruby-version: 3.3.3
+          ruby-version: 3.4.1
      - name: Cache gems
-        uses: actions/cache@v1
+        uses: actions/cache@v4
        with:
          path: vendor/bundle
          key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
@@ -31,13 +31,13 @@ jobs:
    name: Erblint
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
      - name: Install Ruby
        uses: ruby/setup-ruby@v1
        with:
-          ruby-version: 3.3.3
+          ruby-version: 3.4.1
      - name: Cache gems
-        uses: actions/cache@v1
+        uses: actions/cache@v4
        with:
          path: vendor/bundle
          key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
@@ -49,13 +49,13 @@ jobs:
          bundle config path vendor/bundle
          bundle install --jobs 4 --retry 4
      - name: Run Erblint
-        run: bundle exec erblint ./app
+        run: bundle exec erb_lint ./app

  eslint:
    name: ESLint
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
      - name: Install Node.js
        uses: actions/setup-node@v1
        with:
@@ -63,7 +63,7 @@ jobs:
      - name: Cache directory path
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
        id: yarn-cache
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -96,11 +96,11 @@ jobs:
          --health-retries 5

    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
      - name: Install Ruby
        uses: ruby/setup-ruby@v1
        with:
-          ruby-version: 3.3.3
+          ruby-version: 3.4.1
      - name: Set up Node
        uses: actions/setup-node@v1
        with:
@@ -110,12 +110,12 @@ jobs:
        with:
          chrome-version: 125
      - name: Cache node_modules
-        uses: actions/cache@v1
+        uses: actions/cache@v4
        with:
          path: node_modules
          key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
      - name: Cache gems
-        uses: actions/cache@v1
+        uses: actions/cache@v4
        with:
          path: vendor/bundle
          key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
@@ -25,22 +25,22 @@ jobs:
        tags: |
          type=semver,pattern={{version}}
    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
+      uses: docker/setup-qemu-action@v3

    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
+      uses: docker/setup-buildx-action@v3

    - name: Create .version file
      run: echo ${{ github.ref_name }} > .version

    - name: Login to Docker Hub
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
      with:
        username: ${{ secrets.DOCKERHUB_USERNAME }}
        password: ${{ secrets.DOCKERHUB_TOKEN }}

    - name: Build and push Docker image
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v6
      with:
        context: .
        push: true
@@ -34,6 +34,7 @@ Metrics/MethodLength:
  Max: 30
  Exclude:
    - 'db/migrate/**'
+    - 'spec/**/*'

 Metrics/CyclomaticComplexity:
  Max: 15
@@ -46,24 +47,29 @@ Layout/LineLength:

 Metrics/AbcSize:
  Max: 45
+  Exclude:
+    - spec/**/*

 Metrics/ModuleLength:
-  Max: 500
+  Max: 1000

 Metrics/ClassLength:
-  Max: 500
+  Max: 1000

 RSpec/NestedGroups:
  Max: 6

 RSpec/MultipleExpectations:
-  Max: 20
+  Max: 25

 RSpec/ExampleLength:
-  Max: 40
+  Max: 50

 RSpec/MultipleMemoizedHelpers:
-  Max: 6
+  Max: 9
+
+Metrics/BlockNesting:
+  Max: 5

 Rails/I18nLocaleTexts:
  Enabled: false
@@ -1,4 +1,4 @@
-FROM ruby:3.3.3-alpine as fonts
+FROM ruby:3.4.1-alpine as fonts

 WORKDIR /fonts

@@ -6,7 +6,7 @@ RUN apk --no-cache add fontforge wget && wget https://github.com/satbyy/go-noto-

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

-FROM ruby:3.3.3-alpine as webpack
+FROM ruby:3.4.1-alpine as webpack

 ENV RAILS_ENV=production
 ENV NODE_ENV=production
@@ -32,7 +32,7 @@ COPY ./app/views ./app/views

 RUN echo "gem 'shakapacker'" > Gemfile && ./bin/shakapacker

-FROM ruby:3.3.3-alpine as app
+FROM ruby:3.4.1-alpine as app

 ENV RAILS_ENV=production
 ENV BUNDLE_WITHOUT="development:test"
@@ -41,7 +41,7 @@ ENV OPENSSL_CONF=/app/openssl_legacy.cnf

 WORKDIR /app

-RUN apk add --no-cache sqlite-dev libpq-dev mariadb-dev vips-dev vips-poppler poppler-utils redis vips-heif gcompat ttf-freefont && mkdir /fonts && rm /usr/share/fonts/freefont/FreeSans.otf
+RUN echo '@edge https://dl-cdn.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories && apk add --no-cache sqlite-dev libpq-dev mariadb-dev vips-dev vips-poppler poppler-utils redis libheif@edge vips-heif gcompat ttf-freefont && mkdir /fonts && rm /usr/share/fonts/freefont/FreeSans.otf

 RUN echo $'.include = /etc/ssl/openssl.cnf\n\
 \n\
@@ -57,17 +57,18 @@ activate = 1' >> /app/openssl_legacy.cnf

 COPY ./Gemfile ./Gemfile.lock ./

-RUN apk add --no-cache build-base && bundle install && apk del build-base && rm -rf ~/.bundle /usr/local/bundle/cache && ruby -e "puts Dir['/usr/local/bundle/**/{spec,rdoc,resources/shared,resources/collation,resources/locales}']" | xargs rm -rf
+RUN apk add --no-cache build-base && bundle install && apk del --no-cache build-base && rm -rf ~/.bundle /usr/local/bundle/cache && ruby -e "puts Dir['/usr/local/bundle/**/{spec,rdoc,resources/shared,resources/collation,resources/locales}']" | xargs rm -rf

 COPY ./bin ./bin
 COPY ./app ./app
 COPY ./config ./config
-COPY ./db ./db
+COPY ./db/migrate ./db/migrate
 COPY ./log ./log
 COPY ./lib ./lib
 COPY ./public ./public
 COPY ./tmp ./tmp
 COPY LICENSE README.md Rakefile config.ru .version ./
+COPY .version ./public/version

 COPY --from=fonts /fonts/GoNotoKurrent-Regular.ttf /fonts/GoNotoKurrent-Bold.ttf /fonts/DancingScript-Regular.otf /fonts/OFL.txt /fonts
 COPY --from=fonts /fonts/FreeSans.ttf /usr/share/fonts/freefont
@@ -2,7 +2,7 @@

 source 'https://rubygems.org'

-ruby '3.3.3'
+ruby '3.4.1'

 gem 'arabic-letter-connector', require: 'arabic-letter-connector/logic'
 gem 'aws-sdk-s3', require: false
@@ -23,7 +23,6 @@ gem 'image_processing'
 gem 'jwt'
 gem 'lograge'
 gem 'mysql2', require: false
-gem 'net-smtp', '0.4.0'
 gem 'oj'
 gem 'pagy'
 gem 'pg', require: false
@@ -40,7 +39,7 @@ gem 'ruby-vips'
 gem 'rubyXL'
 gem 'shakapacker'
 gem 'sidekiq'
-gem 'sqlite3', require: false, force_ruby_platform: true
+gem 'sqlite3', require: false
 gem 'strip_attributes'
 gem 'turbo-rails'
 gem 'twitter_cldr', require: false
@@ -1,105 +1,102 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    actioncable (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    actioncable (8.0.1)
+      actionpack (= 8.0.1)
+      activesupport (= 8.0.1)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
      zeitwerk (~> 2.6)
-    actionmailbox (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activejob (= 7.1.3.4)
-      activerecord (= 7.1.3.4)
-      activestorage (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      actionview (= 7.1.3.4)
-      activejob (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
+    actionmailbox (8.0.1)
+      actionpack (= 8.0.1)
+      activejob (= 8.0.1)
+      activerecord (= 8.0.1)
+      activestorage (= 8.0.1)
+      activesupport (= 8.0.1)
+      mail (>= 2.8.0)
+    actionmailer (8.0.1)
+      actionpack (= 8.0.1)
+      actionview (= 8.0.1)
+      activejob (= 8.0.1)
+      activesupport (= 8.0.1)
+      mail (>= 2.8.0)
      rails-dom-testing (~> 2.2)
-    actionpack (7.1.3.4)
-      actionview (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    actionpack (8.0.1)
+      actionview (= 8.0.1)
+      activesupport (= 8.0.1)
      nokogiri (>= 1.8.5)
-      racc
      rack (>= 2.2.4)
      rack-session (>= 1.0.1)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.2)
      rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activerecord (= 7.1.3.4)
-      activestorage (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+      useragent (~> 0.16)
+    actiontext (8.0.1)
+      actionpack (= 8.0.1)
+      activerecord (= 8.0.1)
+      activestorage (= 8.0.1)
+      activesupport (= 8.0.1)
      globalid (>= 0.6.0)
      nokogiri (>= 1.8.5)
-    actionview (7.1.3.4)
-      activesupport (= 7.1.3.4)
+    actionview (8.0.1)
+      activesupport (= 8.0.1)
      builder (~> 3.1)
      erubi (~> 1.11)
      rails-dom-testing (~> 2.2)
      rails-html-sanitizer (~> 1.6)
-    activejob (7.1.3.4)
-      activesupport (= 7.1.3.4)
+    activejob (8.0.1)
+      activesupport (= 8.0.1)
      globalid (>= 0.3.6)
-    activemodel (7.1.3.4)
-      activesupport (= 7.1.3.4)
-    activerecord (7.1.3.4)
-      activemodel (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    activemodel (8.0.1)
+      activesupport (= 8.0.1)
+    activerecord (8.0.1)
+      activemodel (= 8.0.1)
+      activesupport (= 8.0.1)
      timeout (>= 0.4.0)
-    activestorage (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activejob (= 7.1.3.4)
-      activerecord (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    activestorage (8.0.1)
+      actionpack (= 8.0.1)
+      activejob (= 8.0.1)
+      activerecord (= 8.0.1)
+      activesupport (= 8.0.1)
      marcel (~> 1.0)
-    activesupport (7.1.3.4)
+    activesupport (8.0.1)
      base64
+      benchmark (>= 0.3)
      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
      connection_pool (>= 2.2.5)
      drb
      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
      minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
-    annotate (3.2.0)
-      activerecord (>= 3.2, < 8.0)
-      rake (>= 10.4, < 14.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    annotate (2.6.5)
+      activerecord (>= 2.3.0)
+      rake (>= 0.8.7)
    arabic-letter-connector (0.1.1)
    ast (2.4.2)
    aws-eventstream (1.3.0)
-    aws-partitions (1.913.0)
-    aws-sdk-core (3.191.6)
+    aws-partitions (1.1027.0)
+    aws-sdk-core (3.214.0)
      aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.8)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.79.0)
-      aws-sdk-core (~> 3, >= 3.191.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.146.1)
-      aws-sdk-core (~> 3, >= 3.191.0)
+    aws-sdk-kms (1.96.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.176.1)
+      aws-sdk-core (~> 3, >= 3.210.0)
      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.8)
-    aws-sdk-secretsmanager (1.91.0)
-      aws-sdk-core (~> 3, >= 3.191.0)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.8.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-secretsmanager (1.110.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.10.1)
      aws-eventstream (~> 1, >= 1.0.2)
    azure-storage-blob (2.0.3)
      azure-storage-common (~> 2.0)
@@ -111,6 +108,7 @@ GEM
      nokogiri (~> 1, >= 1.10.8)
    base64 (0.2.0)
    bcrypt (3.1.20)
+    benchmark (0.4.0)
    better_html (2.1.1)
      actionview (>= 6.0)
      activesupport (>= 6.0)
@@ -120,14 +118,14 @@ GEM
      smart_properties
    bigdecimal (3.1.8)
    bindex (0.8.1)
-    bootsnap (1.18.3)
+    bootsnap (1.18.4)
      msgpack (~> 1.2)
    builder (3.3.0)
-    bullet (7.1.6)
+    bullet (8.0.0)
      activesupport (>= 3.0.0)
      uniform_notifier (~> 1.11)
    camertron-eprun (1.1.1)
-    cancancan (3.5.0)
+    cancancan (3.6.1)
    capybara (3.40.0)
      addressable
      matrix
@@ -137,7 +135,8 @@ GEM
      rack-test (>= 0.6.3)
      regexp_parser (>= 1.5, < 3.0)
      xpath (~> 3.2)
-    childprocess (5.0.0)
+    childprocess (5.1.0)
+      logger (~> 1.5)
    chunky_png (1.4.0)
    cldr-plurals-runtime-rb (1.1.0)
    cmdparse (3.0.7)
@@ -148,14 +147,14 @@ GEM
      bigdecimal
      rexml
    crass (1.0.6)
-    css_parser (1.17.1)
+    css_parser (1.21.0)
      addressable
-    csv (3.3.0)
-    cuprite (0.15)
+    csv (3.3.2)
+    cuprite (0.15.1)
      capybara (~> 3.0)
-      ferrum (~> 0.14.0)
-    date (3.3.4)
-    debug (1.9.2)
+      ferrum (~> 0.15.0)
+    date (3.4.1)
+    debug (1.10.0)
      irb (~> 1.10)
      reline (>= 0.3.8)
    declarative (0.0.20)
@@ -165,34 +164,34 @@ GEM
      railties (>= 4.1.0)
      responders
      warden (~> 1.2.3)
-    devise-two-factor (5.0.0)
-      activesupport (~> 7.0)
+    devise-two-factor (6.1.0)
+      activesupport (>= 7.0, < 8.1)
      devise (~> 4.0)
-      railties (~> 7.0)
+      railties (>= 7.0, < 8.1)
      rotp (~> 6.0)
    diff-lcs (1.5.1)
    digest-crc (0.6.5)
      rake (>= 12.0.0, < 14.0.0)
-    docile (1.4.0)
-    dotenv (3.1.0)
+    docile (1.4.1)
+    dotenv (3.1.7)
    drb (2.2.1)
    email_typo (0.2.3)
-    erb_lint (0.5.0)
+    erb_lint (0.7.0)
      activesupport
      better_html (>= 2.0.1)
      parser (>= 2.7.1.4)
      rainbow
-      rubocop
+      rubocop (>= 1)
      smart_properties
-    erubi (1.13.0)
-    factory_bot (6.4.6)
+    erubi (1.13.1)
+    factory_bot (6.5.0)
      activesupport (>= 5.0.0)
-    factory_bot_rails (6.4.3)
-      factory_bot (~> 6.4)
+    factory_bot_rails (6.4.4)
+      factory_bot (~> 6.5)
      railties (>= 5.0.0)
-    faker (3.3.1)
+    faker (3.5.1)
      i18n (>= 1.8.11, < 2)
-    faraday (1.10.3)
+    faraday (1.10.4)
      faraday-em_http (~> 1.0)
      faraday-em_synchrony (~> 1.0)
      faraday-excon (~> 1.1)
@@ -210,95 +209,103 @@ GEM
    faraday-follow_redirects (0.3.0)
      faraday (>= 1, < 3)
    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (1.0.1)
+    faraday-multipart (1.1.0)
+      multipart-post (~> 2.0)
+    faraday-net_http (1.0.2)
    faraday-net_http_persistent (1.2.0)
    faraday-patron (1.0.0)
    faraday-rack (1.0.0)
    faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
+    faraday_middleware (1.2.1)
      faraday (~> 1.0)
-    ferrum (0.14)
+    ferrum (0.15)
      addressable (~> 2.5)
      concurrent-ruby (~> 1.1)
      webrick (~> 1.7)
-      websocket-driver (>= 0.6, < 0.8)
-    ffi (1.16.3)
+      websocket-driver (~> 0.7)
+    ffi (1.17.1)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-musl)
+    ffi (1.17.1-arm64-darwin)
+    ffi (1.17.1-x86_64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-musl)
    geom2d (0.4.1)
    globalid (1.2.1)
      activesupport (>= 6.1)
-    google-apis-core (0.14.1)
+    google-apis-core (0.15.1)
      addressable (~> 2.5, >= 2.5.1)
      googleauth (~> 1.9)
-      httpclient (>= 2.8.1, < 3.a)
+      httpclient (>= 2.8.3, < 3.a)
      mini_mime (~> 1.0)
+      mutex_m
      representable (~> 3.0)
      retriable (>= 2.0, < 4.a)
-      rexml
-    google-apis-iamcredentials_v1 (0.20.0)
-      google-apis-core (>= 0.14.0, < 2.a)
-    google-apis-storage_v1 (0.37.0)
-      google-apis-core (>= 0.14.0, < 2.a)
-    google-cloud-core (1.7.0)
+    google-apis-iamcredentials_v1 (0.22.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-storage_v1 (0.49.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-cloud-core (1.7.1)
      google-cloud-env (>= 1.0, < 3.a)
      google-cloud-errors (~> 1.0)
-    google-cloud-env (2.1.1)
+    google-cloud-env (2.2.1)
      faraday (>= 1.0, < 3.a)
    google-cloud-errors (1.4.0)
-    google-cloud-storage (1.49.0)
+    google-cloud-storage (1.54.0)
      addressable (~> 2.8)
      digest-crc (~> 0.4)
      google-apis-core (~> 0.13)
      google-apis-iamcredentials_v1 (~> 0.18)
-      google-apis-storage_v1 (~> 0.33)
+      google-apis-storage_v1 (~> 0.38)
      google-cloud-core (~> 1.6)
      googleauth (~> 1.9)
      mini_mime (~> 1.0)
-    googleauth (1.11.0)
+    google-logging-utils (0.1.0)
+    googleauth (1.12.2)
      faraday (>= 1.0, < 3.a)
-      google-cloud-env (~> 2.1)
+      google-cloud-env (~> 2.2)
+      google-logging-utils (~> 0.1)
      jwt (>= 1.4, < 3.0)
      multi_json (~> 1.11)
      os (>= 0.9, < 2.0)
      signet (>= 0.16, < 2.a)
-    hashdiff (1.1.0)
-    hexapdf (0.42.0)
+    hashdiff (1.1.2)
+    hexapdf (1.0.3)
      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.5)
+    i18n (1.14.6)
      concurrent-ruby (~> 1.0)
-    image_processing (1.12.2)
+    image_processing (1.13.0)
      mini_magick (>= 4.9.5, < 5)
      ruby-vips (>= 2.0.17, < 3)
-    io-console (0.7.2)
-    irb (1.13.1)
+    io-console (0.8.0)
+    irb (1.14.3)
      rdoc (>= 4.0.0)
      reline (>= 0.4.2)
    jmespath (1.6.2)
-    json (2.7.2)
-    jwt (2.8.1)
+    json (2.9.1)
+    jwt (2.9.3)
      base64
    language_server-protocol (3.17.0.3)
-    launchy (3.0.0)
+    launchy (3.0.1)
      addressable (~> 2.8)
      childprocess (~> 5.0)
    letter_opener (1.10.0)
      launchy (>= 2.2, < 4)
-    letter_opener_web (2.0.0)
-      actionmailer (>= 5.2)
-      letter_opener (~> 1.7)
-      railties (>= 5.2)
+    letter_opener_web (3.0.0)
+      actionmailer (>= 6.1)
+      letter_opener (~> 1.9)
+      railties (>= 6.1)
      rexml
+    logger (1.6.4)
    lograge (0.14.0)
      actionpack (>= 4)
      activesupport (>= 4)
      railties (>= 4)
      request_store (~> 1.0)
-    loofah (2.22.0)
+    loofah (2.23.1)
      crass (~> 1.0.2)
      nokogiri (>= 1.12.0)
    mail (2.8.1)
@@ -309,48 +316,57 @@ GEM
    marcel (1.0.4)
    matrix (0.4.2)
    method_source (1.1.0)
-    mini_magick (4.12.0)
+    mini_magick (4.13.2)
    mini_mime (1.1.5)
-    mini_portile2 (2.8.7)
-    minitest (5.24.1)
-    msgpack (1.7.2)
+    mini_portile2 (2.8.8)
+    minitest (5.25.4)
+    msgpack (1.7.5)
    multi_json (1.15.0)
-    multipart-post (2.4.0)
-    mutex_m (0.2.0)
+    multipart-post (2.4.1)
+    mutex_m (0.3.0)
    mysql2 (0.5.6)
-    net-http-persistent (4.0.2)
+    net-http-persistent (4.0.5)
      connection_pool (~> 2.2)
-    net-imap (0.4.14)
+    net-imap (0.5.6)
      date
      net-protocol
    net-pop (0.1.2)
+      net-protocol
    net-protocol (0.2.2)
      timeout
-    net-smtp (0.4.0)
+    net-smtp (0.5.0)
      net-protocol
-    nio4r (2.7.1)
-    nokogiri (1.16.7)
+    nio4r (2.7.4)
+    nokogiri (1.18.2)
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
-    nokogiri (1.16.7-aarch64-linux)
+    nokogiri (1.18.2-aarch64-linux-gnu)
      racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-linux)
+    nokogiri (1.18.2-aarch64-linux-musl)
      racc (~> 1.4)
-    oj (3.16.3)
+    nokogiri (1.18.2-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.2-x86_64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.2-x86_64-linux-musl)
+      racc (~> 1.4)
+    oj (3.16.8)
      bigdecimal (>= 3.0)
-    openssl (3.2.0)
+      ostruct (>= 0.2)
+    openssl (3.3.0)
    orm_adapter (0.5.0)
    os (1.1.4)
+    ostruct (0.6.1)
    package_json (0.1.0)
-    pagy (8.1.2)
-    parallel (1.25.1)
-    parser (3.3.4.0)
+    pagy (9.3.3)
+    parallel (1.26.3)
+    parser (3.3.6.0)
      ast (~> 2.4.1)
      racc
-    pg (1.5.6)
-    premailer (1.23.0)
+    pg (1.5.9)
+    premailer (1.27.0)
      addressable
-      css_parser (>= 1.12.0)
+      css_parser (>= 1.19.0)
      htmlentities (>= 4.0.0)
    premailer-rails (1.12.0)
      actionmailer (>= 3)
@@ -358,149 +374,149 @@ GEM
      premailer (~> 1.7, >= 1.7.9)
    pretender (0.5.0)
      actionpack (>= 6.1)
-    pry (0.14.2)
+    pry (0.15.0)
      coderay (~> 1.1)
      method_source (~> 1.0)
-    pry-rails (0.3.9)
-      pry (>= 0.10.4)
-    psych (5.1.2)
+    pry-rails (0.3.11)
+      pry (>= 0.13.0)
+    psych (5.2.2)
+      date
      stringio
-    public_suffix (5.0.5)
-    puma (6.4.2)
+    public_suffix (6.0.1)
+    puma (6.5.0)
      nio4r (~> 2.0)
    racc (1.8.1)
-    rack (3.1.7)
+    rack (3.1.10)
    rack-proxy (0.7.7)
      rack
    rack-session (2.0.0)
      rack (>= 3.0.0)
    rack-test (2.1.0)
      rack (>= 1.3)
-    rackup (2.1.0)
+    rackup (2.2.1)
      rack (>= 3)
-      webrick (~> 1.8)
-    rails (7.1.3.4)
-      actioncable (= 7.1.3.4)
-      actionmailbox (= 7.1.3.4)
-      actionmailer (= 7.1.3.4)
-      actionpack (= 7.1.3.4)
-      actiontext (= 7.1.3.4)
-      actionview (= 7.1.3.4)
-      activejob (= 7.1.3.4)
-      activemodel (= 7.1.3.4)
-      activerecord (= 7.1.3.4)
-      activestorage (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    rails (8.0.1)
+      actioncable (= 8.0.1)
+      actionmailbox (= 8.0.1)
+      actionmailer (= 8.0.1)
+      actionpack (= 8.0.1)
+      actiontext (= 8.0.1)
+      actionview (= 8.0.1)
+      activejob (= 8.0.1)
+      activemodel (= 8.0.1)
+      activerecord (= 8.0.1)
+      activestorage (= 8.0.1)
+      activesupport (= 8.0.1)
      bundler (>= 1.15.0)
-      railties (= 7.1.3.4)
+      railties (= 8.0.1)
    rails-dom-testing (2.2.0)
      activesupport (>= 5.0.0)
      minitest
      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.2)
      loofah (~> 2.21)
-      nokogiri (~> 1.14)
-    rails-i18n (7.0.9)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    rails-i18n (8.0.1)
      i18n (>= 0.7, < 2)
-      railties (>= 6.0.0, < 8)
+      railties (>= 8.0.0, < 9)
    rails_autolink (1.1.8)
      actionview (> 3.1)
      activesupport (> 3.1)
      railties (> 3.1)
-    railties (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
-      irb
+    railties (8.0.1)
+      actionpack (= 8.0.1)
+      activesupport (= 8.0.1)
+      irb (~> 1.13)
      rackup (>= 1.0.0)
      rake (>= 12.2)
      thor (~> 1.0, >= 1.2.2)
      zeitwerk (~> 2.6)
    rainbow (3.1.1)
    rake (13.2.1)
-    rdoc (6.6.3.1)
+    rdoc (6.10.0)
      psych (>= 4.0.0)
-    redis-client (0.22.2)
+    redis-client (0.23.0)
      connection_pool
-    regexp_parser (2.9.2)
-    reline (0.5.7)
+    regexp_parser (2.9.3)
+    reline (0.6.0)
      io-console (~> 0.5)
    representable (3.2.0)
      declarative (< 0.1.0)
      trailblazer-option (>= 0.1.1, < 0.2.0)
      uber (< 0.2.0)
-    request_store (1.6.0)
+    request_store (1.7.0)
      rack (>= 1.4)
    responders (3.1.1)
      actionpack (>= 5.2)
      railties (>= 5.2)
    retriable (3.1.2)
-    rexml (3.3.6)
-      strscan
+    rexml (3.4.0)
    rotp (6.3.0)
    rqrcode (2.2.0)
      chunky_png (~> 1.0)
      rqrcode_core (~> 1.0)
    rqrcode_core (1.2.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.2)
      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.3)
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.13.2)
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.13.0)
-    rspec-rails (6.1.2)
-      actionpack (>= 6.1)
-      activesupport (>= 6.1)
-      railties (>= 6.1)
+    rspec-rails (7.1.0)
+      actionpack (>= 7.0)
+      activesupport (>= 7.0)
+      railties (>= 7.0)
      rspec-core (~> 3.13)
      rspec-expectations (~> 3.13)
      rspec-mocks (~> 3.13)
      rspec-support (~> 3.13)
-    rspec-support (3.13.1)
-    rubocop (1.65.0)
+    rspec-support (3.13.2)
+    rubocop (1.69.2)
      json (~> 2.3)
      language_server-protocol (>= 3.17.0)
      parallel (~> 1.10)
      parser (>= 3.3.0.2)
      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.36.2, < 2.0)
      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.37.0)
      parser (>= 3.3.1.0)
-    rubocop-performance (1.21.0)
+    rubocop-performance (1.23.0)
      rubocop (>= 1.48.1, < 2.0)
      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.24.1)
+    rubocop-rails (2.27.0)
      activesupport (>= 4.2.0)
      rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
+      rubocop (>= 1.52.0, < 2.0)
      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (3.0.3)
+    rubocop-rspec (3.3.0)
      rubocop (~> 1.61)
    ruby-progressbar (1.13.0)
-    ruby-vips (2.2.1)
+    ruby-vips (2.2.2)
      ffi (~> 1.12)
+      logger
    ruby2_keywords (0.0.5)
-    rubyXL (3.4.27)
+    rubyXL (3.4.33)
      nokogiri (>= 1.10.8)
      rubyzip (>= 1.3.0)
    rubyzip (2.3.2)
-    semantic_range (3.0.0)
-    shakapacker (8.0.0)
+    securerandom (0.4.1)
+    semantic_range (3.1.0)
+    shakapacker (8.0.2)
      activesupport (>= 5.2)
      package_json
      rack-proxy (>= 0.6.1)
      railties (>= 5.2)
      semantic_range (>= 2.3.0)
-    sidekiq (7.2.4)
-      concurrent-ruby (< 2)
+    sidekiq (7.3.7)
      connection_pool (>= 2.3.0)
+      logger
      rack (>= 2.2.4)
-      redis-client (>= 0.19.0)
+      redis-client (>= 0.22.2)
    signet (0.19.0)
      addressable (~> 2.8)
      faraday (>= 0.17.5, < 3.a)
@@ -510,33 +526,40 @@ GEM
      docile (~> 1.1)
      simplecov-html (~> 0.11)
      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.1)
    simplecov_json_formatter (0.1.4)
    smart_properties (1.17.0)
-    sqlite3 (1.7.3)
+    sqlite3 (2.5.0)
      mini_portile2 (~> 2.8.0)
-    stringio (3.1.0)
-    strip_attributes (1.13.0)
-      activemodel (>= 3.0, < 8.0)
-    strscan (3.1.0)
-    thor (1.3.1)
-    timeout (0.4.1)
+    sqlite3 (2.5.0-aarch64-linux-gnu)
+    sqlite3 (2.5.0-aarch64-linux-musl)
+    sqlite3 (2.5.0-arm64-darwin)
+    sqlite3 (2.5.0-x86_64-linux-gnu)
+    sqlite3 (2.5.0-x86_64-linux-musl)
+    stringio (3.1.2)
+    strip_attributes (1.14.1)
+      activemodel (>= 3.0, < 9.0)
+    thor (1.3.2)
+    timeout (0.4.3)
    trailblazer-option (0.1.2)
-    turbo-rails (2.0.5)
+    turbo-rails (2.0.11)
      actionpack (>= 6.0.0)
-      activejob (>= 6.0.0)
      railties (>= 6.0.0)
-    twitter_cldr (6.12.0)
+    twitter_cldr (6.12.1)
      camertron-eprun
      cldr-plurals-runtime-rb (~> 1.1)
      tzinfo
    tzinfo (2.0.6)
      concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2024.1)
+    tzinfo-data (1.2024.2)
      tzinfo (>= 1.0.0)
    uber (0.1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (3.1.2)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
    uniform_notifier (1.16.0)
+    uri (1.0.2)
+    useragent (0.16.11)
    warden (1.2.9)
      rack (>= 2.0.9)
    web-console (4.2.1)
@@ -544,22 +567,25 @@ GEM
      activemodel (>= 6.0.0)
      bindex (>= 0.4.0)
      railties (>= 6.0.0)
-    webmock (3.23.0)
+    webmock (3.24.0)
      addressable (>= 2.8.0)
      crack (>= 0.3.2)
      hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.8.1)
+    webrick (1.9.1)
    websocket-driver (0.7.6)
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.5)
    xpath (3.2.0)
      nokogiri (~> 1.8)
-    zeitwerk (2.6.14)
+    zeitwerk (2.7.1)

 PLATFORMS
  aarch64-linux
+  aarch64-linux-musl
+  arm64-darwin
  ruby
  x86_64-linux
+  x86_64-linux-musl

 DEPENDENCIES
  annotate
@@ -591,7 +617,6 @@ DEPENDENCIES
  letter_opener_web
  lograge
  mysql2
-  net-smtp (= 0.4.0)
  oj
  pagy
  pg
@@ -624,7 +649,7 @@ DEPENDENCIES
  webmock

 RUBY VERSION
-   ruby 3.3.3p89
+   ruby 3.4.1p0

 BUNDLED WITH
   2.5.3
@@ -1,6 +1,6 @@
 <h1 align="center" style="border-bottom: none">
  <div>
-    <a href="https://www.docuseal.co">
+    <a href="https://www.docuseal.com">
      <img  alt="DocuSeal" src="https://github.com/docusealco/docuseal/assets/5418788/c12cd051-81cd-4402-bc3a-92f2cfdc1b06" width="80" />
      <br>
    </a>
@@ -25,12 +25,12 @@
 DocuSeal is an open source platform that provides secure and efficient digital document signing and processing. Create PDF forms to have them filled and signed online on any device with an easy-to-use, mobile-optimized web tool.
 </p>
 <h2 align="center">
-  <a href="https://demo.docuseal.co">✨ Live Demo</a>
+  <a href="https://demo.docuseal.tech">✨ Live Demo</a>
  <span>|</span>
-  <a href="https://docuseal.co/sign_up">☁️ Try in Cloud</a>
+  <a href="https://docuseal.com/sign_up">☁️ Try in Cloud</a>
 </h2>

-[![Demo](https://github.com/docusealco/docuseal/assets/5418788/d8703ea3-361a-423f-8bfe-eff1bd9dbe14)](https://demo.docuseal.co)
+[![Demo](https://github.com/docusealco/docuseal/assets/5418788/d8703ea3-361a-423f-8bfe-eff1bd9dbe14)](https://demo.docuseal.tech)

 ## Features
 - PDF form fields builder (WYSIWYG)
@@ -42,7 +42,7 @@ DocuSeal is an open source platform that provides secure and efficient digital d
 - PDF signature verification
 - Users management
 - Mobile-optimized
- Signing available in 13 languages
+- 6 UI languages with signing available in 13 languages
 - API and Webhooks for integrations
 - Easy to deploy in minutes

@@ -54,11 +54,11 @@ DocuSeal is an open source platform that provides secure and efficient digital d
 - Conditional fields and formulas
 - Bulk send with CSV, XLSX spreadsheet import
 - SSO / SAML
- Template creation with HTML API ([Guide](https://www.docuseal.co/guides/create-pdf-document-fillable-form-with-html-api))
- Template creation with PDF or DOCX and field tags API ([Guide](https://www.docuseal.co/guides/use-embedded-text-field-tags-in-the-pdf-to-create-a-fillable-form))
- Embedded signing form ([React](https://github.com/docusealco/docuseal-react), [Vue](https://github.com/docusealco/docuseal-vue), [Angular](https://github.com/docusealco/docuseal-angular) or [JavaScript](https://www.docuseal.co/docs/embedded))
- Embedded document form builder ([React](https://github.com/docusealco/docuseal-react), [Vue](https://github.com/docusealco/docuseal-vue), [Angular](https://github.com/docusealco/docuseal-angular) or [JavaScript](https://www.docuseal.co/docs/embedded))
- [Learn more](https://www.docuseal.co/pricing)
+- Template creation with HTML API ([Guide](https://www.docuseal.com/guides/create-pdf-document-fillable-form-with-html-api))
+- Template creation with PDF or DOCX and field tags API ([Guide](https://www.docuseal.com/guides/use-embedded-text-field-tags-in-the-pdf-to-create-a-fillable-form))
+- Embedded signing form ([React](https://github.com/docusealco/docuseal-react), [Vue](https://github.com/docusealco/docuseal-vue), [Angular](https://github.com/docusealco/docuseal-angular) or [JavaScript](https://www.docuseal.com/docs/embedded))
+- Embedded document form builder ([React](https://github.com/docusealco/docuseal-react), [Vue](https://github.com/docusealco/docuseal-vue), [Angular](https://github.com/docusealco/docuseal-angular) or [JavaScript](https://www.docuseal.com/docs/embedded))
+- [Learn more](https://www.docuseal.com/pricing)

 ## Deploy

@@ -93,7 +93,7 @@ sudo HOST=your-domain-name.com docker compose up

 At DocuSeal we have expertise and technologies to make documents creation, filling, signing and processing seamlessly integrated with your product. We specialize in working with various industries, including **Banking, Healthcare, Transport, Real Estate, eCommerce, KYC, CRM, and other software products** that require bulk document signing. By leveraging DocuSeal, we can assist in reducing the overall cost of developing and processing electronic documents while ensuring security and compliance with local electronic document laws.

-[Book a Meeting](https://www.docuseal.co/contact)
+[Book a Meeting](https://www.docuseal.com/contact)

 ## License

@@ -102,6 +102,6 @@ Unless otherwise noted, all files © 2023 DocuSeal LLC.

 ## Tools

- [Signature Maker](https://www.docuseal.co/online-signature)
- [Sign Document Online](https://www.docuseal.co/sign-documents-online)
- [Fill PDF Online](https://www.docuseal.co/fill-pdf)
+- [Signature Maker](https://www.docuseal.com/online-signature)
+- [Sign Document Online](https://www.docuseal.com/sign-documents-online)
+- [Fill PDF Online](https://www.docuseal.com/fill-pdf)
@@ -1,6 +1,6 @@
 # Reporting a Vulnerability

-If you come across any security concern or vulnarability, please report the information via email to security@docuseal.co instead of opening a GitHub issue. We will promptly respond and will collaborate with you to validate the issue, and resolve it ASAP.
+If you come across any security concern or vulnarability, please report the information via email to security@docuseal.com instead of opening a GitHub issue. We will promptly respond and will collaborate with you to validate the issue, and resolve it ASAP.

 **We have a bug bounty program to reward security researchers.**

@@ -8,6 +8,7 @@ class AccountConfigsController < ApplicationController
    AccountConfig::ALLOW_TYPED_SIGNATURE,
    AccountConfig::FORCE_MFA,
    AccountConfig::ALLOW_TO_RESUBMIT,
+    AccountConfig::ALLOW_TO_DECLINE_KEY,
    AccountConfig::FORM_PREFILL_SIGNATURE_KEY,
    AccountConfig::ESIGNING_PREFERENCE_KEY,
    AccountConfig::FORM_WITH_CONFETTI_KEY,
@@ -16,7 +17,8 @@ class AccountConfigsController < ApplicationController
    AccountConfig::FLATTEN_RESULT_PDF_KEY,
    AccountConfig::WITH_SIGNATURE_ID,
    AccountConfig::COMBINE_PDF_RESULT_KEY,
-    AccountConfig::REQUIRE_SIGNING_REASON_KEY
+    AccountConfig::REQUIRE_SIGNING_REASON_KEY,
+    AccountConfig::DOCUMENT_FILENAME_FORMAT_KEY
  ].freeze

  InvalidKey = Class.new(StandardError)
@@ -4,11 +4,11 @@ class AccountsController < ApplicationController
  LOCALE_OPTIONS = {
    'en-US' => 'English (United States)',
    'en-GB' => 'English (United Kingdom)',
-    'fr-FR' => 'French (France)',
-    'es-ES' => 'Spanish (Spain)',
-    'pt-PT' => 'Portuguese (Portugal)',
-    'de-DE' => 'German (Germany)',
-    'it-IT' => 'Italian (Italy)'
+    'fr-FR' => 'Français',
+    'es-ES' => 'Español',
+    'pt-PT' => 'Português',
+    'de-DE' => 'Deutsch',
+    'it-IT' => 'Italiano'
  }.freeze

  before_action :load_account
@@ -19,21 +19,25 @@ class AccountsController < ApplicationController
  def update
    current_account.update!(account_params)

-    @encrypted_config = EncryptedConfig.find_or_initialize_by(account: current_account,
-                                                              key: EncryptedConfig::APP_URL_KEY)
-    @encrypted_config.assign_attributes(app_url_params)
+    unless Docuseal.multitenant?
+      @encrypted_config = EncryptedConfig.find_or_initialize_by(account: current_account,
+                                                                key: EncryptedConfig::APP_URL_KEY)
+      @encrypted_config.assign_attributes(app_url_params)

-    unless URI.parse(@encrypted_config.value.to_s).class.in?([URI::HTTP, URI::HTTPS])
-      @encrypted_config.errors.add(:value, 'should be a valid URL')
+      unless URI.parse(@encrypted_config.value.to_s).class.in?([URI::HTTP, URI::HTTPS])
+        @encrypted_config.errors.add(:value, I18n.t('should_be_a_valid_url'))

-      return render :show, status: :unprocessable_entity
+        return render :show, status: :unprocessable_entity
+      end
+
+      @encrypted_config.save!
+
+      Docuseal.refresh_default_url_options!
    end

-    @encrypted_config.save!
-
-    Docuseal.refresh_default_url_options!
-
-    redirect_to settings_account_path, notice: 'Account information has been updated'
+    with_locale do
+      redirect_to settings_account_path, notice: I18n.t('account_information_has_been_updated')
+    end
  rescue ActiveRecord::RecordInvalid
    render :show, status: :unprocessable_entity
  end
@@ -43,11 +47,12 @@ class AccountsController < ApplicationController

    true_user.update!(locked_at: Time.current)

+    # rubocop:disable Layout/LineLength
    render turbo_stream: turbo_stream.replace(
      :account_delete_button,
-      html: helpers.tag.p('Your account removal request will be processed within 2 weeks. ' \
-                          'Please contact us if you want to keep your account.')
+      html: helpers.tag.p(I18n.t('your_account_removal_request_will_be_processed_within_2_months_please_contact_us_if_you_want_to_keep_your_account'))
    )
+    # rubocop:enable Layout/LineLength
  end

  private
@@ -38,12 +38,13 @@ module Api
    private

    def authorization_check!(blob)
-      is_authorized =
-        blob.attachments.all? do |a|
-          a.name.in?(%w[logo preview_images]) ||
-            (current_user && a.record.account.id == current_user.account_id) ||
-            !a.record.account.account_configs.find_or_initialize_by(key: AccountConfig::DOWNLOAD_LINKS_AUTH_KEY).value
-        end
+      attachment = blob.attachments.take
+
+      is_authorized = attachment.name.in?(%w[logo preview_images]) ||
+                      (current_user && attachment.record.account.id == current_user.account_id) ||
+                      (current_user && !Docuseal.multitenant? && current_user.role == 'superadmin') ||
+                      !attachment.record.account.account_configs
+                                 .find_or_initialize_by(key: AccountConfig::DOWNLOAD_LINKS_AUTH_KEY).value

      return if is_authorized

@@ -25,9 +25,9 @@ module Api
      render json: { error: 'Too many requests' }, status: :too_many_requests
    end

-    if Rails.env.production?
+    unless Rails.env.development?
      rescue_from CanCan::AccessDenied do |e|
-        render json: { error: e.message }, status: :forbidden
+        render json: { error: access_denied_error_message(e) }, status: :forbidden
      end

      rescue_from JSON::ParserError do |e|
@@ -39,6 +39,33 @@ module Api

    private

+    def access_denied_error_message(error)
+      return 'Not authorized' if request.headers['X-Auth-Token'].blank?
+      return 'Not authorized' unless error.subject.is_a?(ActiveRecord::Base)
+      return 'Not authorized' unless error.subject.respond_to?(:account_id)
+
+      linked_account_record_exists =
+        if current_user.account.testing?
+          current_user.account.linked_account_accounts.where(account_type: 'testing')
+                      .exists?(account_id: error.subject.account_id)
+        else
+          current_user.account.testing_accounts.exists?(id: error.subject.account_id)
+        end
+
+      return 'Not authorized' unless linked_account_record_exists
+
+      object_name = error.subject.model_name.human
+      id = error.subject.id
+
+      if current_user.account.testing?
+        "#{object_name} #{id} not found using testing API key; Use production API key to " \
+          "access production #{object_name.downcase.pluralize}."
+      else
+        "#{object_name} #{id} not found using production API key; Use testing API key to " \
+          "access testing #{object_name.downcase.pluralize}."
+      end
+    end
+
    def paginate(relation, field: :id)
      result = relation.order(field => :desc)
                       .limit([params.fetch(:limit, DEFAULT_LIMIT).to_i, MAX_LIMIT].min)
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Api
+  class SubmissionDocumentsController < ApiBaseController
+    load_and_authorize_resource :submission
+
+    def index
+      documents =
+        if @submission.submitters.all?(&:completed_at?)
+          last_submitter = @submission.submitters.max_by(&:completed_at)
+
+          if last_submitter.documents_attachments.blank?
+            last_submitter.documents_attachments = Submissions::EnsureResultGenerated.call(last_submitter)
+          end
+
+          last_submitter.documents_attachments
+        else
+          values_hash = Submissions::GeneratePreviewAttachments.build_values_hash(@submission)
+
+          if @submission.preview_documents.present? &&
+             @submission.preview_documents.all? { |s| s.metadata['values_hash'] == values_hash }
+            @submission.preview_documents
+          else
+            ApplicationRecord.no_touching do
+              @submission.preview_documents.each(&:destroy)
+            end
+
+            Submissions::GeneratePreviewAttachments.call(@submission, values_hash:)
+          end
+        end
+
+      ActiveRecord::Associations::Preloader.new(
+        records: documents,
+        associations: [:blob]
+      ).call
+
+      render json: {
+        id: @submission.id,
+        documents: documents.map do |attachment|
+          { name: attachment.filename.base, url: ActiveStorage::Blob.proxy_url(attachment.blob) }
+        end
+      }
+    end
+  end
+end
@@ -17,13 +17,18 @@ module Api
        submissions = submissions.joins(template: :folder).where(folder: { name: params[:template_folder] })
      end

+      submissions = Submissions::Filter.call(submissions, current_user, params)
+
      submissions = paginate(submissions.preload(:created_by_user, :submitters,
                                                 template: :folder,
                                                 combined_document_attachment: :blob,
                                                 audit_trail_attachment: :blob))

      render json: {
-        data: submissions.as_json(Submissions::SerializeForApi::SERIALIZE_PARAMS),
+        data: submissions.map do |s|
+          Submissions::SerializeForApi.call(s, s.submitters, params,
+                                            with_events: false, with_documents: false, with_values: false)
+        end,
        pagination: {
          count: submissions.size,
          next: submissions.last&.id,
@@ -64,32 +69,41 @@ module Api

      submissions = create_submissions(@template, params)

-      submissions.each do |submission|
-        SendSubmissionCreatedWebhookRequestJob.perform_async({ 'submission_id' => submission.id })
+      WebhookUrls.for_account_id(@template.account_id, 'submission.created').each do |webhook_url|
+        submissions.each do |submission|
+          SendSubmissionCreatedWebhookRequestJob.perform_async('submission_id' => submission.id,
+                                                               'webhook_url_id' => webhook_url.id)
+        end
      end

      Submissions.send_signature_requests(submissions)

      submissions.each do |submission|
-        if submission.submitters.all?(&:completed_at?) && submission.submitters.last
-          ProcessSubmitterCompletionJob.perform_async({ 'submitter_id' => submission.submitters.last.id })
+        submission.submitters.each do |submitter|
+          next unless submitter.completed_at?
+
+          ProcessSubmitterCompletionJob.perform_async('submitter_id' => submitter.id, 'send_invitation_email' => false)
        end
      end

      render json: build_create_json(submissions)
-    rescue Submitters::NormalizeValues::BaseError => e
+    rescue Submitters::NormalizeValues::BaseError, Submissions::CreateFromSubmitters::BaseError,
+           DownloadUtils::UnableToDownload => e
      Rollbar.warning(e) if defined?(Rollbar)

      render json: { error: e.message }, status: :unprocessable_entity
    end

    def destroy
-      if params[:permanently] == 'true'
+      if params[:permanently].in?(['true', true])
        @submission.destroy!
      else
        @submission.update!(archived_at: Time.current)

-        SendSubmissionArchivedWebhookRequestJob.perform_async('submission_id' => @submission.id)
+        WebhookUrls.for_account_id(@submission.account_id, 'submission.archived').each do |webhook_url|
+          SendSubmissionArchivedWebhookRequestJob.perform_async('submission_id' => @submission.id,
+                                                                'webhook_url_id' => webhook_url.id)
+        end
      end

      render json: @submission.as_json(only: %i[id archived_at])
@@ -104,7 +118,19 @@ module Api
        end
      end

-      json = { submitters: json } if request.path.ends_with?('/init')
+      if request.path.ends_with?('/init')
+        json =
+          if submissions.size == 1
+            {
+              id: submissions.first.id,
+              submitters: json,
+              expire_at: submissions.first.expire_at,
+              created_at: submissions.first.created_at
+            }
+          else
+            { submitters: json }
+          end
+      end

      json
    end
@@ -155,7 +181,7 @@ module Api
                        :completed, :phone, :application_key, :external_id, :reply_to, :go_to_last,
                        { metadata: {}, values: {}, readonly_fields: [], message: %i[subject body],
                          fields: [:name, :uuid, :default_value, :value, :title, :description,
-                                   :readonly, :redacted, :validation_pattern, :invalid_message,
+                                   :readonly, :validation_pattern, :invalid_message,
                                   { default_value: [], value: [], preferences: {} }] }]]
        }
      ]
@@ -166,7 +192,7 @@ module Api
        key = params.key?(:submission) ? :submission : :submissions

        params.permit(
-          key => [permitted_attrs]
+          { key => [permitted_attrs] }, { key => permitted_attrs }
        ).fetch(key, [])
      end
    end
@@ -13,7 +13,10 @@ module Api

      SubmissionEvents.create_with_tracking_data(submitter, 'view_form', request)

-      SendFormViewedWebhookRequestJob.perform_async({ 'submitter_id' => submitter.id })
+      WebhookUrls.for_account_id(submitter.account_id, 'form.viewed').each do |webhook_url|
+        SendFormViewedWebhookRequestJob.perform_async('submitter_id' => submitter.id,
+                                                      'webhook_url_id' => webhook_url.id)
+      end

      render json: {}
    end
@@ -68,7 +68,7 @@ module Api
      end

      if @submitter.completed_at?
-        ProcessSubmitterCompletionJob.perform_async({ 'submitter_id' => @submitter.id })
+        ProcessSubmitterCompletionJob.perform_async('submitter_id' => @submitter.id)
      elsif normalized_params[:send_email] || normalized_params[:send_sms]
        Submitters.send_signature_requests([@submitter])
      end
@@ -77,7 +77,7 @@ module Api
                                                                with_urls: true,
                                                                with_events: false,
                                                                params:)
-    rescue Submitters::NormalizeValues::BaseError => e
+    rescue Submitters::NormalizeValues::BaseError, DownloadUtils::UnableToDownload => e
      Rollbar.warning(e) if defined?(Rollbar)

      render json: { error: e.message }, status: :unprocessable_entity
@@ -91,7 +91,7 @@ module Api
        :completed, :phone, :application_key, :external_id, :go_to_last,
        { metadata: {}, values: {}, readonly_fields: [], message: %i[subject body],
          fields: [[:name, :uuid, :default_value, :value,
-                    :readonly, :redacted, :validation_pattern, :invalid_message,
+                    :readonly, :validation_pattern, :invalid_message,
                    { default_value: [], value: [], preferences: {} }]] }
      )
    end
@@ -120,6 +120,7 @@ module Api
      end&.dig('uuid')

      submitter.email = Submissions.normalize_email(attrs[:email]) if attrs.key?(:email)
+      submitter.name = attrs[:name] if attrs.key?(:name)

      if attrs.key?(:phone)
        submitter.phone = attrs[:phone].to_s.gsub(/[^0-9+]/, '')
@@ -23,9 +23,14 @@ module Api
      cloned_template.source = :api
      cloned_template.save!

-      schema_documents = Templates::CloneAttachments.call(template: cloned_template, original_template: @template)
+      schema_documents = Templates::CloneAttachments.call(template: cloned_template,
+                                                          original_template: @template,
+                                                          documents: params[:documents])

-      SendTemplateCreatedWebhookRequestJob.perform_async('template_id' => cloned_template.id)
+      WebhookUrls.for_account_id(cloned_template.account_id, 'template.created').each do |webhook_url|
+        SendTemplateCreatedWebhookRequestJob.perform_async('template_id' => cloned_template.id,
+                                                           'webhook_url_id' => webhook_url.id)
+      end

      render json: Templates::SerializeForApi.call(cloned_template, schema_documents)
    end
@@ -18,7 +18,7 @@ module Api

      preview_image_attachments =
        ActiveStorage::Attachment.joins(:blob)
-                                 .where(blob: { filename: '0.jpg' })
+                                 .where(blob: { filename: ['0.png', '0.jpg'] })
                                 .where(record_id: schema_documents.map(&:id),
                                        record_type: 'ActiveStorage::Attachment',
                                        name: :preview_images)
@@ -65,13 +65,16 @@ module Api

      @template.update!(template_params)

-      SendTemplateUpdatedWebhookRequestJob.perform_async('template_id' => @template.id)
+      WebhookUrls.for_account_id(@template.account_id, 'template.updated').each do |webhook_url|
+        SendTemplateUpdatedWebhookRequestJob.perform_async('template_id' => @template.id,
+                                                           'webhook_url_id' => webhook_url.id)
+      end

      render json: @template.as_json(only: %i[id updated_at])
    end

    def destroy
-      if params[:permanently] == 'true'
+      if params[:permanently].in?(['true', true])
        @template.destroy!
      else
        @template.update!(archived_at: Time.current)
@@ -84,7 +87,7 @@ module Api

    def filter_templates(templates, params)
      templates = Templates.search(templates, params[:q])
-      templates = params[:archived] ? templates.archived : templates.active
+      templates = params[:archived].in?(['true', true]) ? templates.archived : templates.active
      templates = templates.where(external_id: params[:application_key]) if params[:application_key].present?
      templates = templates.where(external_id: params[:external_id]) if params[:external_id].present?
      templates = templates.joins(:folder).where(folder: { name: params[:folder] }) if params[:folder].present?
@@ -97,12 +100,12 @@ module Api
        :name,
        :external_id,
        {
-          submitters: [%i[name uuid]],
+          submitters: [%i[name uuid is_requester invite_by_uuid optional_invite_by_uuid linked_to_uuid email]],
          fields: [[:uuid, :submitter_uuid, :name, :type,
                    :required, :readonly, :default_value,
                    :title, :description,
                    { preferences: {},
-                      conditions: [%i[field_uuid value action]],
+                      conditions: [%i[field_uuid value action operation]],
                      options: [%i[value uuid]],
                      validation: %i[message pattern],
                      areas: [%i[x y w h cell_w attachment_uuid option_uuid page]] }]]
@@ -20,10 +20,7 @@ module Api
      pdf = HexaPDF::Document.new(io: StringIO.new(file))

      trusted_certs = Accounts.load_trusted_certs(current_account)
-
-      is_checksum_found = ActiveStorage::Attachment.joins(:blob)
-                                                   .where(name: 'documents', record_type: 'Submitter')
-                                                   .exists?(blob: { checksum: Digest::MD5.base64digest(file) })
+      is_checksum_found = CompletedDocument.exists?(sha256: Base64.urlsafe_encode64(Digest::SHA256.digest(file)))

      render json: {
        checksum_status: is_checksum_found ? 'verified' : 'not_found',
@@ -37,6 +34,8 @@ module Api
          }
        end
      }
+    rescue HexaPDF::MalformedPDFError
+      render json: { error: 'Malformed PDF' }, status: :unprocessable_entity
    end
  end
 end
@@ -12,6 +12,6 @@ class ApiSettingsController < ApplicationController

    current_user.access_token.save!

-    redirect_back(fallback_location: settings_api_index_path, notice: 'API token as been updated.')
+    redirect_back(fallback_location: settings_api_index_path, notice: I18n.t('api_token_has_been_updated'))
  end
 end
@@ -8,12 +8,14 @@ class ApplicationController < ActionController::Base

  check_authorization unless: :devise_controller?

+  around_action :with_locale
  before_action :sign_in_for_demo, if: -> { Docuseal.demo? }
  before_action :maybe_redirect_to_setup, unless: :signed_in?
  before_action :authenticate_user!, unless: :devise_controller?

  helper_method :button_title,
                :current_account,
+                :form_link_host,
                :svg_icon

  impersonates :user, with: ->(uuid) { User.find_by(uuid:) }
@@ -28,7 +30,7 @@ class ApplicationController < ActionController::Base
    redirect_to request.referer, alert: 'Too many requests', status: :too_many_requests
  end

-  if Rails.env.production?
+  if Rails.env.production? || Rails.env.test?
    rescue_from CanCan::AccessDenied do |e|
      Rollbar.warning(e) if defined?(Rollbar)

@@ -37,6 +39,10 @@ class ApplicationController < ActionController::Base
  end

  def default_url_options
+    if request.domain == 'docuseal.com'
+      return { host: 'docuseal.com', protocol: ENV['FORCE_SSL'].present? ? 'https' : 'http' }
+    end
+
    Docuseal.default_url_options
  end

@@ -51,7 +57,18 @@ class ApplicationController < ActionController::Base

  private

+  def with_locale(&)
+    return yield unless current_account
+
+    locale   = params[:lang].presence if Rails.env.development?
+    locale ||= current_account.locale
+
+    I18n.with_locale(locale, &)
+  end
+
  def with_browser_locale(&)
+    return yield if I18n.locale != :'en-US' && I18n.locale != :en
+
    locale   = params[:lang].presence
    locale ||= request.env['HTTP_ACCEPT_LANGUAGE'].to_s[BROWSER_LOCALE_REGEXP].to_s

@@ -79,7 +96,8 @@ class ApplicationController < ActionController::Base
    redirect_to setup_index_path unless User.exists?
  end

-  def button_title(title: 'Submit', disabled_with: 'Submitting', title_class: '', icon: nil, icon_disabled: nil)
+  def button_title(title: I18n.t('submit'), disabled_with: I18n.t('submitting'), title_class: '', icon: nil,
+                   icon_disabled: nil)
    render_to_string(partial: 'shared/button_title',
                     locals: { title:, disabled_with:, title_class:, icon:, icon_disabled: })
  end
@@ -87,4 +105,14 @@ class ApplicationController < ActionController::Base
  def svg_icon(icon_name, class: '')
    render_to_string(partial: "icons/#{icon_name}", locals: { class: })
  end
+
+  def form_link_host
+    Docuseal.default_url_options[:host]
+  end
+
+  def maybe_redirect_com
+    return if request.domain != 'docuseal.co'
+
+    redirect_to request.url.gsub('.co/', '.com/'), allow_other_host: true, status: :moved_permanently
+  end
 end
@@ -6,7 +6,7 @@ class ConsoleRedirectController < ApplicationController

  def index
    if request.path == '/upgrade'
-      params[:redir] = Docuseal.multitenant? ? "#{Docuseal::CONSOLE_URL}/plans" : "#{Docuseal::CONSOLE_URL}/on_premise"
+      params[:redir] = Docuseal.multitenant? ? "#{Docuseal::CONSOLE_URL}/plans" : "#{Docuseal::CONSOLE_URL}/on_premises"
    end

    params[:redir] = "#{Docuseal::CONSOLE_URL}/manage" if request.path == '/manage'
@@ -33,7 +33,7 @@ class DashboardController < ApplicationController
                                                                             account_id: current_user.account_id,
                                                                             key: AccountConfig::FORCE_MFA)

-    redirect_to mfa_setup_path, notice: 'Setup 2FA to continue'
+    redirect_to mfa_setup_path, notice: I18n.t('setup_2fa_to_continue')
  end

  def maybe_render_landing
@@ -9,9 +9,9 @@ class EmailSmtpSettingsController < ApplicationController

  def create
    if @encrypted_config.update(email_configs)
-      SettingsMailer.smtp_successful_setup(@encrypted_config.value['from_email']).deliver_now!
+      SettingsMailer.smtp_successful_setup(@encrypted_config.value['from_email'] || current_user.email).deliver_now!

-      redirect_to settings_email_index_path, notice: 'Changes have been saved'
+      redirect_to settings_email_index_path, notice: I18n.t('changes_have_been_saved')
    else
      render :index, status: :unprocessable_entity
    end
@@ -9,7 +9,7 @@ class EmbedScriptsController < ActionController::Metal
            <h2>Upgrade to Pro</h2>
            <p>Unlock embedded components by upgrading to Pro</p>
            <div style="margin-top: 40px;">
-              <a href="#{Docuseal::CONSOLE_URL}/on_premise" target="_blank" style="padding: 15px 25px; background-color: #222; color: white; text-decoration: none; border-radius: 5px; font-size: 16px; cursor: pointer;">
+              <a href="#{Docuseal::CONSOLE_URL}/on_premises" target="_blank" style="padding: 15px 25px; background-color: #222; color: white; text-decoration: none; border-radius: 5px; font-size: 16px; cursor: pointer;">
                Learn More
              </a>
            </div>
@@ -2,7 +2,7 @@

 class ErrorsController < ActionController::Base
  ENTERPRISE_FEATURE_MESSAGE =
-    'This feature is available in Pro Edition: https://www.docuseal.co/pricing'
+    'This feature is available in Pro Edition: https://www.docuseal.com/pricing'

  ENTERPRISE_PATHS = [
    '/templates/html',
@@ -11,6 +11,8 @@ class EsignSettingsController < ApplicationController
    end
  end

+  prepend_before_action :maybe_redirect_com, only: %i[show]
+
  before_action :load_encrypted_config
  authorize_resource :encrypted_config, parent: false, only: %i[new create]
  authorize_resource :encrypted_config, only: %i[update destroy show]
@@ -21,9 +23,9 @@ class EsignSettingsController < ApplicationController
    default_pkcs = GenerateCertificate.load_pkcs(cert_data) if cert_data['cert'].present?

    custom_pkcs_list = (cert_data['custom'] || []).map do |e|
-      { 'pkcs' => OpenSSL::PKCS12.new(Base64.urlsafe_decode64(e['data']), e['password'].to_s),
-        'name' => e['name'],
-        'status' => e['status'] }
+      pkcs = e['data'].present? ? OpenSSL::PKCS12.new(Base64.urlsafe_decode64(e['data']), e['password'].to_s) : nil
+
+      { 'pkcs' => pkcs, 'name' => e['name'], 'status' => e['status'] }
    end

    @pkcs_list = [
@@ -48,7 +50,7 @@ class EsignSettingsController < ApplicationController
    if (@encrypted_config.value && @encrypted_config.value['custom']&.any? { |e| e['name'] == @cert_record.name }) ||
       @cert_record.name == DEFAULT_CERT_NAME

-      @cert_record.errors.add(:name, 'already exists')
+      @cert_record.errors.add(:name, I18n.t('already_exists'))

      return render turbo_stream: turbo_stream.replace(:modal, template: 'esign_settings/new'),
                    status: :unprocessable_entity
@@ -56,7 +58,7 @@ class EsignSettingsController < ApplicationController

    save_new_cert!(@encrypted_config, @cert_record)

-    redirect_to settings_esign_path, notice: 'Certificate has been successfully added!'
+    redirect_to settings_esign_path, notice: I18n.t('certificate_has_been_successfully_added')
  rescue OpenSSL::PKCS12::PKCS12Error => e
    Rollbar.error(e) if defined?(Rollbar)

@@ -66,14 +68,20 @@ class EsignSettingsController < ApplicationController
  end

  def update
-    @encrypted_config.value['custom'].each { |e| e['status'] = 'validate' }
+    @encrypted_config.value['custom'].to_a.each { |e| e['status'] = 'validate' }

-    custom_cert_data = @encrypted_config.value['custom'].find { |e| e['name'] == params[:name] }
-    custom_cert_data['status'] = 'default' if custom_cert_data
+    custom_cert_data = @encrypted_config.value['custom'].to_a.find { |e| e['name'] == params[:name] }
+
+    if custom_cert_data
+      custom_cert_data['status'] = 'default'
+    elsif params[:name] == Docuseal::AATL_CERT_NAME
+      @encrypted_config.value['custom'] ||= []
+      @encrypted_config.value['custom'] << { 'name' => params[:name], 'status' => 'default' }
+    end

    @encrypted_config.save!

-    redirect_to settings_esign_path, notice: 'Default certificate has been selected'
+    redirect_to settings_esign_path, notice: I18n.t('default_certificate_has_been_selected')
  end

  def destroy
@@ -81,7 +89,7 @@ class EsignSettingsController < ApplicationController

    @encrypted_config.save!

-    redirect_to settings_esign_path, notice: 'Certificate has been removed'
+    redirect_to settings_esign_path, notice: I18n.t('certificate_has_been_removed')
  end

  private
@@ -18,11 +18,11 @@ class MfaSetupController < ApplicationController
      current_user.otp_required_for_login = true
      current_user.save!

-      redirect_to settings_profile_index_path, notice: '2FA has been configured'
+      redirect_to settings_profile_index_path, notice: I18n.t('2fa_has_been_configured')
    else
      @provision_url = current_user.otp_provisioning_uri(current_user.email, issuer: Docuseal.product_name)

-      @error_message = 'Code is invalid'
+      @error_message = I18n.t('code_is_invalid')

      render turbo_stream: turbo_stream.replace(:mfa_form, partial: 'mfa_setup/form'), status: :unprocessable_entity
    end
@@ -32,9 +32,9 @@ class MfaSetupController < ApplicationController
    if current_user.validate_and_consume_otp!(params[:otp_attempt])
      current_user.update!(otp_required_for_login: false, otp_secret: nil)

-      redirect_to settings_profile_index_path, notice: '2FA has been removed'
+      redirect_to settings_profile_index_path, notice: I18n.t('2fa_has_been_removed')
    else
-      @error_message = 'Code is invalid'
+      @error_message = I18n.t('code_is_invalid')

      render turbo_stream: turbo_stream.replace(:modal, template: 'mfa_setup/edit'), status: :unprocessable_entity
    end
@@ -43,7 +43,7 @@ class MfaSetupController < ApplicationController
  private

  def set_provision_url
-    return redirect_to root_path, alert: '2FA has been set up already' if current_user.otp_required_for_login
+    return redirect_to root_path, alert: I18n.t('2fa_has_been_set_up_already') if current_user.otp_required_for_login

    current_user.otp_secret ||= User.generate_otp_secret

@@ -13,9 +13,9 @@ class NotificationsSettingsController < ApplicationController

  def create
    if @account_config.value.present? ? @account_config.save : @account_config.delete
-      redirect_back fallback_location: settings_notifications_path, notice: 'Changes have been saved'
+      redirect_back fallback_location: settings_notifications_path, notice: I18n.t('changes_have_been_saved')
    else
-      redirect_back fallback_location: settings_notifications_path, alert: 'Unable to save'
+      redirect_back fallback_location: settings_notifications_path, alert: I18n.t('unable_to_save')
    end
  end

@@ -6,7 +6,8 @@ class PersonalizationSettingsController < ApplicationController
    AccountConfig::SUBMITTER_INVITATION_EMAIL_KEY,
    AccountConfig::SUBMITTER_DOCUMENTS_COPY_EMAIL_KEY,
    AccountConfig::SUBMITTER_COMPLETED_EMAIL_KEY,
-    AccountConfig::FORM_COMPLETED_MESSAGE_KEY
+    AccountConfig::FORM_COMPLETED_MESSAGE_KEY,
+    *(Docuseal.multitenant? ? [] : [AccountConfig::POLICY_LINKS_KEY])
  ].freeze

  InvalidKey = Class.new(StandardError)
@@ -30,7 +31,7 @@ class PersonalizationSettingsController < ApplicationController
      @account_config.save!
    end

-    redirect_back(fallback_location: settings_personalization_path, notice: 'Settings have been saved.')
+    redirect_back(fallback_location: settings_personalization_path, notice: I18n.t('settings_have_been_saved'))
  end

  private
@@ -12,7 +12,8 @@ class PreviewDocumentPageController < ActionController::API

    return head :not_found unless attachment

-    preview_image = attachment.preview_images.joins(:blob).find_by(blob: { filename: "#{params[:id]}#{FORMAT}" })
+    preview_image = attachment.preview_images.joins(:blob)
+                              .find_by(blob: { filename: ["#{params[:id]}.png", "#{params[:id]}.jpg"] })

    return redirect_to preview_image.url, allow_other_host: true if preview_image

@@ -9,7 +9,7 @@ class ProfileController < ApplicationController

  def update_contact
    if current_user.update(contact_params)
-      redirect_to settings_profile_index_path, notice: 'Contact information has been updated'
+      redirect_to settings_profile_index_path, notice: I18n.t('contact_information_has_been_update')
    else
      render :index, status: :unprocessable_entity
    end
@@ -18,7 +18,7 @@ class ProfileController < ApplicationController
  def update_password
    if current_user.update(password_params)
      bypass_sign_in(current_user)
-      redirect_to settings_profile_index_path, notice: 'Password has been changed'
+      redirect_to settings_profile_index_path, notice: I18n.t('password_has_been_changed')
    else
      render :index, status: :unprocessable_entity
    end
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class PwaController < ActionController::Base
+end
@@ -7,7 +7,7 @@ class SendSubmissionEmailController < ApplicationController
  skip_before_action :verify_authenticity_token
  skip_authorization_check

-  def success; end
+  SEND_DURATION = 30.minutes

  def create
    @submitter =
@@ -23,10 +23,13 @@ class SendSubmissionEmailController < ApplicationController

    RateLimit.call("send-email-#{@submitter.id}", limit: 2, ttl: 5.minutes)

-    SubmitterMailer.documents_copy_email(@submitter, sig: true).deliver_later!
+    unless EmailEvent.exists?(tag: :submitter_documents_copy, email: @submitter.email, emailable: @submitter,
+                              event_type: :send, created_at: SEND_DURATION.ago..Time.current)
+      SubmitterMailer.documents_copy_email(@submitter, sig: true).deliver_later!
+    end

    respond_to do |f|
-      f.html { redirect_to success_send_submission_email_index_path }
+      f.html { render :success }
      f.json { head :ok }
    end
  end
@@ -12,7 +12,7 @@ class SessionsController < Devise::SessionsController
      Rollbar.warning('Sign in new user') if defined?(Rollbar)

      return redirect_to new_registration_path(sign_up: true, user: sign_in_params.slice(:email)),
-                         notice: 'Create a new account'
+                         notice: I18n.t('create_a_new_account')
    end

    if User.exists?(email:, otp_required_for_login: true) && sign_in_params[:otp_attempt].blank?
@@ -21,7 +21,7 @@ class SetupController < ApplicationController
    @encrypted_config = EncryptedConfig.new(encrypted_config_params)

    unless URI.parse(encrypted_config_params[:value].to_s).class.in?([URI::HTTP, URI::HTTPS])
-      @encrypted_config.errors.add(:value, 'should be a valid URL')
+      @encrypted_config.errors.add(:value, I18n.t('should_be_a_valid_url'))

      return render :index, status: :unprocessable_entity
    end
@@ -56,7 +56,7 @@ class SetupController < ApplicationController
  def account_params
    return {} unless params[:account]

-    params.require(:account).permit(:name, :timezone)
+    params.require(:account).permit(:name, :timezone, :locale)
  end

  def encrypted_config_params
@@ -66,10 +66,10 @@ class SetupController < ApplicationController
  end

  def redirect_to_root_if_signed
-    redirect_to root_path, notice: 'You are already signed in'
+    redirect_to root_path, notice: I18n.t('you_are_already_signed_in')
  end

  def ensure_first_user_not_created!
-    redirect_to new_user_session_path, notice: 'Please sign in.' if User.exists?
+    redirect_to new_user_session_path, notice: I18n.t('please_sign_in') if User.exists?
  end
 end
@@ -7,11 +7,13 @@ class StartFormController < ApplicationController
  skip_authorization_check

  around_action :with_browser_locale, only: %i[show completed]
+  before_action :maybe_redirect_com, only: %i[show completed]
  before_action :load_template

  def show
    @submitter = @template.submissions.new(account_id: @template.account_id)
-                          .submitters.new(uuid: @template.submitters.first['uuid'])
+                          .submitters.new(uuid: (filter_undefined_submitters(@template).first ||
+                                                 @template.submitters.first)['uuid'])
  end

  def update
@@ -22,19 +24,26 @@ class StartFormController < ApplicationController
    if @submitter.completed_at?
      redirect_to start_form_completed_path(@template.slug, email: submitter_params[:email])
    else
-      if @template.submitters.to_a.size > 1 && @submitter.new_record?
-        @error_message = 'Not found'
+      if filter_undefined_submitters(@template).size > 1 && @submitter.new_record?
+        @error_message = I18n.t('not_found')

        return render :show
      end

-      assign_submission_attributes(@submitter, @template) if @submitter.new_record?
+      if (is_new_record = @submitter.new_record?)
+        assign_submission_attributes(@submitter, @template)

-      is_new_record = @submitter.new_record?
+        Submissions::AssignDefinedSubmitters.call(@submitter.submission)
+      else
+        @submitter.assign_attributes(ip: request.remote_ip, ua: request.user_agent)
+      end

      if @submitter.save
        if is_new_record
-          SendSubmissionCreatedWebhookRequestJob.perform_async({ 'submission_id' => @submitter.submission.id })
+          WebhookUrls.for_account_id(@submitter.account_id, 'submission.created').each do |webhook_url|
+            SendSubmissionCreatedWebhookRequestJob.perform_async('submission_id' => @submitter.submission_id,
+                                                                 'webhook_url_id' => webhook_url.id)
+          end
        end

        redirect_to submit_form_path(@submitter.slug)
@@ -57,18 +66,18 @@ class StartFormController < ApplicationController
                                        .or(template.submissions.where(expire_at: nil)).where(archived_at: nil))
             .order(id: :desc)
             .where(declined_at: nil)
+             .where(external_id: nil)
+             .where(ip: [nil, request.remote_ip])
             .then { |rel| params[:resubmit].present? ? rel.where(completed_at: nil) : rel }
-             .find_or_initialize_by(**submitter_params.compact_blank)
+             .find_or_initialize_by(email: submitter_params[:email], **submitter_params.compact_blank)
  end

  def assign_submission_attributes(submitter, template)
    resubmit_submitter =
-      if params[:resubmit].present?
-        Submitter.where(submission: @template.submissions).find_by(slug: params[:resubmit])
-      end
+      (Submitter.where(submission: template.submissions).find_by(slug: params[:resubmit]) if params[:resubmit].present?)

    submitter.assign_attributes(
-      uuid: template.submitters.first['uuid'],
+      uuid: (filter_undefined_submitters(template).first || @template.submitters.first)['uuid'],
      ip: request.remote_ip,
      ua: request.user_agent,
      values: resubmit_submitter&.preferences&.fetch('default_values', nil) || {},
@@ -85,6 +94,7 @@ class StartFormController < ApplicationController
    submitter.submission ||= Submission.new(template:,
                                            account_id: template.account_id,
                                            template_submitters: template.submitters,
+                                            submitters: [submitter],
                                            source: :link)

    submitter.account_id = submitter.submission.account_id
@@ -92,6 +102,10 @@ class StartFormController < ApplicationController
    submitter
  end

+  def filter_undefined_submitters(template)
+    Templates.filter_undefined_submitters(template)
+  end
+
  def submitter_params
    params.require(:submitter).permit(:email, :phone, :name).tap do |attrs|
      attrs[:email] = Submissions.normalize_email(attrs[:email])
@@ -11,7 +11,7 @@ class StorageSettingsController < ApplicationController
    if @encrypted_config.update(storage_configs)
      LoadActiveStorageConfigs.reload

-      redirect_to settings_storage_index_path, notice: 'Changes have been saved'
+      redirect_to settings_storage_index_path, notice: I18n.t('changes_have_been_saved')
    else
      render :index, status: :unprocessable_entity
    end
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class SubmissionEventsController < ApplicationController
+  SUBMISSION_EVENT_ICONS = {
+    'view_form' => 'eye',
+    'start_form' => 'player_play',
+    'complete_form' => 'check',
+    'send_email' => 'mail_forward',
+    'click_email' => 'hand_click',
+    'api_complete_form' => 'check',
+    'send_reminder_email' => 'mail_forward',
+    'send_2fa_sms' => '2fa',
+    'send_sms' => 'send',
+    'phone_verified' => 'phone_check',
+    'click_sms' => 'hand_click',
+    'decline_form' => 'x',
+    'start_verification' => 'player_play',
+    'complete_verification' => 'check',
+    'invite_party' => 'user_plus'
+  }.freeze
+
+  load_and_authorize_resource :submission
+
+  def index; end
+end
@@ -8,8 +8,18 @@ class SubmissionsArchivedController < ApplicationController
    @submissions = @submissions.where.not(archived_at: nil)
                               .or(@submissions.where.not(templates: { archived_at: nil }))
                               .preload(:created_by_user, template: :author)
-    @submissions = Submissions.search(@submissions, params[:q], search_template: true)

-    @pagy, @submissions = pagy(@submissions.preload(:submitters).order(id: :desc))
+    @submissions = @submissions.preload(:template_accesses) unless current_user.role.in?(%w[admin superadmin])
+
+    @submissions = Submissions.search(@submissions, params[:q], search_template: true)
+    @submissions = Submissions::Filter.call(@submissions, current_user, params)
+
+    @submissions = if params[:completed_at_from].present? || params[:completed_at_to].present?
+                     @submissions.order(Submitter.arel_table[:completed_at].maximum.desc)
+                   else
+                     @submissions.order(id: :desc)
+                   end
+
+    @pagy, @submissions = pagy(@submissions.preload(submitters: :start_form_submission_events))
  end
 end
@@ -6,9 +6,18 @@ class SubmissionsController < ApplicationController

  load_and_authorize_resource :submission, only: %i[show destroy]

+  prepend_before_action :maybe_redirect_com, only: %i[show]
+
  def show
    @submission = Submissions.preload_with_pages(@submission)

+    unless @submission.submitters.all?(&:completed_at?)
+      ActiveRecord::Associations::Preloader.new(
+        records: [@submission],
+        associations: [submitters: :start_form_submission_events]
+      ).call
+    end
+
    render :show, layout: 'plain'
  end

@@ -43,27 +52,28 @@ class SubmissionsController < ApplicationController
                                           params: params.merge('send_completed_email' => true))
      end

-    submissions.each do |submission|
-      SendSubmissionCreatedWebhookRequestJob.perform_async({ 'submission_id' => submission.id })
-    end
+    enqueue_submission_created_webhooks(@template, submissions)

    Submissions.send_signature_requests(submissions)

-    redirect_to template_path(@template), notice: 'New recipients have been added'
+    redirect_to template_path(@template), notice: I18n.t('new_recipients_have_been_added')
  end

  def destroy
    notice =
-      if params[:permanently].present?
+      if params[:permanently].in?(['true', true])
        @submission.destroy!

-        'Submission has been removed'
+        I18n.t('submission_has_been_removed')
      else
        @submission.update!(archived_at: Time.current)

-        SendSubmissionArchivedWebhookRequestJob.perform_async('submission_id' => @submission.id)
+        WebhookUrls.for_account_id(@submission.account_id, 'submission.archived').each do |webhook_url|
+          SendSubmissionArchivedWebhookRequestJob.perform_async('submission_id' => @submission.id,
+                                                                'webhook_url_id' => webhook_url.id)
+        end

-        'Submission has been archived'
+        I18n.t('submission_has_been_archived')
      end

    redirect_back(fallback_location: template_path(@submission.template), notice:)
@@ -78,6 +88,15 @@ class SubmissionsController < ApplicationController
    template.save!
  end

+  def enqueue_submission_created_webhooks(template, submissions)
+    WebhookUrls.for_account_id(template.account_id, 'submission.created').each do |webhook_url|
+      submissions.each do |submission|
+        SendSubmissionCreatedWebhookRequestJob.perform_async('submission_id' => submission.id,
+                                                             'webhook_url_id' => webhook_url.id)
+      end
+    end
+  end
+
  def submissions_params
    params.permit(submission: { submitters: [%i[uuid email phone name]] })
  end
@@ -10,11 +10,17 @@ class SubmissionsDashboardController < ApplicationController
                               .where(templates: { archived_at: nil })
                               .preload(:created_by_user, template: :author)

+    @submissions = @submissions.preload(:template_accesses) unless current_user.role.in?(%w[admin superadmin])
+
    @submissions = Submissions.search(@submissions, params[:q], search_template: true)
+    @submissions = Submissions::Filter.call(@submissions, current_user, params)

-    @submissions = @submissions.pending if params[:status] == 'pending'
-    @submissions = @submissions.completed if params[:status] == 'completed'
+    @submissions = if params[:completed_at_from].present? || params[:completed_at_to].present?
+                     @submissions.order(Submitter.arel_table[:completed_at].maximum.desc)
+                   else
+                     @submissions.order(id: :desc)
+                   end

-    @pagy, @submissions = pagy(@submissions.preload(:submitters).order(id: :desc))
+    @pagy, @submissions = pagy(@submissions.preload(submitters: :start_form_submission_events))
  end
 end
@@ -53,8 +53,15 @@ class SubmissionsDownloadController < ApplicationController
  end

  def build_urls(submitter)
+    filename_format = AccountConfig.find_or_initialize_by(account_id: submitter.account_id,
+                                                          key: AccountConfig::DOCUMENT_FILENAME_FORMAT_KEY)&.value
+
    Submitters.select_attachments_for_download(submitter).map do |attachment|
-      ActiveStorage::Blob.proxy_url(attachment.blob, expires_at: FILES_TTL.from_now.to_i)
+      ActiveStorage::Blob.proxy_url(
+        attachment.blob,
+        expires_at: FILES_TTL.from_now.to_i,
+        filename: Submitters.build_document_filename(submitter, attachment.blob, filename_format)
+      )
    end
  end

@@ -65,6 +72,13 @@ class SubmissionsDownloadController < ApplicationController
    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)
+    filename_format = AccountConfig.find_or_initialize_by(account_id: submitter.account_id,
+                                                          key: AccountConfig::DOCUMENT_FILENAME_FORMAT_KEY)&.value
+
+    ActiveStorage::Blob.proxy_url(
+      attachment.blob,
+      expires_at: FILES_TTL.from_now.to_i,
+      filename: Submitters.build_document_filename(submitter, attachment.blob, filename_format)
+    )
  end
 end
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class SubmissionsFiltersController < ApplicationController
+  ALLOWED_NAMES = %w[
+    author
+    completed_at
+    status
+    created_at
+  ].freeze
+
+  skip_authorization_check
+
+  def show
+    return head :not_found unless ALLOWED_NAMES.include?(params[:name])
+
+    render params[:name]
+  end
+end
@@ -4,6 +4,8 @@ class SubmissionsPreviewController < ApplicationController
  skip_before_action :authenticate_user!
  skip_authorization_check

+  prepend_before_action :maybe_redirect_com, only: %i[show completed]
+
  TTL = 40.minutes

  def show
@@ -18,8 +20,11 @@ class SubmissionsPreviewController < ApplicationController

    @submission ||= Submission.find_by!(slug: params[:slug])

-    if !@submission.submitters.all?(&:completed_at?) && current_user.blank?
-      raise ActionController::RoutingError, 'Not Found'
+    raise ActionController::RoutingError if @submission.account.archived_at?
+
+    if !@submission.submitters.all?(&:completed_at?) && !signature_valid &&
+       (!current_user || !current_ability.can?(:read, @submission))
+      raise ActionController::RoutingError, I18n.t('not_found')
    end

    if !submission_valid_ttl?(@submission) && !signature_valid
@@ -35,6 +40,7 @@ class SubmissionsPreviewController < ApplicationController

  def completed
    @submission = Submission.find_by!(slug: params[:submissions_preview_slug])
+    @template = @submission.template

    render :completed, layout: 'form'
  end
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class SubmissionsUnarchiveController < ApplicationController
+  load_and_authorize_resource :submission
+
+  def create
+    @submission.update!(archived_at: nil)
+
+    redirect_to submission_path(@submission), notice: I18n.t('submission_has_been_unarchived')
+  end
+end
@@ -12,17 +12,22 @@ class SubmitFormController < ApplicationController
  def show
    @submitter = Submitter.find_by!(slug: params[:slug])

+    submission = @submitter.submission
+
    return redirect_to submit_form_completed_path(@submitter.slug) if @submitter.completed_at?
-    return render :archived if @submitter.submission.template.archived_at? || @submitter.submission.archived_at?
-    return render :expired if @submitter.submission.expired?
+    return render :archived if submission.template.archived_at? ||
+                               submission.archived_at? ||
+                               @submitter.account.archived_at?
+    return render :expired if submission.expired?
    return render :declined if @submitter.declined_at?
+    return render :awaiting if submission.template.preferences['submitters_order'] == 'preserved' &&
+                               !Submitters.current_submitter_order?(@submitter)

    Submitters.preload_with_pages(@submitter)

    Submitters::MaybeUpdateDefaultValues.call(@submitter, current_user)

-    @attachments_index = ActiveStorage::Attachment.where(record: @submitter.submission.submitters, name: :attachments)
-                                                  .preload(:blob).index_by(&:uuid)
+    @attachments_index = build_attachments_index(submission)

    @form_configs = Submitters::FormConfigs.call(@submitter, CONFIG_KEYS)

@@ -46,18 +51,21 @@ class SubmitFormController < ApplicationController
    submitter = Submitter.find_by!(slug: params[:slug])

    if submitter.completed_at?
-      return render json: { error: 'Form has been completed already.' }, status: :unprocessable_entity
+      return render json: { error: I18n.t('form_has_been_completed_already') }, status: :unprocessable_entity
    end

    if submitter.template.archived_at? || submitter.submission.archived_at?
-      return render json: { error: 'Form has been archived.' }, status: :unprocessable_entity
+      return render json: { error: I18n.t('form_has_been_archived') }, status: :unprocessable_entity
    end

    if submitter.submission.expired?
-      return render json: { error: 'Form has been expired.' }, status: :unprocessable_entity
+      return render json: { error: I18n.t('form_has_been_expired') }, status: :unprocessable_entity
    end

-    return render json: { error: 'Form has been declined.' }, status: :unprocessable_entity if submitter.declined_at?
+    if submitter.declined_at?
+      return render json: { error: I18n.t('form_has_been_declined') },
+                    status: :unprocessable_entity
+    end

    Submitters::SubmitValues.call(submitter, params, request)

@@ -71,4 +79,11 @@ class SubmitFormController < ApplicationController
  end

  def success; end
+
+  private
+
+  def build_attachments_index(submission)
+    ActiveStorage::Attachment.where(record: submission.submitters, name: :attachments)
+                             .preload(:blob).index_by(&:uuid)
+  end
 end
@@ -21,8 +21,14 @@ class SubmitFormDeclineController < ApplicationController

    user = submitter.submission.created_by_user || submitter.template.author

-    SubmitterMailer.declined_email(submitter, user).deliver_later!
-    SendFormDeclinedWebhookRequestJob.perform_async('submitter_id' => submitter.id)
+    if user.user_configs.find_by(key: UserConfig::RECEIVE_DECLINED_EMAIL)&.value != false
+      SubmitterMailer.declined_email(submitter, user).deliver_later!
+    end
+
+    WebhookUrls.for_account_id(submitter.account_id, 'form.declined').each do |webhook_url|
+      SendFormDeclinedWebhookRequestJob.perform_async('submitter_id' => submitter.id,
+                                                      'webhook_url_id' => webhook_url.id)
+    end

    redirect_to submit_form_path(submitter.slug)
  end
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+class SubmitFormInviteController < ApplicationController
+  skip_before_action :authenticate_user!
+  skip_authorization_check
+
+  def create
+    submitter = Submitter.find_by!(slug: params[:submit_form_slug])
+
+    return head :unprocessable_entity unless can_invite?(submitter)
+
+    invite_submitters = filter_invite_submitters(submitter, 'invite_by_uuid')
+    optional_invite_submitters = filter_invite_submitters(submitter, 'optional_invite_by_uuid')
+
+    ApplicationRecord.transaction do
+      (invite_submitters + optional_invite_submitters).each do |item|
+        attrs = submitters_attributes.find { |e| e[:uuid] == item['uuid'] }
+
+        next unless attrs
+        next if attrs[:email].blank?
+
+        submitter.submission.submitters.create!(**attrs, account_id: submitter.account_id)
+
+        SubmissionEvents.create_with_tracking_data(submitter, 'invite_party', request, { uuid: submitter.uuid })
+      end
+
+      submitter.submission.update!(submitters_order: :preserved)
+    end
+
+    submitter.submission.submitters.reload
+
+    if invite_submitters.all? { |s| submitter.submission.submitters.any? { |e| e.uuid == s['uuid'] } }
+      Submitters::SubmitValues.call(submitter, ActionController::Parameters.new(completed: 'true'), request)
+
+      head :ok
+    else
+      head :unprocessable_entity
+    end
+  end
+
+  private
+
+  def can_invite?(submitter)
+    !submitter.declined_at? &&
+      !submitter.completed_at? &&
+      !submitter.submission.archived_at? &&
+      !submitter.submission.expired? &&
+      !submitter.submission.template.archived_at?
+  end
+
+  def filter_invite_submitters(submitter, key = 'invite_by_uuid')
+    (submitter.submission.template_submitters || submitter.submission.template.submitters).select do |s|
+      s[key] == submitter.uuid && submitter.submission.submitters.none? { |e| e.uuid == s['uuid'] }
+    end
+  end
+
+  def submitters_attributes
+    params.require(:submission).permit(submitters: [%i[uuid email]]).fetch(:submitters, [])
+  end
+end
@@ -7,8 +7,10 @@ class SubmitFormValuesController < ApplicationController
  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?
+    return render json: {} if submitter.completed_at? || submitter.declined_at?
+    return render json: {} if submitter.submission.template.archived_at? ||
+                              submitter.submission.archived_at? ||
+                              submitter.submission.expired?

    value = submitter.values[params['field_uuid']]
    attachment = submitter.attachments.where(created_at: params[:after]..).find_by(uuid: value) if value.present?
@@ -9,7 +9,8 @@ class SubmittersAutocompleteController < ApplicationController
  def index
    submitters = search_submitters(@submitters)

-    values = submitters.limit(LIMIT).group(SELECT_COLUMNS.join(', ')).pluck(SELECT_COLUMNS.join(', '))
+    arel_columns = SELECT_COLUMNS.map { |col| Submitter.arel_table[col] }
+    values = submitters.limit(LIMIT).group(arel_columns).pluck(arel_columns)

    attrs = values.map { |row| SELECT_COLUMNS.zip(row).to_h }
    attrs = attrs.uniq { |e| e[params[:field]] } if params[:field].present?
@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+class SubmittersController < ApplicationController
+  load_and_authorize_resource :submitter, only: %i[edit update]
+
+  def edit
+    @submitter_email_message =
+      if @submitter.preferences['email_message_uuid'].present?
+        @submitter.account.email_messages.find_by(uuid: @submitter.preferences['email_message_uuid'])
+      end
+  end
+
+  def update
+    submission = @submitter.submission
+
+    if @submitter.submission_events.exists?(event_type: 'start_form') || submission.archived_at? || submission.expired?
+      return redirect_back fallback_location: submission_path(submission), alert: I18n.t('submitter_cannot_be_updated')
+    end
+
+    if submitter_params.values.all?(&:blank?)
+      return redirect_back fallback_location: submission_path(submission),
+                           alert: I18n.t('at_least_one_field_must_be_filled')
+    end
+
+    if params[:is_custom_message] != '1'
+      params.delete(:subject)
+      params.delete(:body)
+    end
+
+    submitter_preferences = Submitters.normalize_preferences(@submitter.account, current_user, params)
+
+    if submitter_preferences.key?('email_message_uuid')
+      @submitter.preferences['email_message_uuid'] = submitter_preferences['email_message_uuid']
+    end
+
+    assign_submitter_attrs(@submitter, submitter_params)
+
+    if @submitter.save
+      maybe_resend_email_sms(@submitter, params)
+
+      redirect_back fallback_location: submission_path(submission), notice: I18n.t('changes_have_been_saved')
+    else
+      redirect_back fallback_location: submission_path(submission), alert: I18n.t('unable_to_save')
+    end
+  end
+
+  private
+
+  def maybe_resend_email_sms(submitter, params)
+    if params[:send_email] == '1' && submitter.email.present?
+      is_sent_recently = Docuseal.multitenant? &&
+                         EmailEvent.exists?(email: submitter.email,
+                                            tag: 'submitter_invitation',
+                                            emailable: submitter,
+                                            event_type: 'send',
+                                            created_at: 4.hours.ago..Time.current)
+
+      SendSubmitterInvitationEmailJob.perform_async('submitter_id' => submitter.id) unless is_sent_recently
+    end
+
+    return if submitter.phone.blank?
+    return unless params[:send_sms] == '1'
+
+    SendSubmitterInvitationSmsJob.perform_async('submitter_id' => submitter.id)
+  end
+
+  def assign_submitter_attrs(submitter, attrs)
+    submitter.phone = attrs[:phone].to_s.gsub(/[^0-9+]/, '') if attrs.key?(:phone)
+
+    submitter.email = Submissions.normalize_email(attrs[:email]) if attrs.key?(:email)
+
+    submitter.name = attrs[:name] if attrs.key?(:name)
+
+    submitter
+  end
+
+  def submitter_params
+    params.require(:submitter).permit(:email, :name, :phone).transform_values(&:strip)
+  end
+end
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+class SubmittersResubmitController < ApplicationController
+  load_and_authorize_resource :submitter, parent: false
+
+  def update
+    return redirect_to submit_form_path(slug: @submitter.slug) if @submitter.email != current_user.email
+
+    submission = @submitter.template.submissions.new(created_by_user: current_user,
+                                                     submitters_order: :preserved,
+                                                     **@submitter.submission.slice(:template_fields,
+                                                                                   :account_id,
+                                                                                   :template_schema,
+                                                                                   :template_submitters,
+                                                                                   :preferences))
+
+    @submitter.submission.submitters.each do |submitter|
+      new_submitter = submission.submitters.new(submitter.slice(:uuid, :email, :phone, :name,
+                                                                :preferences, :metadata, :account_id))
+
+      next unless submitter.uuid == @submitter.uuid
+
+      assign_submitter_values(new_submitter, submitter)
+
+      @new_submitter ||= new_submitter
+    end
+
+    submission.save!
+
+    redirect_to submit_form_path(slug: @new_submitter.slug)
+  end
+
+  private
+
+  def assign_submitter_values(new_submitter, submitter)
+    attachments_index = submitter.attachments.index_by(&:uuid)
+
+    submitter.submission.template_fields.each do |field|
+      next if field['submitter_uuid'] != submitter.uuid
+      next if field['default_value'] == '{{date}}'
+      next if field['type'] == 'stamp'
+      next if field['type'] == 'signature'
+      next if field.dig('preferences', 'formula').present?
+
+      value = submitter.values[field['uuid']]
+
+      next if value.blank?
+
+      if field['type'].in?(%w[image file initials])
+        Array.wrap(value).each do |attachment_uuid|
+          new_submitter.attachments << attachments_index[attachment_uuid].dup
+        end
+      end
+
+      new_submitter.values[field['uuid']] = value
+    end
+  end
+end
@@ -6,11 +6,11 @@ class SubmittersSendEmailController < ApplicationController
  def create
    if Docuseal.multitenant? && SubmissionEvent.exists?(submitter: @submitter,
                                                        event_type: 'send_email',
-                                                        created_at: 24.hours.ago..Time.current)
+                                                        created_at: 10.hours.ago..Time.current)
      Rollbar.warning("Already sent: #{@submitter.id}") if defined?(Rollbar)

      return redirect_back(fallback_location: submission_path(@submitter.submission),
-                           alert: 'Email has been sent already.')
+                           alert: I18n.t('email_has_been_sent_already'))
    end

    SendSubmitterInvitationEmailJob.perform_async('submitter_id' => @submitter.id)
@@ -18,6 +18,6 @@ class SubmittersSendEmailController < ApplicationController
    @submitter.sent_at ||= Time.current
    @submitter.save!

-    redirect_back(fallback_location: submission_path(@submitter.submission), notice: 'Email has been sent')
+    redirect_back(fallback_location: submission_path(@submitter.submission), notice: I18n.t('email_has_been_sent'))
  end
 end
@@ -5,7 +5,7 @@ class TemplateDocumentsController < ApplicationController

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

    old_fields_hash = @template.fields.hash
@@ -28,6 +28,6 @@ class TemplateDocumentsController < ApplicationController
      )
    }
  rescue Templates::CreateAttachments::PdfEncrypted
-    render json: { error: 'PDF encrypted' }, status: :unprocessable_entity
+    render json: { error: 'PDF encrypted', status: 'pdf_encrypted' }, status: :unprocessable_entity
  end
 end
@@ -4,10 +4,11 @@ class TemplateFoldersController < ApplicationController
  load_and_authorize_resource :template_folder

  def show
-    @templates = @template_folder.templates.active.preload(:author).order(id: :desc)
+    @templates = @template_folder.templates.active.accessible_by(current_ability)
+                                 .preload(:author, :template_accesses).order(id: :desc)
    @templates = Templates.search(@templates, params[:q])

-    @pagy, @templates = pagy(@templates, items: 12)
+    @pagy, @templates = pagy(@templates, limit: 12)
  end

  def edit; end
@@ -15,9 +16,9 @@ class TemplateFoldersController < ApplicationController
  def update
    if @template_folder != current_account.default_template_folder &&
       @template_folder.update(template_folder_params)
-      redirect_to folder_path(@template_folder), notice: 'Folder name has been updated'
+      redirect_to folder_path(@template_folder), notice: I18n.t('folder_name_has_been_updated')
    else
-      redirect_to folder_path(@template_folder), alert: 'Unable to rename folder'
+      redirect_to folder_path(@template_folder), alert: I18n.t('unable_to_rename_folder')
    end
  end

@@ -4,9 +4,9 @@ class TemplatesArchivedController < ApplicationController
  load_and_authorize_resource :template, parent: false

  def index
-    @templates = @templates.where.not(archived_at: nil).preload(:author, :folder).order(id: :desc)
+    @templates = @templates.where.not(archived_at: nil).preload(:author, :folder, :template_accesses).order(id: :desc)
    @templates = Templates.search(@templates, params[:q])

-    @pagy, @templates = pagy(@templates, items: 12)
+    @pagy, @templates = pagy(@templates, limit: 12)
  end
 end
@@ -7,8 +7,15 @@ class TemplatesArchivedSubmissionsController < ApplicationController
  def index
    @submissions = @submissions.where.not(archived_at: nil)
    @submissions = Submissions.search(@submissions, params[:q], search_values: true)
+    @submissions = Submissions::Filter.call(@submissions, current_user, params)

-    @pagy, @submissions = pagy(@submissions.preload(:submitters).order(id: :desc))
+    @submissions = if params[:completed_at_from].present? || params[:completed_at_to].present?
+                     @submissions.order(Submitter.arel_table[:completed_at].maximum.desc)
+                   else
+                     @submissions.order(id: :desc)
+                   end
+
+    @pagy, @submissions = pagy(@submissions.preload(submitters: :start_form_submission_events))
  rescue ActiveRecord::RecordNotFound
    redirect_to root_path
  end
@@ -9,19 +9,27 @@ class TemplatesController < ApplicationController
    submissions = @template.submissions.accessible_by(current_ability)
    submissions = submissions.active if @template.archived_at.blank?
    submissions = Submissions.search(submissions, params[:q], search_values: true)
+    submissions = Submissions::Filter.call(submissions, current_user, params.except(:status))

    @base_submissions = submissions

-    submissions = submissions.pending if params[:status] == 'pending'
-    submissions = submissions.completed if params[:status] == 'completed'
+    submissions = Submissions::Filter.filter_by_status(submissions, params)

-    @pagy, @submissions = pagy(submissions.preload(:submitters).order(id: :desc))
+    submissions = if params[:completed_at_from].present? || params[:completed_at_to].present?
+                    submissions.order(Submitter.arel_table[:completed_at].maximum.desc)
+                  else
+                    submissions.order(id: :desc)
+                  end
+
+    submissions = submissions.preload(:template_accesses) unless current_user.role.in?(%w[admin superadmin])
+
+    @pagy, @submissions = pagy(submissions.preload(submitters: :start_form_submission_events))
  rescue ActiveRecord::RecordNotFound
    redirect_to root_path
  end

  def new
-    @template.name = "#{@base_template.name} (Clone)" if @base_template
+    @template.name = "#{@base_template.name} (#{I18n.t('clone')})" if @base_template
  end

  def edit
@@ -66,7 +74,7 @@ class TemplatesController < ApplicationController
    if @template.save
      Templates::CloneAttachments.call(template: @template, original_template: @base_template) if @base_template

-      SendTemplateUpdatedWebhookRequestJob.perform_async('template_id' => @template.id)
+      enqueue_template_created_webhooks(@template)

      maybe_redirect_to_template(@template)
    else
@@ -77,21 +85,21 @@ class TemplatesController < ApplicationController
  def update
    @template.update!(template_params)

-    SendTemplateUpdatedWebhookRequestJob.perform_async('template_id' => @template.id)
+    enqueue_template_updated_webhooks(@template)

    head :ok
  end

  def destroy
    notice =
-      if params[:permanently].present?
+      if params[:permanently].in?(['true', true])
        @template.destroy!

-        'Template has been removed.'
+        I18n.t('template_has_been_removed')
      else
        @template.update!(archived_at: Time.current)

-        'Template has been archived.'
+        I18n.t('template_has_been_archived')
      end

    redirect_back(fallback_location: root_path, notice:)
@@ -102,13 +110,13 @@ class TemplatesController < ApplicationController
  def template_params
    params.require(:template).permit(
      :name,
-      { schema: [%i[attachment_uuid name]],
-        submitters: [%i[name uuid]],
+      { schema: [[:attachment_uuid, :name, { conditions: [%i[field_uuid value action operation]] }]],
+        submitters: [%i[name uuid is_requester linked_to_uuid invite_by_uuid optional_invite_by_uuid email]],
        fields: [[:uuid, :submitter_uuid, :name, :type,
                  :required, :readonly, :default_value,
                  :title, :description,
                  { preferences: {},
-                    conditions: [%i[field_uuid value action]],
+                    conditions: [%i[field_uuid value action operation]],
                    options: [%i[value uuid]],
                    validation: %i[message pattern],
                    areas: [%i[x y w h cell_w attachment_uuid option_uuid page]] }]] }
@@ -116,14 +124,29 @@ class TemplatesController < ApplicationController
  end

  def authorized_clone_account_id?(account_id)
-    true_user.account_id.to_s == account_id.to_s || true_user.account.linked_accounts.exists?(id: account_id)
+    true_user.account_id.to_s == account_id.to_s ||
+      true_user.account.linked_accounts.accessible_by(current_ability).exists?(id: account_id)
  end

  def maybe_redirect_to_template(template)
    if template.account == current_account
      redirect_to(edit_template_path(@template))
    else
-      redirect_back(fallback_location: root_path, notice: 'Template has been clonned')
+      redirect_back(fallback_location: root_path, notice: I18n.t('template_has_been_cloned'))
+    end
+  end
+
+  def enqueue_template_created_webhooks(template)
+    WebhookUrls.for_account_id(template.account_id, 'template.created').each do |webhook_url|
+      SendTemplateCreatedWebhookRequestJob.perform_async('template_id' => template.id,
+                                                         'webhook_url_id' => webhook_url.id)
+    end
+  end
+
+  def enqueue_template_updated_webhooks(template)
+    WebhookUrls.for_account_id(template.account_id, 'template.updated').each do |webhook_url|
+      SendTemplateUpdatedWebhookRequestJob.perform_async('template_id' => template.id,
+                                                         'webhook_url_id' => webhook_url.id)
    end
  end

@@ -9,7 +9,9 @@ class TemplatesDashboardController < ApplicationController
  FOLDERS_PER_PAGE = 18

  def index
-    @template_folders = filter_template_folders(@template_folders)
+    @template_folders = @template_folders.where(id: @templates.active.select(:folder_id)).order(id: :desc)
+
+    @template_folders = TemplateFolders.search(@template_folders, params[:q])

    @pagy, @template_folders = pagy(
      @template_folders,
@@ -23,29 +25,21 @@ class TemplatesDashboardController < ApplicationController
      @template_folders = @template_folders.reject { |e| e.name == TemplateFolder::DEFAULT_NAME }
      @templates = filter_templates(@templates)

-      items =
+      limit =
        if @template_folders.size < 4
          TEMPLATES_PER_PAGE
        else
          (@template_folders.size < 7 ? 9 : 6)
        end

-      @pagy, @templates = pagy(@templates, items:)
+      @pagy, @templates = pagy(@templates, limit:)
    end
  end

  private

-  def filter_template_folders(template_folders)
-    rel = template_folders.joins(:active_templates)
-                          .order(id: :desc)
-                          .distinct
-
-    TemplateFolders.search(rel, params[:q])
-  end
-
  def filter_templates(templates)
-    rel = templates.active.preload(:author).order(id: :desc)
+    rel = templates.active.preload(:author, :template_accesses).order(id: :desc)

    if params[:q].blank?
      if Docuseal.multitenant? && !current_account.testing?
@@ -9,9 +9,9 @@ class TemplatesFoldersController < ApplicationController
    @template.folder = TemplateFolders.find_or_create_by_name(current_user, params[:name])

    if @template.save
-      redirect_back(fallback_location: template_path(@template), notice: 'Document template has been moved')
+      redirect_back(fallback_location: template_path(@template), notice: I18n.t('document_template_has_been_moved'))
    else
-      redirect_back(fallback_location: template_path(@template), notice: 'Unable to move template into folder')
+      redirect_back(fallback_location: template_path(@template), notice: I18n.t('unable_to_move_template_into_folder'))
    end
  end

@@ -9,7 +9,7 @@ class TemplatesPreferencesController < ApplicationController
    authorize!(:update, @template)

    @template.preferences = @template.preferences.merge(template_params[:preferences])
-    @template.preferences = @template.preferences.reject { |_, v| v.is_a?(String) && v.blank? }
+    @template.preferences = @template.preferences.reject { |_, v| (v.is_a?(String) || v.is_a?(Hash)) && v.blank? }
    @template.save!

    head :ok
@@ -22,13 +22,21 @@ class TemplatesPreferencesController < ApplicationController
      preferences: %i[bcc_completed request_email_subject request_email_body
                      documents_copy_email_subject documents_copy_email_body
                      documents_copy_email_enabled documents_copy_email_attach_audit
+                      documents_copy_email_attach_documents documents_copy_email_reply_to
                      completed_notification_email_attach_documents
+                      completed_redirect_url
+                      submitters_order
                      completed_notification_email_subject completed_notification_email_body
-                      completed_notification_email_enabled completed_notification_email_attach_audit]
+                      completed_notification_email_enabled completed_notification_email_attach_audit] +
+                      [completed_message: %i[title body],
+                       submitters: [%i[uuid request_email_subject request_email_body]]]
    ).tap do |attrs|
+      attrs[:preferences].delete(:submitters) if params[:request_email_per_submitter] != '1'
      attrs[:preferences] = attrs[:preferences].transform_values do |value|
        if %w[true false].include?(value)
          value == 'true'
+        elsif value.respond_to?(:compact_blank)
+          value.compact_blank
        else
          value
        end
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+class TemplatesRecipientsController < ApplicationController
+  load_and_authorize_resource :template
+
+  def create
+    authorize!(:update, @template)
+
+    @template.submitters =
+      submitters_params.map { |s| s.reject { |_, v| v.is_a?(String) && v.blank? } }
+
+    @template.save!
+
+    render json: { submitters: @template.submitters }
+  end
+
+  private
+
+  def submitters_params
+    permit_params = { submitters: [%i[name uuid is_requester optional_invite_by_uuid
+                                      invite_by_uuid linked_to_uuid email option]] }
+
+    params.require(:template).permit(permit_params).fetch(:submitters, {}).values.filter_map do |s|
+      next if s[:uuid].blank?
+
+      if s[:is_requester] == '1' && s[:invite_by_uuid].blank? && s[:optional_invite_by_uuid].blank?
+        s[:is_requester] = true
+      else
+        s.delete(:is_requester)
+      end
+
+      s.delete(:invite_by_uuid) if s[:invite_by_uuid].blank?
+      s.delete(:optional_invite_by_uuid) if s[:optional_invite_by_uuid].blank?
+
+      normalize_option_value(s)
+    end
+  end
+
+  def normalize_option_value(attrs)
+    option = attrs.delete(:option)
+
+    if option.present?
+      case option
+      when 'is_requester'
+        attrs[:is_requester] = true
+      when 'not_set'
+        attrs.delete(:is_requester)
+        attrs.delete(:email)
+        attrs.delete(:linked_to_uuid)
+        attrs.delete(:invite_by_uuid)
+        attrs.delete(:optional_invite_by_uuid)
+      when /\Alinked_to_(.*)\z/
+        attrs[:linked_to_uuid] = ::Regexp.last_match(-1)
+      when /\Aoptional_invite_by_(.*)\z/
+        attrs[:optional_invite_by_uuid] = ::Regexp.last_match(-1)
+      when /\Ainvite_by_(.*)\z/
+        attrs[:invite_by_uuid] = ::Regexp.last_match(-1)
+      end
+    end
+
+    attrs
+  end
+end
@@ -6,6 +6,6 @@ class TemplatesRestoreController < ApplicationController
  def create
    @template.update!(archived_at: nil)

-    redirect_to template_path(@template), notice: 'Template has been unarchived'
+    redirect_to template_path(@template), notice: I18n.t('template_has_been_unarchived')
  end
 end
@@ -23,7 +23,7 @@ class TemplatesUploadsController < ApplicationController

    @template.update!(schema:)

-    SendTemplateCreatedWebhookRequestJob.perform_async('template_id' => @template.id)
+    enqueue_template_created_webhooks(@template)

    redirect_to edit_template_path(@template)
  rescue Templates::CreateAttachments::PdfEncrypted
@@ -33,7 +33,7 @@ class TemplatesUploadsController < ApplicationController

    raise if Rails.env.local?

-    redirect_to root_path, alert: 'Unable to upload file'
+    redirect_to root_path, alert: I18n.t('unable_to_update_file')
  end

  private
@@ -52,23 +52,25 @@ class TemplatesUploadsController < ApplicationController
  def create_file_params_from_url
    tempfile = Tempfile.new
    tempfile.binmode
-    tempfile.write(conn.get(Addressable::URI.parse(params[:url]).display_uri.to_s).body)
+    tempfile.write(DownloadUtils.call(params[:url]).body)
    tempfile.rewind

+    filename = URI.decode_www_form_component(params[:filename]) if params[:filename].present?
+    filename ||= File.basename(URI.decode_www_form_component(params[:url]))
+
    file = ActionDispatch::Http::UploadedFile.new(
      tempfile:,
-      filename: File.basename(
-        URI.decode_www_form_component(params[:filename].presence || params[:url]), '.*'
-      ),
+      filename:,
      type: Marcel::MimeType.for(tempfile)
    )

    { files: [file] }
  end

-  def conn
-    Faraday.new do |faraday|
-      faraday.response :follow_redirects
+  def enqueue_template_created_webhooks(template)
+    WebhookUrls.for_account_id(template.account_id, 'template.created').each do |webhook_url|
+      SendTemplateCreatedWebhookRequestJob.perform_async('template_id' => template.id,
+                                                         'webhook_url_id' => webhook_url.id)
    end
  end
 end
@@ -4,9 +4,8 @@ class TestingApiSettingsController < ApplicationController
  def index
    authorize!(:manage, current_user.access_token)

-    @webhook_config =
-      current_account.encrypted_configs.find_or_initialize_by(key: EncryptedConfig::WEBHOOK_URL_KEY)
+    @webhook_url = current_account.webhook_urls.first_or_initialize

-    authorize!(:manage, @webhook_config)
+    authorize!(:manage, @webhook_url)
  end
 end
@@ -14,12 +14,12 @@ class TimestampServerController < ApplicationController
    test_timeserver_url(@encrypted_config.value) if @encrypted_config.value.present?

    if @encrypted_config.value.present? ? @encrypted_config.save : @encrypted_config.delete
-      redirect_back fallback_location: settings_notifications_path, notice: 'Changes have been saved'
+      redirect_back fallback_location: settings_notifications_path, notice: I18n.t('changes_have_been_saved')
    else
-      redirect_back fallback_location: settings_notifications_path, alert: 'Unable to save'
+      redirect_back fallback_location: settings_notifications_path, alert: I18n.t('unable_to_save')
    end
  rescue SocketError, TimestampError, OpenSSL::Timestamp::TimestampError
-    redirect_back fallback_location: settings_notifications_path, alert: 'Invalid Timeserver'
+    redirect_back fallback_location: settings_notifications_path, alert: t('invalid_timeserver')
  end

  private
@@ -9,7 +9,7 @@ class UserInitialsController < ApplicationController
  def update
    file = params[:file]

-    return redirect_to settings_profile_index_path, notice: 'Unable to save initials' if file.blank?
+    return redirect_to settings_profile_index_path, notice: I18n.t('unable_to_save_initials') if file.blank?

    blob = ActiveStorage::Blob.create_and_upload!(io: file.open,
                                                  filename: file.original_filename,
@@ -22,16 +22,16 @@ class UserInitialsController < ApplicationController
    )

    if @user_config.update(value: attachment.uuid)
-      redirect_to settings_profile_index_path, notice: 'Initials has been saved'
+      redirect_to settings_profile_index_path, notice: I18n.t('initials_has_been_saved')
    else
-      redirect_to settings_profile_index_path, notice: 'Unable to save initials'
+      redirect_to settings_profile_index_path, notice: I18n.t('unable_to_save_initials')
    end
  end

  def destroy
    @user_config.destroy

-    redirect_to settings_profile_index_path, notice: 'Initials has been removed'
+    redirect_to settings_profile_index_path, notice: I18n.t('initials_has_been_removed')
  end

  private
@@ -9,7 +9,7 @@ class UserSignaturesController < ApplicationController
  def update
    file = params[:file]

-    return redirect_to settings_profile_index_path, notice: 'Unable to save signature' if file.blank?
+    return redirect_to settings_profile_index_path, notice: I18n.t('unable_to_save_signature') if file.blank?

    blob = ActiveStorage::Blob.create_and_upload!(io: file.open,
                                                  filename: file.original_filename,
@@ -22,16 +22,16 @@ class UserSignaturesController < ApplicationController
    )

    if @user_config.update(value: attachment.uuid)
-      redirect_to settings_profile_index_path, notice: 'Signature has been saved'
+      redirect_to settings_profile_index_path, notice: I18n.t('signature_has_been_saved')
    else
-      redirect_to settings_profile_index_path, notice: 'Unable to save signature'
+      redirect_to settings_profile_index_path, notice: I18n.t('unable_to_save_signature')
    end
  end

  def destroy
    @user_config.destroy

-    redirect_to settings_profile_index_path, notice: 'Signature has been removed'
+    redirect_to settings_profile_index_path, notice: I18n.t('signature_has_been_removed')
  end

  private
@@ -9,9 +9,11 @@ class UsersController < ApplicationController
  def index
    @users =
      if params[:status] == 'archived'
-        @users.archived
+        @users.archived.where.not(role: 'integration')
+      elsif params[:status] == 'integration'
+        @users.active.where(role: 'integration')
      else
-        @users.active
+        @users.active.where.not(role: 'integration')
      end

    @pagy, @users = pagy(@users.where(account: current_account).order(id: :desc))
@@ -22,27 +24,25 @@ class UsersController < ApplicationController
  def edit; end

  def create
-    existing_user = User.accessible_by(current_ability).find_by(email: @user.email)
+    if User.accessible_by(current_ability).exists?(email: @user.email)
+      @user.errors.add(:email, I18n.t('already_exists'))

-    if existing_user
-      existing_user.archived_at = nil
-      existing_user.assign_attributes(user_params)
-      existing_user.account = current_account
-
-      @user = existing_user
+      return render turbo_stream: turbo_stream.replace(:modal, template: 'users/new'), status: :unprocessable_entity
    end

+    @user.role = User::ADMIN_ROLE unless role_valid?(@user.role)
+
    if @user.save
      UserMailer.invitation_email(@user).deliver_later!

-      redirect_back fallback_location: settings_users_path, notice: 'User has been invited'
+      redirect_back fallback_location: settings_users_path, notice: I18n.t('user_has_been_invited')
    else
      render turbo_stream: turbo_stream.replace(:modal, template: 'users/new'), status: :unprocessable_entity
    end
  end

  def update
-    return redirect_to settings_users_path, notice: 'Unable to update user.' if Docuseal.demo?
+    return redirect_to settings_users_path, notice: I18n.t('unable_to_update_user') if Docuseal.demo?

    attrs = user_params.compact_blank.merge(user_params.slice(:archived_at))
    attrs.delete(:role) if !role_valid?(attrs[:role]) || current_user == @user
@@ -56,7 +56,7 @@ class UsersController < ApplicationController
    end

    if @user.update(attrs)
-      redirect_back fallback_location: settings_users_path, notice: 'User has been updated'
+      redirect_back fallback_location: settings_users_path, notice: I18n.t('user_has_been_updated')
    else
      render turbo_stream: turbo_stream.replace(:modal, template: 'users/edit'), status: :unprocessable_entity
    end
@@ -64,12 +64,12 @@ class UsersController < ApplicationController

  def destroy
    if Docuseal.demo? || @user.id == current_user.id
-      return redirect_to settings_users_path, notice: 'Unable to remove user'
+      return redirect_to settings_users_path, notice: I18n.t('unable_to_remove_user')
    end

    @user.update!(archived_at: Time.current)

-    redirect_back fallback_location: settings_users_path, notice: 'User has been removed'
+    redirect_back fallback_location: settings_users_path, notice: I18n.t('user_has_been_removed')
  end

  private
@@ -79,14 +79,7 @@ class UsersController < ApplicationController
  end

  def build_user
-    @user = current_account.users.find_by(email: user_params[:email])&.tap do |user|
-      user.assign_attributes(user_params)
-      user.archived_at = nil
-    end
-
-    @user ||= current_account.users.new(user_params)
-
-    @user
+    @user = current_account.users.new(user_params)
  end

  def user_params
@@ -14,6 +14,6 @@ class VerifyPdfSignatureController < ApplicationController
    render turbo_stream: turbo_stream.replace('result', partial: 'result',
                                                        locals: { pdfs:, files: params[:files], trusted_certs: })
  rescue HexaPDF::MalformedPDFError
-    render turbo_stream: turbo_stream.replace('result', html: helpers.tag.div('Invalid PDF', id: 'result'))
+    render turbo_stream: turbo_stream.replace('result', html: helpers.tag.div(I18n.t('invalid_pdf'), id: 'result'))
  end
 end
@@ -1,37 +1,22 @@
 # frozen_string_literal: true

 class WebhookPreferencesController < ApplicationController
-  EVENTS = %w[
-    form.viewed
-    form.started
-    form.completed
-    form.declined
-    template.created
-    template.updated
-    submission.created
-    submission.archived
-  ].freeze
+  load_and_authorize_resource :webhook_url, parent: false

-  before_action :load_account_config
-  authorize_resource :account_config, parent: false
+  def update
+    webhook_preferences_params[:events].each do |event, val|
+      @webhook_url.events.delete(event) if val == '0'
+      @webhook_url.events.push(event) if val == '1' && @webhook_url.events.exclude?(event)
+    end

-  def create
-    @account_config.value[account_config_params[:event]] = account_config_params[:value] == '1'
-
-    @account_config.save!
+    @webhook_url.save!

    head :ok
  end

  private

-  def load_account_config
-    @account_config =
-      current_account.account_configs.find_or_initialize_by(key: AccountConfig::WEBHOOK_PREFERENCES_KEY)
-    @account_config.value ||= {}
-  end
-
-  def account_config_params
-    params.permit(:event, :value)
+  def webhook_preferences_params
+    params.require(:webhook_url).permit(events: {})
  end
 end
@@ -1,29 +1,22 @@
 # frozen_string_literal: true

 class WebhookSecretController < ApplicationController
-  before_action :load_encrypted_config
-  authorize_resource :encrypted_config, parent: false
+  load_and_authorize_resource :webhook_url, parent: false

-  def index; end
+  def show; end

-  def create
-    @encrypted_config.assign_attributes(value: {
-      encrypted_config_params[:key] => encrypted_config_params[:value]
+  def update
+    @webhook_url.update!(secret: {
+      webhook_secret_params[:key] => webhook_secret_params[:value]
    }.compact_blank)

-    @encrypted_config.value.present? ? @encrypted_config.save! : @encrypted_config.delete
-
-    redirect_back(fallback_location: settings_webhooks_path, notice: 'Webhook Secret has been saved.')
+    redirect_back(fallback_location: settings_webhook_path(@webhook_url),
+                  notice: I18n.t('webhook_secret_has_been_saved'))
  end

  private

-  def load_encrypted_config
-    @encrypted_config =
-      current_account.encrypted_configs.find_or_initialize_by(key: EncryptedConfig::WEBHOOK_SECRET_KEY)
-  end
-
-  def encrypted_config_params
-    params.require(:encrypted_config).permit(value: %i[key value]).fetch(:value, {})
+  def webhook_secret_params
+    params.require(:webhook_url).permit(secret: %i[key value]).fetch(:secret, {})
  end
 end
@@ -1,36 +1,60 @@
 # frozen_string_literal: true

 class WebhookSettingsController < ApplicationController
-  before_action :load_encrypted_config
-  authorize_resource :encrypted_config, parent: false
+  load_and_authorize_resource :webhook_url, parent: false, only: %i[index show new create update destroy]
+  load_and_authorize_resource :webhook_url, only: %i[resend], id_param: :webhook_id
+
+  def index
+    @webhook_urls = @webhook_urls.order(id: :desc)
+    @webhook_url = @webhook_urls.first_or_initialize
+
+    render @webhook_urls.size > 1 ? 'index' : 'show'
+  end

  def show; end

+  def new; end
+
  def create
-    @encrypted_config.assign_attributes(encrypted_config_params)
+    @webhook_url.save!

-    @encrypted_config.value.present? ? @encrypted_config.save! : @encrypted_config.delete
-
-    redirect_back(fallback_location: settings_webhooks_path, notice: 'Webhook URL has been saved.')
+    redirect_to settings_webhooks_path, notice: I18n.t('webhook_url_has_been_saved')
  end

  def update
+    @webhook_url.update!(update_params)
+
+    redirect_back(fallback_location: settings_webhook_path(@webhook_url),
+                  notice: I18n.t('webhook_url_has_been_updated'))
+  end
+
+  def destroy
+    @webhook_url.destroy!
+
+    redirect_to settings_webhooks_path, notice: I18n.t('webhook_url_has_been_deleted')
+  end
+
+  def resend
    submitter = current_account.submitters.where.not(completed_at: nil).order(:id).last

-    SendFormCompletedWebhookRequestJob.perform_async({ 'submitter_id' => submitter.id,
-                                                       'encrypted_config_id' => @encrypted_config.id })
+    if submitter.blank? || @webhook_url.blank?
+      return redirect_back(fallback_location: settings_webhooks_path,
+                           alert: I18n.t('unable_to_resend_webhook_request'))
+    end

-    redirect_back(fallback_location: settings_webhooks_path, notice: 'Webhook request has been sent.')
+    SendFormCompletedWebhookRequestJob.perform_async('submitter_id' => submitter.id,
+                                                     'webhook_url_id' => @webhook_url.id)
+
+    redirect_back(fallback_location: settings_webhooks_path, notice: I18n.t('webhook_request_has_been_sent'))
  end

  private

-  def load_encrypted_config
-    @encrypted_config =
-      current_account.encrypted_configs.find_or_initialize_by(key: EncryptedConfig::WEBHOOK_URL_KEY)
+  def create_params
+    params.require(:webhook_url).permit(:url, events: []).reverse_merge(events: [])
  end

-  def encrypted_config_params
-    params.require(:encrypted_config).permit(:value)
+  def update_params
+    params.require(:webhook_url).permit(:url)
  end
 end
@@ -26,6 +26,12 @@ import EmailsTextarea from './elements/emails_textarea'
 import ToggleOnSubmit from './elements/toggle_on_submit'
 import PasswordInput from './elements/password_input'
 import SearchInput from './elements/search_input'
+import ToggleAttribute from './elements/toggle_attribute'
+import LinkedInput from './elements/linked_input'
+import CheckboxGroup from './elements/checkbox_group'
+import MaskedInput from './elements/masked_input'
+import SetDateButton from './elements/set_date_button'
+import IndeterminateCheckbox from './elements/indeterminate_checkbox'

 import * as TurboInstantClick from './lib/turbo_instant_click'

@@ -89,9 +95,17 @@ safeRegisterElement('toggle-cookies', ToggleCookies)
 safeRegisterElement('toggle-on-submit', ToggleOnSubmit)
 safeRegisterElement('password-input', PasswordInput)
 safeRegisterElement('search-input', SearchInput)
+safeRegisterElement('toggle-attribute', ToggleAttribute)
+safeRegisterElement('linked-input', LinkedInput)
+safeRegisterElement('checkbox-group', CheckboxGroup)
+safeRegisterElement('masked-input', MaskedInput)
+safeRegisterElement('set-date-button', SetDateButton)
+safeRegisterElement('indeterminate-checkbox', IndeterminateCheckbox)

 safeRegisterElement('template-builder', class extends HTMLElement {
  connectedCallback () {
+    document.addEventListener('turbo:submit-end', this.onSubmit)
+
    this.appElem = document.createElement('div')

    this.appElem.classList.add('md:h-screen')
@@ -101,23 +115,36 @@ safeRegisterElement('template-builder', class extends HTMLElement {
      backgroundColor: '#faf7f5',
      locale: this.dataset.locale,
      withPhone: this.dataset.withPhone === 'true',
+      withVerification: ['true', 'false'].includes(this.dataset.withVerification) ? this.dataset.withVerification === 'true' : null,
      withLogo: this.dataset.withLogo !== 'false',
      editable: this.dataset.editable !== 'false',
      authenticityToken: document.querySelector('meta[name="csrf-token"]')?.content,
      withPayment: this.dataset.withPayment === 'true',
      isPaymentConnected: this.dataset.isPaymentConnected === 'true',
      withFormula: this.dataset.withFormula === 'true',
+      withSendButton: this.dataset.withSendButton !== 'false',
+      withSignYourselfButton: this.dataset.withSignYourselfButton !== 'false',
      withConditions: this.dataset.withConditions === 'true',
      currencies: (this.dataset.currencies || '').split(',').filter(Boolean),
      acceptFileTypes: this.dataset.acceptFileTypes
    })

-    this.app.mount(this.appElem)
+    this.component = this.app.mount(this.appElem)

    this.appendChild(this.appElem)
  }

+  onSubmit = (e) => {
+    if (e.detail.success && e.detail?.formSubmission?.formElement?.id === 'submitters_form') {
+      e.detail.fetchResponse.response.json().then((data) => {
+        this.component.template.submitters = data.submitters
+      })
+    }
+  }
+
  disconnectedCallback () {
+    document.removeEventListener('turbo:submit-end', this.onSubmit)
+
    this.app?.unmount()
    this.appElem?.remove()
  }
@@ -130,7 +157,8 @@ safeRegisterElement('import-list', class extends HTMLElement {
    this.app = createApp(ImportList, {
      template: JSON.parse(this.dataset.template),
      multitenant: this.dataset.multitenant === 'true',
-      authenticityToken: document.querySelector('meta[name="csrf-token"]')?.content
+      authenticityToken: document.querySelector('meta[name="csrf-token"]')?.content,
+      i18n: JSON.parse(this.dataset.i18n || '{}')
    })

    this.app.mount(this.appElem)
@@ -97,10 +97,27 @@ button[disabled] .enabled {
  bottom: auto;
 }

+.tooltip-bottom-start:before {
+  transform: translateX(-31%);
+  top: var(--tooltip-offset);
+  left: 100%;
+  right: auto;
+  bottom: auto;
+}
+
+.tooltip-bottom-start:after {
+  transform: translateX(-25%);
+  border-color: transparent transparent var(--tooltip-color) transparent;
+  top: var(--tooltip-tail-offset);
+  left: 50%;
+  right: auto;
+  bottom: auto;
+}
+
 .autocomplete {
  background: white;
  z-index: 1000;
-  font: 14px/22px "-apple-system", BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+  font: 16px/25px "-apple-system", BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
  overflow: auto;
  box-sizing: border-box;
  @apply border border-base-300 mt-1 rounded-md;
@@ -111,7 +128,7 @@ button[disabled] .enabled {
 }

 .autocomplete > div {
-  @apply px-2 py-1 font-normal text-sm;
+  @apply px-2 py-1.5 font-normal;
 }

 .autocomplete .group {
@@ -130,7 +147,3 @@ button[disabled] .enabled {
  outline-offset: 3px;
  outline-color: hsl(var(--bc) / 0.2);
 }
-
-select:required:invalid {
-  color: gray !important;
-}
@@ -12,6 +12,10 @@ window.customElements.define('draw-signature', class extends HTMLElement {

    this.pad = new SignaturePad(this.canvas)

+    if (this.dataset.color) {
+      this.pad.penColor = this.dataset.color
+    }
+
    this.pad.addEventListener('endStroke', () => {
      this.updateSubmitButtonVisibility()
    })
@@ -3,6 +3,8 @@ export default class extends HTMLElement {
    this.resize()

    this.textarea.addEventListener('input', () => this.resize())
+
+    this.observeVisibility()
  }

  resize () {
@@ -11,6 +13,28 @@ export default class extends HTMLElement {
    }
  }

+  observeVisibility () {
+    this.observer = new IntersectionObserver(
+      (entries) => {
+        entries.forEach((entry) => {
+          if (entry.isIntersecting) {
+            this.resize()
+            this.observer.unobserve(this.textarea)
+          }
+        })
+      },
+      {
+        threshold: 0.1
+      }
+    )
+
+    this.observer.observe(this.textarea)
+  }
+
+  disconnectedCallback () {
+    this.observer.unobserve(this.textarea)
+  }
+
  get textarea () {
    return this.querySelector('textarea')
  }
@@ -0,0 +1,15 @@
+export default class extends HTMLElement {
+  connectedCallback () {
+    this.items.forEach((item) => {
+      item.addEventListener('change', (e) => {
+        this.items.forEach((item) => {
+          item.checked = item === e.target && e.target.checked
+        })
+      })
+    })
+  }
+
+  get items () {
+    return this.querySelectorAll('input[type="checkbox"]')
+  }
+}
@@ -20,7 +20,8 @@ export default targetable(class extends HTMLElement {
    fetch(this.dataset.src).then(async (response) => {
      if (response.ok) {
        const urls = await response.json()
-        const isSafariIos = /iPhone|iPad|iPod/i.test(navigator.userAgent)
+        const isMobileSafariIos = 'ontouchstart' in window && navigator.maxTouchPoints > 0 && /AppleWebKit/i.test(navigator.userAgent)
+        const isSafariIos = isMobileSafariIos || /iPhone|iPad|iPod/i.test(navigator.userAgent)

        if (isSafariIos && urls.length > 1) {
          this.downloadSafariIos(urls)
@@ -0,0 +1,35 @@
+export default class extends HTMLElement {
+  connectedCallback () {
+    if (this.dataset.indeterminate === 'true') {
+      this.checkbox.indeterminate = true
+      this.checkbox.readOnly = true
+    }
+
+    this.checkbox.addEventListener('click', () => {
+      this.checkbox.setAttribute('name', this.dataset.name)
+
+      if (this.showIndeterminateEl) {
+        this.showIndeterminateEl.classList.add('hidden')
+      }
+
+      if (this.checkbox.readOnly) {
+        this.checkbox.checked = this.checkbox.readOnly = false
+      } else if (!this.checkbox.checked) {
+        if (this.showIndeterminateEl) {
+          this.showIndeterminateEl.classList.remove('hidden')
+        }
+
+        this.checkbox.setAttribute('name', this.dataset.indeterminateName)
+        this.checkbox.checked = this.checkbox.readOnly = this.checkbox.indeterminate = true
+      }
+    })
+  }
+
+  get checkbox () {
+    return this.querySelector('input[type="checkbox"]')
+  }
+
+  get showIndeterminateEl () {
+    return document.getElementById(this.dataset.showIndeterminateId)
+  }
+}
@@ -0,0 +1,31 @@
+export default class extends HTMLElement {
+  connectedCallback () {
+    if (this.target) {
+      this.input.value = this.target.value
+
+      this.target.addEventListener('input', (e) => {
+        this.input.value = e.target.value
+      })
+
+      this.target.addEventListener('linked-input.update', (e) => {
+        this.input.value = e.target.value
+      })
+    }
+  }
+
+  get input () {
+    return this.querySelector('input')
+  }
+
+  get target () {
+    if (this.dataset.targetId) {
+      const listItem = this.closest('[data-targets="dynamic-list.items"]')
+
+      if (listItem) {
+        return listItem.querySelector(`#${this.dataset.targetId}`)
+      } else {
+        return document.getElementById(this.dataset.targetId)
+      }
+    }
+  }
+}
@@ -0,0 +1,18 @@
+export default class extends HTMLElement {
+  connectedCallback () {
+    const maskedToken = this.input.value
+
+    this.input.addEventListener('focus', () => {
+      this.input.value = this.dataset.token
+      this.input.select()
+    })
+
+    this.input.addEventListener('focusout', () => {
+      this.input.value = maskedToken
+    })
+  }
+
+  get input () {
+    return this.querySelector('input')
+  }
+}
@@ -0,0 +1,20 @@
+export default class extends HTMLElement {
+  connectedCallback () {
+    this.button.addEventListener('click', () => {
+      this.fromInput.value = this.dataset.fromValue || ''
+      this.toInput.value = this.dataset.toValue || ''
+    })
+  }
+
+  get button () {
+    return this.querySelector('button')
+  }
+
+  get fromInput () {
+    return document.getElementById(this.dataset.fromId)
+  }
+
+  get toInput () {
+    return document.getElementById(this.dataset.toId)
+  }
+}
@@ -24,6 +24,7 @@ export default class extends HTMLElement {

      if (input && item[field]) {
        input.value = item[field]
+        input.dispatchEvent(new CustomEvent('linked-input.update', { bubbles: true }))
      }

      if (textarea && item[field]) {
@@ -0,0 +1,28 @@
+export default class extends HTMLElement {
+  connectedCallback () {
+    this.input.addEventListener('change', (event) => {
+      if (this.dataset.attribute) {
+        this.target[this.dataset.attribute] = event.target.checked
+      }
+
+      if (this.dataset.className) {
+        this.target.classList.toggle(this.dataset.className, event.target.value !== this.dataset.value)
+        if (this.dataset.className === 'hidden' && this.target.tagName === 'INPUT') {
+          this.target.disabled = event.target.value !== this.dataset.value
+        }
+      }
+
+      if (this.dataset.attribute === 'disabled') {
+        this.target.value = ''
+      }
+    })
+  }
+
+  get input () {
+    return this.querySelector('input[type="checkbox"]') || this.querySelector('select')
+  }
+
+  get target () {
+    return document.getElementById(this.dataset.targetId)
+  }
+}
@@ -22,7 +22,7 @@ export default actionable(class extends HTMLElement {
  }

  onSubmit = (e) => {
-    if (e.detail.success) {
+    if (e.detail.success && e.detail?.formSubmission?.formElement?.dataset?.closeOnSubmit !== 'false') {
      this.close()
    }
  }
@@ -14,18 +14,23 @@ safeRegisterElement('submission-form', class extends HTMLElement {

    this.app = createApp(Form, {
      submitter: JSON.parse(this.dataset.submitter),
+      inviteSubmitters: JSON.parse(this.dataset.inviteSubmitters),
+      optionalInviteSubmitters: JSON.parse(this.dataset.optionalInviteSubmitters),
+      schema: JSON.parse(this.dataset.schema),
      canSendEmail: this.dataset.canSendEmail === 'true',
      previousSignatureValue: this.dataset.previousSignatureValue,
      goToLast: this.dataset.goToLast === 'true',
      isDemo: this.dataset.isDemo === 'true',
      attribution: this.dataset.attribution !== 'false',
      scrollPadding: this.dataset.scrollPadding || '-80px',
+      language: this.dataset.language,
      dryRun: this.dataset.dryRun === 'true',
      expand: ['true', 'false'].includes(this.dataset.expand) ? this.dataset.expand === 'true' : null,
      withSignatureId: this.dataset.withSignatureId === 'true',
      requireSigningReason: this.dataset.requireSigningReason === 'true',
      withConfetti: this.dataset.withConfetti !== 'false',
      withDisclosure: this.dataset.withDisclosure === 'true',
+      reuseSignature: this.dataset.reuseSignature !== 'false',
      withTypedSignature: this.dataset.withTypedSignature !== 'false',
      authenticityToken: document.querySelector('meta[name="csrf-token"]')?.content,
      rememberSignature: this.dataset.rememberSignature === 'true',
@@ -31,10 +31,6 @@ button[disabled] .enabled {
  display: none;
 }

-select:required:invalid {
-  @apply text-gray-300;
-}
-
 .input-bordered {
  @apply border-base-content/20;
 }
@@ -18,9 +18,15 @@ if (token) {
    transform (payload) {
      payload.body.telemetry = []

-      const string = JSON.stringify(payload)
+      if (payload.request.query_string) {
+        payload.request.query_string = ''
+      }

-      return JSON.parse(string.replace(/(\/[des]\/)\w{6}/g, (_, m) => m))
+      if (payload.request.url) {
+        payload.request.url = payload.request.url.replace(/(\/[sdep]\/)(\w{5})[^/]+/, '$1$2')
+      }
+
+      return payload
    },
    payload: {
      client: {
@@ -3,7 +3,7 @@
    class="field-area flex absolute lg:text-base -outline-offset-1"
    dir="auto"
    :style="computedStyle"
-    :class="{ 'text-[1.6vw] lg:text-base': !textOverflowChars, 'text-[1.0vw] lg:text-xs': textOverflowChars, 'cursor-default': !submittable, 'border border-red-100 bg-red-100 cursor-pointer': submittable, 'border border-red-100': !isActive && submittable, 'bg-opacity-80': !isActive && !isValueSet && submittable, 'field-area-active outline-red-500 outline-dashed outline-2 z-10': isActive && submittable, 'bg-opacity-40': (isActive || isValueSet) && submittable }"
+    :class="{ 'font-mono': field.preferences?.font === 'Courier', 'font-serif': field.preferences?.font === 'Times', 'text-[1.6vw] lg:text-base': !textOverflowChars, 'text-[1.0vw] lg:text-xs': textOverflowChars, 'cursor-default': !submittable, 'border border-red-100 bg-red-100 cursor-pointer': submittable, 'border border-red-100': !isActive && submittable, 'bg-opacity-80': !isActive && !isValueSet && submittable, 'field-area-active outline-red-500 outline-dashed outline-2 z-10': isActive && submittable, 'bg-opacity-40': (isActive || isValueSet) && submittable }"
  >
    <div
      v-if="(!withFieldPlaceholder || !field.name || field.type === 'cells') && !isActive && !isValueSet && field.type !== 'checkbox' && submittable && !area.option_uuid"
@@ -29,17 +29,16 @@
        {{ optionValue(option) }}
      </template>
      <template v-else>
-        {{ field.name || fieldNames[field.type] }}
+        {{ field.title || field.name || fieldNames[field.type] }}
        <template v-if="field.type === 'checkbox' && !field.name">
          {{ fieldIndex + 1 }}
        </template>
        <template v-else-if="!field.required && field.type !== 'checkbox'">
-          (optional)
+          ({{ t('optional') }})
        </template>
      </template>
    </div>
    <div
-      v-if="isActive"
      ref="scrollToElem"
      class="absolute"
      :style="{ top: scrollPadding }"
@@ -75,7 +74,7 @@
          ID: {{ signature.uuid }}
        </div>
        <div>
-          {{ t('reason') }}: {{ values[field.preferences?.reason_field_uuid] || t('digitally_signed_by') }} {{ submitter.name }}
+          <span v-if="values[field.preferences?.reason_field_uuid]">{{ t('reason') }}: </span>{{ values[field.preferences?.reason_field_uuid] || t('digitally_signed_by') }} {{ submitter.name }}
          <template v-if="submitter.email">
            &lt;{{ submitter.email }}&gt;
          </template>
@@ -169,6 +168,7 @@
    <div
      v-else-if="field.type === 'cells'"
      class="w-full flex items-center"
+      :class="{ 'justify-end': field.preferences?.align === 'right' }"
    >
      <div
        v-for="(char, index) in modelValue"
@@ -191,13 +191,22 @@
        class="whitespace-pre-wrap text-gray-400"
        :class="{ 'w-full': field.preferences?.align }"
      >{{ field.name }}</span>
-      <span v-else-if="Array.isArray(modelValue)">
+      <span
+        v-else-if="Array.isArray(modelValue)"
+        :class="{ 'w-full': field.preferences?.align }"
+      >
        {{ modelValue.join(', ') }}
      </span>
-      <span v-else-if="field.type === 'date'">
+      <span
+        v-else-if="field.type === 'date'"
+        :class="{ 'w-full': field.preferences?.align }"
+      >
        {{ formattedDate }}
      </span>
-      <span v-else-if="field.type === 'number'">
+      <span
+        v-else-if="field.type === 'number'"
+        class="w-full"
+      >
        {{ formatNumber(modelValue, field.preferences?.format) }}
      </span>
      <span
@@ -210,7 +219,7 @@
 </template>

 <script>
-import { IconTextSize, IconWritingSign, IconCalendarEvent, IconPhoto, IconCheckbox, IconPaperclip, IconSelect, IconCircleDot, IconChecks, IconCheck, IconColumns3, IconPhoneCheck, IconLetterCaseUpper, IconCreditCard, IconRubberStamp, IconSquareNumber1 } from '@tabler/icons-vue'
+import { IconTextSize, IconWritingSign, IconCalendarEvent, IconPhoto, IconCheckbox, IconPaperclip, IconSelect, IconCircleDot, IconChecks, IconCheck, IconColumns3, IconPhoneCheck, IconLetterCaseUpper, IconCreditCard, IconRubberStamp, IconSquareNumber1, IconId } from '@tabler/icons-vue'

 export default {
  name: 'FieldArea',
@@ -226,7 +235,8 @@ export default {
    },
    submitter: {
      type: Object,
-      required: true
+      required: false,
+      default: () => ({})
    },
    withSignatureId: {
      type: Boolean,
@@ -311,7 +321,8 @@ export default {
        cells: this.t('cells'),
        stamp: this.t('stamp'),
        payment: this.t('payment'),
-        phone: this.t('phone')
+        phone: this.t('phone'),
+        verification: this.t('verify_id')
      }
    },
    alignClasses () {
@@ -340,7 +351,8 @@ export default {
        cells: IconColumns3,
        multiple: IconChecks,
        phone: IconPhoneCheck,
-        payment: IconCreditCard
+        payment: IconCreditCard,
+        verification: IconId
      }
    },
    image () {
@@ -404,7 +416,12 @@ export default {
      }

      if (this.field.preferences?.font_size) {
-        style.fontSize = this.field.preferences.font_size + 'pt'
+        style.fontSize = `clamp(4pt, 1.6vw, ${parseInt(this.field.preferences.font_size) * 1.23}pt)`
+        style.lineHeight = `clamp(6pt, 2.0vw, ${parseInt(this.field.preferences.font_size) * 1.23 + 3}pt)`
+      }
+
+      if (this.field.preferences?.color) {
+        style.color = this.field.preferences.color
      }

      return style
@@ -439,8 +456,18 @@ export default {
      }
    },
    formatNumber (number, format) {
+      if (!number && number !== 0) {
+        return ''
+      }
+
      if (format === 'comma') {
        return new Intl.NumberFormat('en-US').format(number)
+      } else if (format === 'usd') {
+        return new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD', minimumFractionDigits: 2, maximumFractionDigits: 2 }).format(number)
+      } else if (format === 'gbp') {
+        return new Intl.NumberFormat('en-GB', { style: 'currency', currency: 'GBP', minimumFractionDigits: 2, maximumFractionDigits: 2 }).format(number)
+      } else if (format === 'eur') {
+        return new Intl.NumberFormat('fr-FR', { style: 'currency', currency: 'EUR', minimumFractionDigits: 2, maximumFractionDigits: 2 }).format(number)
      } else if (format === 'dot') {
        return new Intl.NumberFormat('de-DE').format(number)
      } else if (format === 'space') {
@@ -21,17 +21,17 @@
            :values="values"
            :field="field"
            :area="area"
-            :submittable="true"
+            :submittable="submittable"
            :field-index="fieldIndex"
            :scroll-padding="scrollPadding"
            :submitter="submitter"
            :with-field-placeholder="withFieldPlaceholder"
            :with-signature-id="withSignatureId"
            :is-active="currentStep === step"
-            :with-label="withLabel && !withFieldPlaceholder"
+            :with-label="withLabel && !withFieldPlaceholder && step.length < 2"
            :is-value-set="step.some((f) => f.uuid in values)"
            :attachments-index="attachmentsIndex"
-            @click="$emit('focus-step', stepIndex)"
+            @click="[$emit('focus-step', stepIndex), maybeScrollOnClick(field, area)]"
          />
        </Teleport>
      </template>
@@ -58,6 +58,11 @@ export default {
      required: false,
      default: false
    },
+    submittable: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
    submitter: {
      type: Object,
      required: true
@@ -104,6 +109,14 @@ export default {
      areaRefs: []
    }
  },
+  computed: {
+    isMobileContainer () {
+      const root = this.$root.$el.parentNode.getRootNode()
+      const container = root.body || root.querySelector('div')
+
+      return container.style.overflow === 'hidden'
+    }
+  },
  beforeUpdate () {
    this.areaRefs = []
  },
@@ -116,21 +129,31 @@ export default {
        this.scrollIntoArea(field.areas[0])
      }
    },
+    maybeScrollOnClick (field, area) {
+      if (['text', 'number', 'cells'].includes(field.type) && this.isMobileContainer) {
+        this.scrollIntoArea(area)
+      }
+    },
    scrollIntoArea (area) {
      const areaRef = this.areaRefs.find((a) => a.area === area)

      if (areaRef) {
-        const root = this.$root.$el.parentNode.getRootNode()
-        const container = root.body || root.querySelector('div')
-
-        if (container.style.overflow === 'hidden') {
+        if (this.isMobileContainer) {
          this.scrollInContainer(areaRef.$el)
        } else {
          const targetRect = areaRef.$refs.scrollToElem.getBoundingClientRect()
-          const root = this.$root.$el?.parentNode?.classList?.contains('ds') ? this.$root.$el : document.body
-          const rootRect = root.getBoundingClientRect()
          const scrollEl = this.scrollEl || window

+          let rootRect = {}
+
+          if (this.scrollEl === document.documentElement) {
+            rootRect = this.scrollEl.getBoundingClientRect()
+          } else {
+            const root = this.$root.$el?.parentNode?.classList?.contains('ds') ? this.$root.$el : document.body
+
+            rootRect = root.getBoundingClientRect()
+          }
+
          scrollEl.scrollTo({ top: targetRect.top - rootRect.top, behavior: 'smooth' })
        }

@@ -144,13 +167,15 @@ export default {
      const formContainer = root.getElementById('form_container')
      const container = root.body || root.querySelector('div')

-      const padding = 64
+      const isAndroid = /android/i.test(navigator.userAgent)
+      const padding = isAndroid ? 128 : 64
+      const scrollboxTop = isAndroid ? scrollbox.getBoundingClientRect().top : 0
      const boxRect = scrollbox.children[0].getBoundingClientRect()
      const targetRect = target.getBoundingClientRect()

      const targetTopRelativeToBox = targetRect.top - boxRect.top

-      scrollbox.scrollTo({ top: targetTopRelativeToBox - container.offsetHeight + formContainer.offsetHeight + target.offsetHeight + padding, behavior: 'smooth' })
+      scrollbox.scrollTo({ top: targetTopRelativeToBox + scrollboxTop - container.offsetHeight + formContainer.offsetHeight + target.offsetHeight + padding, behavior: 'smooth' })
    },
    setAreaRef (el) {
      if (el) {
@@ -49,7 +49,7 @@
      <MarkdownContent :string="field.description" />
    </div>
    <FileDropzone
-      :message="`${t('upload')} ${field.name || t('files')}${field.required ? '' : ` (${t('optional')})`}`"
+      :message="`${t('upload')} ${(field.title || field.name) || t('files')}${field.required ? '' : ` (${t('optional')})`}`"
      :submitter-slug="submitterSlug"
      :multiple="true"
      :dry-run="dryRun"
@@ -1,5 +1,6 @@
 <template>
  <div
+    id="form_completed"
    class="mx-auto max-w-md flex flex-col"
    dir="auto"
  >
@@ -10,7 +11,7 @@
        :height="30"
      />
      <span>
-        {{ completedMessage.title || t('form_has_been_completed') }}
+        {{ completedMessage.title || (hasSignatureFields ? (hasMultipleDocuments ? t('documents_have_been_signed') : t('document_has_been_signed')) : t('form_has_been_completed')) }}
      </span>
    </div>
    <div
@@ -75,7 +76,7 @@
      </a>
      <a
        v-if="isDemo"
-        href="https://docuseal.co/sign_up"
+        href="https://docuseal.com/sign_up"
        class="white-button flex items-center space-x-1 w-full"
      >
        <IconLogin />
@@ -88,9 +89,9 @@
      v-if="attribution"
      class="text-center mt-4"
    >
-      {{ t('signed_with') }}
+      {{ t('powered_by') }}
      <a
-        href="https://www.docuseal.co/start"
+        href="https://www.docuseal.com/start"
        target="_blank"
        class="underline"
      >DocuSeal</a> - {{ t('open_source_documents_software') }}
@@ -129,6 +130,16 @@ export default {
      required: false,
      default: true
    },
+    hasSignatureFields: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    hasMultipleDocuments: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
    withDownloadButton: {
      type: Boolean,
      required: false,
@@ -204,7 +215,8 @@ export default {
      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)
+          const isMobileSafariIos = 'ontouchstart' in window && navigator.maxTouchPoints > 0 && /AppleWebKit/i.test(navigator.userAgent)
+          const isSafariIos = isMobileSafariIos || /iPhone|iPad|iPod/i.test(navigator.userAgent)

          if (isSafariIos && urls.length > 1) {
            this.downloadSafariIos(urls)
@@ -212,7 +224,7 @@ export default {
            this.downloadUrls(urls)
          }
        } else {
-          alert('Failed to download files')
+          alert(this.t('failed_to_download_files'))
        }
      })
    },
@@ -1,22 +1,28 @@
 <template>
  <div dir="auto">
    <div
-      class="flex justify-between items-center w-full"
+      class="flex justify-between items-end w-full mb-3.5 sm:mb-4"
      :class="{ 'mb-2': !field.description }"
    >
      <label
+        v-if="showFieldNames"
        :for="field.uuid"
-        class="label text-2xl"
+        class="label text-xl sm:text-2xl py-0"
      >
        <MarkdownContent
          v-if="field.title"
          :string="field.title"
        />
        <template v-else>
-          {{ field.name && showFieldNames ? field.name : t('date') }}
-          <template v-if="!field.required">
+          {{ field.name || t('date') }}
+        </template>
+        <template v-if="!field.required">
+          <span
+            class="ml-1"
+            :class="{ 'hidden sm:inline': (field.title || field.name || t('date') ).length > 10 }"
+          >
            ({{ t('optional') }})
-          </template>
+          </span>
        </template>
      </label>
      <button
@@ -37,6 +43,7 @@
    <AppearsOn :field="field" />
    <div class="text-center">
      <input
+        :id="field.uuid"
        ref="input"
        v-model="value"
        class="base-input !text-2xl text-center w-full"
@@ -45,6 +52,7 @@
        :name="`values[${field.uuid}]`"
        @keydown.enter="onEnter"
        @focus="$emit('focus')"
+        @paste="onPaste"
      >
    </div>
  </div>
@@ -98,6 +106,25 @@ export default {
        this.$emit('submit')
      }
    },
+    onPaste (e) {
+      e.preventDefault()
+
+      let pasteData = e.clipboardData.getData('text').trim()
+
+      if (pasteData.match(/^\d{2}\.\d{2}\.\d{4}$/)) {
+        pasteData = pasteData.split('.').reverse().join('-')
+      }
+
+      const parsedDate = new Date(pasteData)
+
+      if (!isNaN(parsedDate)) {
+        const inputEl = this.$refs.input
+
+        inputEl.valueAsDate = new Date(parsedDate.getTime() - parsedDate.getTimezoneOffset() * 60000)
+
+        inputEl.dispatchEvent(new Event('input', { bubbles: true }))
+      }
+    },
    setCurrentDate () {
      const inputEl = this.$refs.input

@@ -1,5 +1,6 @@
 <template>
  <div
+    id="dropzone"
    class="flex h-32 w-full"
    @dragover.prevent
    @drop.prevent="onDropFiles"
@@ -127,7 +128,7 @@ export default {
              }
            })
          } else {
-            if (file.type === 'image/bmp') {
+            if (file.type === 'image/bmp' || file.type === 'image/vnd.microsoft.icon') {
              file = await this.convertBmpToPng(file)
            }

@@ -11,13 +11,59 @@
    :with-label="!isAnonymousChecboxes && showFieldNames"
    :current-step="currentStepFields"
    :scroll-padding="scrollPadding"
-    @focus-step="[saveStep(), currentField.type !== 'checkbox' ? isFormVisible = true : '', goToStep($event, false, true)]"
+    @focus-step="[saveStep(), goToStep($event, false, true), currentField.type !== 'checkbox' ? isFormVisible = true : '']"
+  />
+  <FieldAreas
+    :steps="readonlyConditionalFields.map((e) => [e])"
+    :values="readonlyConditionalFieldValues"
+    :submitter="submitter"
+    :attachments-index="attachmentsIndex"
+    :submittable="false"
  />
  <FormulaFieldAreas
    v-if="formulaFields.length"
    :fields="formulaFields"
+    :readonly-values="readonlyConditionalFieldValues"
    :values="values"
  />
+  <Teleport
+    v-if="completeButtonToRef"
+    :to="completeButtonToRef"
+  >
+    <span
+      v-if="(emptyValueRequiredStep && ((stepFields.length - 1) !== currentStep || currentStepFields !== emptyValueRequiredStep)) || isCompleted"
+      class="tooltip-left"
+      :class="{ tooltip: !isCompleted }"
+      :data-tip="t('fill_all_required_fields_to_complete')"
+    >
+      <button
+        class="btn btn-sm btn-neutral text-white px-4 w-full flex justify-center btn-disabled pointer-events-auto"
+        @click="[isFormVisible = true, !isCompleted && goToStep(stepFields.indexOf(emptyValueRequiredStep), true, false)]"
+      >
+        {{ t('complete') }}
+      </button>
+    </span>
+    <button
+      v-else
+      id="complete_form_button"
+      class="btn btn-sm btn-neutral text-white px-4 w-full flex justify-center"
+      form="steps_form"
+      type="submit"
+      name="completed"
+      value="true"
+      :disabled="isSubmittingComplete"
+    >
+      <span class="flex items-center">
+        <IconInnerShadowTop
+          v-if="isSubmittingComplete"
+          class="mr-1 animate-spin w-5 h-5"
+        />
+        <span>
+          {{ t('complete') }}
+        </span>
+      </span>
+    </button>
+  </Teleport>
  <button
    v-if="!isFormVisible"
    id="expand_form_button"
@@ -32,8 +78,11 @@
    <template v-else-if="alwaysMinimize">
      {{ t('next') }}
    </template>
+    <template v-else-if="isShowContinue">
+      {{ t('continue') }}
+    </template>
    <template v-else>
-      {{ t('submit_form') }}
+      {{ t('start_now') }}
    </template>
    <IconArrowsDiagonal
      class="absolute right-0 mr-4"
@@ -51,9 +100,10 @@
    <button
      v-if="!isCompleted"
      id="minimize_form_button"
-      class="absolute right-0 mr-2 mt-2 top-0 hidden md:block"
+      class="absolute right-0 top-0"
+      :class="currentField?.description?.length > 100 ? 'mr-1 mt-1 md:mr-2 md:mt-2': 'mr-2 mt-2 hidden md:block'"
      :title="t('minimize')"
-      @click.prevent="isFormVisible = false"
+      @click.prevent="minimizeForm"
    >
      <IconArrowsDiagonalMinimize2
        :width="20"
@@ -64,7 +114,8 @@
      :class="{ 'md:px-4': isBreakpointMd }"
    >
      <form
-        v-if="!isCompleted"
+        v-if="!isCompleted && !isInvite"
+        id="steps_form"
        ref="form"
        :action="submitPath"
        method="post"
@@ -106,7 +157,7 @@
            v-model="values[currentField.uuid]"
            :show-field-names="showFieldNames"
            :field="currentField"
-            @submit="submitStep"
+            @submit="!isSubmitting && submitStep()"
            @focus="scrollIntoField(currentField)"
          />
          <div v-else-if="currentField.type === 'select'">
@@ -114,7 +165,7 @@
              v-if="showFieldNames && (currentField.name || currentField.title)"
              :for="currentField.uuid"
              dir="auto"
-              class="label text-2xl"
+              class="label text-xl sm:text-2xl py-0 mb-2 sm:mb-3.5"
              :class="{ 'mb-2': !currentField.description }"
            >
              <MarkdownContent
@@ -123,7 +174,11 @@
              />
              <template v-else>
                {{ currentField.name }}
-                <template v-if="!currentField.required">({{ t('optional') }})</template>
+              </template>
+              <template v-if="!currentField.required">
+                <span :class="{ 'hidden sm:inline': (currentField.title || currentField.name).length > 20 }">
+                  ({{ t('optional') }})
+                </span>
              </template>
            </label>
            <div
@@ -143,6 +198,7 @@
              dir="auto"
              :required="currentField.required"
              class="select base-input !text-2xl w-full text-center font-normal"
+              :class="{ 'text-gray-300': !values[currentField.uuid] }"
              :name="`values[${currentField.uuid}]`"
              @change="values[currentField.uuid] = $event.target.value"
              @focus="scrollIntoField(currentField)"
@@ -150,6 +206,7 @@
              <option
                value=""
                :selected="!values[currentField.uuid]"
+                class="text-gray-300"
              >
                {{ t('select_your_option') }}
              </option>
@@ -158,6 +215,7 @@
                :key="option.uuid"
                :selected="values[currentField.uuid] == option.value"
                :value="option.value"
+                class="text-base-content"
              >
                {{ option.value }}
              </option>
@@ -168,7 +226,7 @@
              v-if="showFieldNames && (currentField.name || currentField.title)"
              :for="currentField.uuid"
              dir="auto"
-              class="label text-2xl"
+              class="label text-xl sm:text-2xl py-0 mb-2 sm:mb-3.5"
              :class="{ 'mb-2': !currentField.description }"
            >
              <MarkdownContent
@@ -177,7 +235,11 @@
              />
              <template v-else>
                {{ currentField.name }}
-                <template v-if="!currentField.required">({{ t('optional') }})</template>
+              </template>
+              <template v-if="!currentField.required">
+                <span :class="{ 'hidden sm:inline': (currentField.title || currentField.name).length > 20 }">
+                  ({{ t('optional') }})
+                </span>
              </template>
            </label>
            <div
@@ -195,7 +257,7 @@
                <span
                  @click="scrollIntoField(currentField)"
                >
-                  {{ t('complete_hightlighted_checkboxes_and_click') }} <span class="font-semibold">{{ stepFields.length === currentStep + 1 ? t('submit') : t('next') }}</span>.
+                  {{ t('complete_hightlighted_checkboxes_and_click') }} <span class="font-semibold">{{ submitButtonText }}</span>.
                </span>
              </div>
              <div
@@ -259,7 +321,7 @@
              >
                <template v-if="isAnonymousChecboxes || !showFieldNames">
                  <span class="text-xl">
-                    {{ t('complete_hightlighted_checkboxes_and_click') }} <span class="font-semibold">{{ stepFields.length === currentStep + 1 ? t('submit') : t('next') }}</span>.
+                    {{ t('complete_hightlighted_checkboxes_and_click') }} <span class="font-semibold">{{ submitButtonText }}</span>.
                  </span>
                  <input
                    v-for="field in currentStepFields"
@@ -334,7 +396,7 @@
            :remember-signature="rememberSignature"
            :attachments-index="attachmentsIndex"
            :require-signing-reason="requireSigningReason"
-            :button-text="buttonText"
+            :button-text="submitButtonText"
            :dry-run="dryRun"
            :with-disclosure="withDisclosure"
            :with-qr-button="withQrButton"
@@ -343,7 +405,7 @@
            @update:reason="values[currentField.preferences?.reason_field_uuid] = $event"
            @attached="attachments.push($event)"
            @start="scrollIntoField(currentField)"
-            @minimize="isFormVisible = false"
+            @minimize="minimizeForm"
          />
          <InitialsStep
            v-else-if="currentField.type === 'initials'"
@@ -359,7 +421,7 @@
            @attached="attachments.push($event)"
            @start="scrollIntoField(currentField)"
            @focus="scrollIntoField(currentField)"
-            @minimize="isFormVisible = false"
+            @minimize="minimizeForm"
          />
          <AttachmentStep
            v-else-if="currentField.type === 'file'"
@@ -383,7 +445,7 @@
            :default-value="submitter.phone"
            :submitter-slug="submitterSlug"
            @focus="scrollIntoField(currentField)"
-            @submit="submitStep"
+            @submit="!isSubmitting && submitStep()"
          />
          <PaymentStep
            v-else-if="currentField.type === 'payment'"
@@ -395,12 +457,25 @@
            :values="values"
            @attached="attachments.push($event)"
            @focus="scrollIntoField(currentField)"
-            @submit="submitStep"
+            @submit="!isSubmitting && submitStep()"
+          />
+          <VerificationStep
+            v-else-if="currentField.type === 'verification'"
+            ref="currentStep"
+            :key="currentField.uuid"
+            :locale="language?.toLowerCase() || browserLanguage"
+            :submitter="submitter"
+            :empty-value-required-step="emptyValueRequiredStep"
+            :field="currentField"
+            :submitter-slug="submitterSlug"
+            :values="values"
+            @focus="scrollIntoField(currentField)"
+            @submit="!isSubmitting && submitStep()"
          />
        </div>
        <div
-          v-if="currentField.type !== 'payment' || submittedValues[currentField.uuid]"
-          :class="currentField.type === 'signature' ? 'mt-2' : 'mt-6 md:mt-8'"
+          v-if="(currentField.type !== 'payment' && currentField.type !== 'verification') || submittedValues[currentField.uuid]"
+          :class="currentField.type === 'signature' ? 'mt-2' : 'mt-4 md:mt-6'"
        >
          <button
            id="submit_form_button"
@@ -415,7 +490,7 @@
                class="mr-1 animate-spin"
              />
              <span>
-                {{ buttonText }}
+                {{ submitButtonText }}
              </span><span
                v-if="isSubmitting"
                class="w-6 flex justify-start mr-1"
@@ -430,10 +505,22 @@
          </div>
        </div>
      </form>
+      <InviteForm
+        v-else-if="isInvite"
+        :submitters="inviteSubmitters"
+        :optional-submitters="optionalInviteSubmitters"
+        :submitter-slug="submitterSlug"
+        :authenticity-token="authenticityToken"
+        :url="baseUrl + submitPath + '/invite'"
+        :style="{ maxWidth: isBreakpointMd ? '582px' : '' }"
+        @success="[isInvite = false, performComplete($event)]"
+      />
      <FormCompleted
        v-else
        :is-demo="isDemo"
        :attribution="attribution"
+        :has-signature-fields="stepFields.some((fields) => fields.some((f) => ['signature', 'initials'].includes(f.type)))"
+        :has-multiple-documents="hasMultipleDocuments"
        :completed-button="completedRedirectUrl ? {} : completedButton"
        :completed-message="completedRedirectUrl ? {} : completedMessage"
        :with-send-copy-button="withSendCopyButton && !completedRedirectUrl"
@@ -444,9 +531,9 @@
      />
      <div
        v-if="stepFields.length < 80"
-        class="flex justify-center"
+        class="flex justify-center mt-3 sm:mt-4 mb-0 sm:mb-1"
      >
-        <div class="flex items-center mt-4 mb-1 flex-wrap">
+        <div class="flex items-center flex-wrap">
          <a
            v-for="(step, index) in stepFields"
            :key="step[0].uuid"
@@ -475,10 +562,12 @@ import AttachmentStep from './attachment_step'
 import MultiSelectStep from './multi_select_step'
 import PhoneStep from './phone_step'
 import PaymentStep from './payment_step'
+import VerificationStep from './verification_step'
 import TextStep from './text_step'
 import NumberStep from './number_step'
 import DateStep from './date_step'
 import MarkdownContent from './markdown_content'
+import InviteForm from './invite_form'
 import FormCompleted from './completed'
 import { IconInnerShadowTop, IconArrowsDiagonal, IconWritingSign, IconArrowsDiagonalMinimize2 } from '@tabler/icons-vue'
 import AppearsOn from './appears_on'
@@ -516,6 +605,8 @@ export default {
    IconWritingSign,
    AttachmentStep,
    InitialsStep,
+    VerificationStep,
+    InviteForm,
    MultiSelectStep,
    IconInnerShadowTop,
    DateStep,
@@ -542,6 +633,16 @@ export default {
      type: Object,
      required: true
    },
+    inviteSubmitters: {
+      type: Array,
+      required: false,
+      default: () => []
+    },
+    optionalInviteSubmitters: {
+      type: Array,
+      required: false,
+      default: () => []
+    },
    withSignatureId: {
      type: Boolean,
      required: false,
@@ -552,6 +653,11 @@ export default {
      required: false,
      default: '-80px'
    },
+    orderAsOnPage: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
    requireSigningReason: {
      type: Boolean,
      required: false,
@@ -562,6 +668,16 @@ export default {
      required: false,
      default: false
    },
+    completeButtonToRef: {
+      type: Object,
+      required: false,
+      default: null
+    },
+    schema: {
+      type: Array,
+      required: false,
+      default: () => []
+    },
    attachments: {
      type: Array,
      required: false,
@@ -733,24 +849,64 @@ export default {
  data () {
    return {
      isCompleted: false,
+      isInvite: false,
      isFormVisible: this.expand !== false,
      showFillAllRequiredFields: false,
      currentStep: 0,
+      isShowContinue: false,
      enableScrollIntoField: true,
      phoneVerifiedValues: {},
      orientation: screen?.orientation?.type,
      isSubmitting: false,
+      isSubmittingComplete: false,
      submittedValues: {},
      recalculateButtonDisabledKey: ''
    }
  },
  computed: {
    isMobile () {
-      return /android|iphone|ipad/i.test(navigator.userAgent)
+      const isMobileSafariIos = 'ontouchstart' in window && navigator.maxTouchPoints > 0 && /AppleWebKit/i.test(navigator.userAgent)
+
+      return isMobileSafariIos || /android|iphone|ipad/i.test(navigator.userAgent)
    },
-    buttonText () {
-      if (this.alwaysMinimize || this.stepFields.length === this.currentStep + 1) {
+    readonlyConditionalFieldValues () {
+      return this.readonlyConditionalFields.reduce((acc, f) => {
+        acc[f.uuid] = (this.values[f.uuid] || f.default_value)
+
+        return acc
+      }, {})
+    },
+    attachmentConditionsIndex () {
+      return this.schema.reduce((acc, item) => {
+        if (item.conditions?.length) {
+          if (item.conditions.every((c) => this.fieldsUuidIndex[c.field_uuid])) {
+            acc[item.attachment_uuid] = this.checkFieldConditions(item)
+          } else {
+            acc[item.attachment_uuid] = true
+          }
+        } else {
+          acc[item.attachment_uuid] = true
+        }
+
+        return acc
+      }, {})
+    },
+    emptyValueRequiredStep () {
+      return this.stepFields.find((fields, index) => {
+        return fields.some((f) => {
+          return f.required && isEmpty(this.values[f.uuid])
+        })
+      })
+    },
+    submitButtonText () {
+      if (this.alwaysMinimize) {
        return this.t('submit')
+      } else if (this.stepFields.length === this.currentStep + 1) {
+        if (this.currentField.type === 'signature') {
+          return this.t('sign_and_complete')
+        } else {
+          return this.t('complete')
+        }
      } else {
        return this.t('next')
      }
@@ -758,6 +914,18 @@ export default {
    alwaysMinimize () {
      return this.minimize || (this.orientation?.includes('landscape') && this.isMobile && parseInt(window.innerHeight) < 550)
    },
+    hasMultipleDocuments () {
+      return Object.keys(
+        this.stepFields.reduce((acc, fields) => {
+          fields.forEach((f) => {
+            f.areas?.forEach((a) => {
+              acc[a.attachment_uuid] = 1
+            })
+          })
+          return acc
+        }, {})
+      ).filter(Boolean).length > 1
+    },
    currentStepFields () {
      return this.stepFields[this.currentStep] || []
    },
@@ -802,11 +970,62 @@ export default {
    currentField () {
      return this.currentStepFields[0]
    },
+    readonlyConditionalFields () {
+      return this.fields.filter((f) => f.readonly && f.conditions?.length && this.checkFieldConditions(f) && this.checkFieldDocumentsConditions(f))
+    },
    stepFields () {
-      return this.fields.filter((f) => !f.readonly).reduce((acc, f) => {
+      const verificationFields = []
+
+      const sortedFields = this.fields.reduce((acc, f) => {
+        if (f.type === 'verification') {
+          verificationFields.push(f)
+        } else if (!f.readonly) {
+          acc.push(f)
+        }
+
+        return acc
+      }, [])
+
+      if (this.orderAsOnPage) {
+        const fieldAreasIndex = {}
+        const attachmentUuids = Object.keys(this.attachmentConditionsIndex)
+
+        const sortArea = (aArea, bArea) => {
+          if (aArea.attachment_uuid === bArea.attachment_uuid) {
+            if (aArea.page === bArea.page) {
+              if (Math.abs(aArea.y - bArea.y) < 0.01) {
+                if (aArea.x === bArea.x) {
+                  return 0
+                } else {
+                  return aArea.x - bArea.x
+                }
+              } else {
+                return aArea.y - bArea.y
+              }
+            } else {
+              return aArea.page - bArea.page
+            }
+          } else {
+            return attachmentUuids.indexOf(aArea.attachment_uuid) - attachmentUuids.indexOf(bArea.attachment_uuid)
+          }
+        }
+
+        sortedFields.sort((aField, bField) => {
+          const aArea = (fieldAreasIndex[aField.uuid] ||= [...(aField.areas || [])].sort(sortArea)[0])
+          const bArea = (fieldAreasIndex[bField.uuid] ||= [...(bField.areas || [])].sort(sortArea)[0])
+
+          return sortArea(aArea, bArea)
+        })
+      }
+
+      if (verificationFields.length) {
+        sortedFields.push(verificationFields.pop())
+      }
+
+      return sortedFields.reduce((acc, f) => {
        const prevStep = acc[acc.length - 1]

-        if (this.checkFieldConditions(f)) {
+        if (this.checkFieldConditions(f) && this.checkFieldDocumentsConditions(f)) {
          if (f.type === 'checkbox' && Array.isArray(prevStep) && prevStep[0].type === 'checkbox' && !f.description) {
            prevStep.push(f)
          } else {
@@ -839,6 +1058,23 @@ export default {
      if (isEmpty(value) && this.currentStep > 0) {
        this.currentStep -= 1
      }
+    },
+    attachmentConditionsIndex: {
+      deep: true,
+      immediate: true,
+      handler (value) {
+        this.$nextTick(() => {
+          const root = this.$root.$el.parentNode.getRootNode()
+
+          for (const key in value) {
+            const doc = root.querySelector(`[id="document-${key}"`)
+
+            if (doc) {
+              doc.classList.toggle('hidden', !value[key])
+            }
+          }
+        })
+      }
    }
  },
  beforeUnmount () {
@@ -847,7 +1083,7 @@ export default {
  mounted () {
    this.submittedValues = JSON.parse(JSON.stringify(this.values))

-    screen?.orientation.addEventListener('change', this.onOrientationChange)
+    screen?.orientation?.addEventListener('change', this.onOrientationChange)

    this.fields.forEach((field) => {
      if (field.default_value && !field.readonly) {
@@ -879,14 +1115,16 @@ export default {
    }

    if (document.body?.clientWidth >= 768 && this.expand !== true && ['signature', 'initials', 'file', 'image'].includes(this.currentField?.type)) {
-      this.isFormVisible = false
+      this.minimizeForm()
    }

    if (this.alwaysMinimize) {
-      this.isFormVisible = false
+      this.minimizeForm()
    }

-    if (/iPhone|iPad|iPod/i.test(navigator.userAgent)) {
+    const isMobile = 'ontouchstart' in window && navigator.maxTouchPoints > 0 && /AppleWebKit|android/i.test(navigator.userAgent)
+
+    if (isMobile || /iPhone|iPad|iPod/i.test(navigator.userAgent)) {
      this.$nextTick(() => {
        const root = this.$root.$el.parentNode.getRootNode()
        const scrollbox = root.getElementById('scrollbox')
@@ -920,33 +1158,57 @@ export default {
    onOrientationChange (event) {
      this.orientation = event.target.type
    },
+    checkFieldDocumentsConditions (field) {
+      if (field.areas?.length) {
+        return field.areas.some((area) => {
+          return this.attachmentConditionsIndex[area.attachment_uuid]
+        })
+      } else {
+        return true
+      }
+    },
    checkFieldConditions (field) {
      if (field.conditions?.length) {
-        return field.conditions.reduce((acc, c) => {
-          const field = this.fieldsUuidIndex[c.field_uuid]
-
-          if (['not_empty', 'checked', 'equal', 'contains'].includes(c.action) && field && !this.checkFieldConditions(field)) {
-            return false
-          }
-
-          if (['empty', 'unchecked'].includes(c.action)) {
-            return acc && isEmpty(this.values[c.field_uuid])
-          } else if (['not_empty', 'checked'].includes(c.action)) {
-            return acc && !isEmpty(this.values[c.field_uuid])
-          } else if (['equal', 'contains'].includes(c.action)) {
-            const option = field.options.find((o) => o.uuid === c.value)
-            const values = [this.values[c.field_uuid]].flat()
-
-            return acc && values.includes(this.optionValue(option, field.options.indexOf(option)))
-          } else if (['not_equal', 'does_not_contain'].includes(c.action)) {
-            const option = field.options.find((o) => o.uuid === c.value)
-            const values = [this.values[c.field_uuid]].flat()
-
-            return acc && !values.includes(this.optionValue(option, field.options.indexOf(option)))
+        const result = field.conditions.reduce((acc, cond) => {
+          if (cond.operation === 'or') {
+            acc.push(acc.pop() || this.checkFieldCondition(cond))
          } else {
-            return acc
+            acc.push(this.checkFieldCondition(cond))
          }
-        }, true)
+
+          return acc
+        }, [])
+
+        return !result.includes(false)
+      } else {
+        return true
+      }
+    },
+    checkFieldCondition (condition) {
+      const field = this.fieldsUuidIndex[condition.field_uuid]
+
+      if (['not_empty', 'checked', 'equal', 'contains'].includes(condition.action) && field && !this.checkFieldConditions(field)) {
+        return false
+      }
+
+      if (['empty', 'unchecked'].includes(condition.action)) {
+        return isEmpty(this.values[condition.field_uuid])
+      } else if (['not_empty', 'checked'].includes(condition.action)) {
+        return !isEmpty(this.values[condition.field_uuid])
+      } else if (['equal', 'contains'].includes(condition.action) && field) {
+        if (field.options) {
+          const option = field.options.find((o) => o.uuid === condition.value)
+          const values = [this.values[condition.field_uuid]].flat()
+
+          return values.includes(this.optionValue(option, field.options.indexOf(option)))
+        } else {
+          return [this.values[condition.field_uuid]].flat().includes(condition.value)
+        }
+      } else if (['not_equal', 'does_not_contain'].includes(condition.action) && field) {
+        const option = field.options.find((o) => o.uuid === condition.value)
+        const values = [this.values[condition.field_uuid]].flat()
+
+        return !values.includes(this.optionValue(option, field.options.indexOf(option)))
      } else {
        return true
      }
@@ -1054,6 +1316,10 @@ export default {
      const currentFieldUuids = this.currentStepFields.map((f) => f.uuid)
      const currentFieldType = this.currentField.type

+      if (!formData && !this.$refs.form.checkValidity()) {
+        return
+      }
+
      if (this.dryRun) {
        currentFieldUuids.forEach((fieldUuid) => {
          this.submittedValues[fieldUuid] = this.values[fieldUuid]
@@ -1089,16 +1355,24 @@ export default {
    scrollIntoArea (area) {
      return this.$refs.areas.scrollIntoArea(area)
    },
-    async submitStep () {
+    async submitStep (e) {
      this.isSubmitting = true

-      const stepPromise = ['signature', 'phone', 'initials', 'payment'].includes(this.currentField.type)
+      const forceComplete = e?.submitter?.getAttribute('name') === 'completed'
+
+      if (forceComplete) {
+        this.isSubmittingComplete = true
+      }
+
+      const submitStep = this.currentStep
+
+      const stepPromise = ['signature', 'phone', 'initials', 'payment', 'verification'].includes(this.currentField.type)
        ? this.$refs.currentStep.submit
        : () => Promise.resolve({})

      stepPromise().then(async () => {
        const emptyRequiredField = this.stepFields.find((fields, index) => {
-          if (index >= this.currentStep) {
+          if (forceComplete ? index === submitStep : index >= submitStep) {
            return false
          }

@@ -1108,9 +1382,9 @@ export default {
        })

        const formData = new FormData(this.$refs.form)
-        const isLastStep = this.currentStep === this.stepFields.length - 1
+        const isLastStep = (submitStep === this.stepFields.length - 1) || forceComplete

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

@@ -1126,22 +1400,22 @@ export default {
          if (response.status === 422 || response.status === 500) {
            const data = await response.json()

-            const i18nError = data.error ? this.t(data.error.replace(/\s+/g, '_').toLowerCase()) : ''
+            if (data.error) {
+              const i18nKey = data.error.replace(/\s+/g, '_').toLowerCase()

-            alert(i18nError !== data.error ? i18nError : (data.error || this.t('value_is_invalid')))
+              alert(this.t(i18nKey) !== i18nKey ? this.t(i18nKey) : data.error)
+            } else {
+              alert(this.t('value_is_invalid'))
+            }

            return Promise.reject(new Error(data.error))
          }

-          if (isLastStep) {
-            this.isSecondWalkthrough = true
-          }
-
-          const nextStep = (isLastStep && emptyRequiredField) || this.stepFields[this.currentStep + 1]
+          const nextStep = (isLastStep && emptyRequiredField) || (forceComplete ? null : this.stepFields[submitStep + 1])

          if (nextStep) {
            if (this.alwaysMinimize) {
-              this.isFormVisible = false
+              this.minimizeForm()
            }

            this.goToStep(this.stepFields.indexOf(nextStep), this.autoscrollFields)
@@ -1149,33 +1423,46 @@ export default {
            if (emptyRequiredField === nextStep) {
              this.showFillAllRequiredFields = true
            }
+          } else if (this.inviteSubmitters.length || this.optionalInviteSubmitters.length) {
+            this.isInvite = true
          } else {
-            this.isCompleted = true
-
-            const respData = await response.text()
-
-            if (respData) {
-              this.onComplete(JSON.parse(respData))
-            }
-
-            if (this.completedRedirectUrl) {
-              window.location.href = this.completedRedirectUrl
-            }
+            this.performComplete(response)
          }
        }).catch(error => {
          console.error(error)
        }).finally(() => {
          this.isSubmitting = false
+          this.isSubmittingComplete = false
        })
      }).catch(error => {
        if (error?.message === 'Image too small') {
-          alert('Signature is too small - please redraw.')
+          alert(this.t('signature_is_too_small_please_redraw'))
        } else {
          console.log(error)
        }
      }).finally(() => {
        this.isSubmitting = false
+        this.isSubmittingComplete = false
      })
+    },
+    minimizeForm () {
+      this.isFormVisible = false
+      this.isShowContinue = true
+    },
+    async performComplete (resp) {
+      this.isCompleted = true
+
+      if (resp?.text) {
+        const respData = await resp.text()
+
+        if (respData) {
+          this.onComplete(JSON.parse(respData))
+        }
+      }
+
+      if (this.completedRedirectUrl) {
+        window.location.href = this.completedRedirectUrl
+      }
    }
  }
 }
@@ -38,6 +38,11 @@ export default {
      required: false,
      default: () => []
    },
+    readonlyValues: {
+      type: Object,
+      required: false,
+      default: () => ({})
+    },
    values: {
      type: Object,
      required: false,
@@ -87,7 +92,7 @@ export default {
    },
    calculateFormula (field) {
      const transformedFormula = field.preferences.formula.replace(/{{(.*?)}}/g, (match, uuid) => {
-        return this.values[uuid] || 0.0
+        return this.readonlyValues[uuid] || this.values[uuid] || 0.0
      })

      return this.math.evaluate(transformedFormula.toLowerCase())
@@ -1,4 +1,10 @@
 const en = {
+  complete_all_required_fields_to_proceed_with_identity_verification: 'Complete all required fields to proceed with identity verification.',
+  verify_id: 'Verify ID',
+  identity_verification: 'Identity verification',
+  complete: 'Complete',
+  fill_all_required_fields_to_complete: 'Fill all required fields to complete',
+  sign_and_complete: 'Sign and Complete',
  text: 'Text',
  by_clicking_you_agree_to_the: 'By clicking "{button}", you agree to the',
  electronic_signature_disclosure: 'Electronic Signature Disclosure',
@@ -10,6 +16,8 @@ const en = {
  reviewed: 'Reviewed',
  other: 'Other',
  authored_by_me: 'Authored by me',
+  invite: 'Invite',
+  email: 'Email',
  approved_by: 'Approved by',
  reviewed_by: 'Reviewed by',
  authored_by: 'Authored by',
@@ -36,7 +44,8 @@ const en = {
  minimize: 'Minimize',
  payment: 'Payment',
  phone: 'Phone',
-  submit_form: 'Submit Form',
+  start_now: 'Start Now',
+  continue: 'Continue',
  sign_now: 'Sign Now',
  type_here_: 'Type here...',
  optional: 'optional',
@@ -57,9 +66,11 @@ const en = {
  type_signature_here: 'Type signature here',
  type_initial_here: 'Type initials here',
  form_has_been_completed: 'Form has been completed!',
+  document_has_been_signed: 'Document has been signed!',
+  documents_have_been_signed: 'Documents have been signed!',
  create_a_free_account: 'Create a Free Account',
-  signed_with: 'Signed with',
-  please_check_the_box_to_continue: 'Please check the box to continue',
+  powered_by: 'Powered by',
+  please_check_the_box_to_continue: 'Please check the box to continue.',
  open_source_documents_software: 'open source documents software',
  verified_phone_number: 'Verify Phone Number',
  use_international_format: 'Use international format: +1xxx',
@@ -81,10 +92,20 @@ const en = {
  pay_with_strip: 'Pay with Stripe',
  reupload: 'Reupload',
  upload: 'Upload',
-  files: 'Files'
+  files: 'Files',
+  signature_is_too_small_please_redraw: 'Signature is too small. Please redraw.',
+  wait_countdown_seconds: 'Wait {countdown} seconds'
 }

 const es = {
+  complete_all_required_fields_to_proceed_with_identity_verification: 'Complete todos los campos requeridos para continuar con la verificación de identidad.',
+  verify_id: 'Verificar ID',
+  identity_verification: 'Verificación de identidad',
+  complete: 'Completar',
+  fill_all_required_fields_to_complete: 'Complete todos los campos requeridos para finalizar',
+  sign_and_complete: 'Firmar y Completar',
+  invite: 'Invitar',
+  email: 'Correo electrónico',
  approved: 'Aprobado',
  reviewed: 'Revisado',
  other: 'Otro',
@@ -122,7 +143,8 @@ const es = {
  payment: 'Pago',
  phone: 'Teléfono',
  take_photo: 'Tomar foto',
-  submit_form: 'Enviar Formulario',
+  start_now: 'Comenzar ahora',
+  continue: 'Continuar',
  sign_now: 'Firmar ahora',
  type_here_: 'Escribe aquí...',
  optional: 'opcional',
@@ -142,9 +164,11 @@ const es = {
  type_signature_here: 'Escribe la firma aquí',
  type_initial_here: 'Escribe las iniciales aquí',
  form_has_been_completed: '¡El formulario ha sido completado!',
+  document_has_been_signed: '¡El documento ha sido firmado!',
+  documents_have_been_signed: '¡Los documentos han sido firmados!',
  create_a_free_account: 'Crear una Cuenta Gratuita',
-  signed_with: 'Firmado con',
-  please_check_the_box_to_continue: 'Por favor marque la casilla para continuar',
+  powered_by: 'Desarrollado por',
+  please_check_the_box_to_continue: 'Por favor marque la casilla para continuar.',
  open_source_documents_software: 'software de documentos de código abierto',
  verified_phone_number: 'Verificar número de teléfono',
  use_international_format: 'Usar formato internacional: +1xxx',
@@ -166,10 +190,20 @@ const es = {
  pay_with_strip: 'Pagar con Stripe',
  reupload: 'Volver a subir',
  upload: 'Subir',
-  files: 'Archivos'
+  files: 'Archivos',
+  signature_is_too_small_please_redraw: 'La firma es demasiado pequeña. Por favor, dibújala de nuevo.',
+  wait_countdown_seconds: 'Espera {countdown} segundos'
 }

 const it = {
+  complete_all_required_fields_to_proceed_with_identity_verification: "Compila tutti i campi obbligatori per procedere con la verifica dell'identità.",
+  verify_id: 'Verifica ID',
+  identity_verification: "Verifica dell'identità",
+  complete: 'Completa',
+  fill_all_required_fields_to_complete: 'Compila tutti i campi obbligatori per completare',
+  sign_and_complete: 'Firma e Completa',
+  invite: 'Invita',
+  email: 'Email',
  approved: 'Approvato',
  reviewed: 'Revisionato',
  other: 'Altro',
@@ -198,7 +232,7 @@ const it = {
  pay: 'Pagamento',
  file: 'File',
  select: 'Seleziona',
-  checkbox: 'Casella di controllo',
+  checkbox: 'Checkbox',
  multiple: 'Multiplo',
  radio: 'Radio',
  cells: 'Celle',
@@ -206,7 +240,8 @@ const it = {
  payment: 'Pagamento',
  number_phone_is_invalid: '{number} telefono non è valido',
  phone: 'Telefono',
-  submit_form: 'Invia Modulo',
+  start_now: 'Inizia ora',
+  continue: 'Continua',
  sign_now: 'Firma ora',
  type_here_: 'Digita qui...',
  optional: 'opzionale',
@@ -227,9 +262,11 @@ const it = {
  type_signature_here: 'Scrivi la firma qui',
  type_initial_here: 'Scrivi le iniziali qui',
  form_has_been_completed: 'Il modulo è stato completato!',
+  document_has_been_signed: 'Il documento è stato firmato!',
+  documents_have_been_signed: 'I documenti sono stati firmati!',
  create_a_free_account: 'Crea un Account Gratuito',
-  signed_with: 'Firmato con',
-  please_check_the_box_to_continue: 'Si prega di spuntare la casella per continuare',
+  powered_by: 'Desarrollado por',
+  please_check_the_box_to_continue: 'Si prega di spuntare la casella per continuare.',
  open_source_documents_software: 'software di documenti open source',
  verified_phone_number: 'Verifica numero di telefono',
  use_international_format: 'Usa formato internazionale: +1xxx',
@@ -251,10 +288,20 @@ const it = {
  pay_with_strip: 'Paga con Stripe',
  reupload: 'Ricarica',
  upload: 'Carica',
-  files: 'File'
+  files: 'File',
+  signature_is_too_small_please_redraw: 'La firma è troppo piccola. Ridisegnala per favore.',
+  wait_countdown_seconds: 'Attendi {countdown} secondi'
 }

 const de = {
+  complete_all_required_fields_to_proceed_with_identity_verification: 'Vervollständigen Sie alle erforderlichen Felder, um mit der Identitätsverifizierung fortzufahren.',
+  verify_id: 'ID überprüfen',
+  identity_verification: 'Identitätsüberprüfung',
+  complete: 'Abschließen',
+  fill_all_required_fields_to_complete: 'Alle erforderlichen Felder ausfüllen, um abzuschließen',
+  sign_and_complete: 'Signieren und Abschließen',
+  invite: 'Einladen',
+  email: 'E-Mail',
  approved: 'Genehmigt',
  reviewed: 'Überprüft',
  other: 'Andere',
@@ -291,7 +338,8 @@ const de = {
  payment: 'Zahlung',
  number_phone_is_invalid: '{number} Telefonnummer ist ungültig',
  phone: 'Telefon',
-  submit_form: 'Formular absenden',
+  start_now: 'Jetzt starten',
+  continue: 'Fortsetzen',
  sign_now: 'Jetzt unterschreiben',
  type_here_: 'Hier eingeben...',
  optional: 'optional',
@@ -312,9 +360,11 @@ const de = {
  type_signature_here: 'Unterschrift hier eingeben',
  type_initial_here: 'Initialen hier eingeben',
  form_has_been_completed: 'Formular wurde ausgefüllt!',
+  document_has_been_signed: 'Dokument wurde unterschrieben!',
+  documents_have_been_signed: 'Dokumente wurden unterschrieben!',
  create_a_free_account: 'Kostenloses Konto erstellen',
-  signed_with: 'Unterschrieben mit',
-  please_check_the_box_to_continue: 'Bitte setzen Sie das Häkchen, um fortzufahren',
+  powered_by: 'Bereitgestellt von',
+  please_check_the_box_to_continue: 'Bitte setzen Sie das Häkchen, um fortzufahren.',
  open_source_documents_software: 'Open-Source-Dokumentensoftware',
  verified_phone_number: 'Telefonnummer überprüfen',
  use_international_format: 'Internationales Format verwenden: +1xxx',
@@ -336,10 +386,20 @@ const de = {
  pay_with_strip: 'Mit Stripe bezahlen',
  reupload: 'Erneut hochladen',
  upload: 'Hochladen',
-  files: 'Dateien'
+  files: 'Dateien',
+  signature_is_too_small_please_redraw: 'Die Unterschrift ist zu klein. Bitte erneut zeichnen.',
+  wait_countdown_seconds: 'Warte {countdown} Sekunden'
 }

 const fr = {
+  complete_all_required_fields_to_proceed_with_identity_verification: "Veuillez remplir tous les champs obligatoires pour continuer la vérification de l'identité.",
+  verif_id: "Vérification de l'ID",
+  verif_identite: "Vérification de l'identité",
+  complete: 'Terminer',
+  fill_all_required_fields_to_complete: 'Veuillez remplir tous les champs obligatoires pour compléter',
+  sign_and_complete: 'Signer et Terminer',
+  invite: 'Inviter',
+  email: 'Courriel',
  approved: 'Approuvé',
  reviewed: 'Révisé',
  other: 'Autre',
@@ -376,7 +436,8 @@ const fr = {
  payment: 'Paiement',
  number_phone_is_invalid: '{number} téléphone est invalide',
  phone: 'Téléphone',
-  submit_form: 'Envoyer le Formulaire',
+  start_now: 'Commencer maintenant',
+  continue: 'Continuer',
  sign_now: 'Signer maintenant',
  type_here_: 'Tapez ici...',
  optional: 'facultatif',
@@ -397,9 +458,11 @@ const fr = {
  type_signature_here: 'Tapez la signature ici',
  type_initial_here: 'Tapez les initiales ici',
  form_has_been_completed: 'Le formulaire a été complété !',
+  document_has_been_signed: 'Le document a été signé!',
+  documents_have_been_signed: 'Les documents ont été signés!',
  create_a_free_account: 'Créer un Compte Gratuit',
-  signed_with: 'Signé avec',
-  please_check_the_box_to_continue: 'Veuillez cocher la case pour continuer',
+  powered_by: 'Propulsé par',
+  please_check_the_box_to_continue: 'Veuillez cocher la case pour continuer.',
  open_source_documents_software: 'logiciel de documents open source',
  verified_phone_number: 'Vérifier le numéro de téléphone',
  use_international_format: 'Utiliser le format international : +1xxx',
@@ -421,10 +484,20 @@ const fr = {
  pay_with_strip: 'Paiement avec Stripe',
  reupload: 'Recharger',
  upload: 'Télécharger',
-  files: 'Fichiers'
+  files: 'Fichiers',
+  signature_is_too_small_please_redraw: 'La signature est trop petite. Veuillez la redessiner.',
+  wait_countdown_seconds: 'Attendez {countdown} secondes'
 }

 const pl = {
+  complete_all_required_fields_to_proceed_with_identity_verification: 'Uzupełnij wszystkie wymagane pola, aby kontynuować weryfikację tożsamości.',
+  verify_id: 'Zweryfikuj ID',
+  identity_verification: 'Weryfikacja tożsamości',
+  complete: 'Zakończ',
+  fill_all_required_fields_to_complete: 'Uzupełnij wszystkie wymagane pola, aby zakończyć',
+  sign_and_complete: 'Podpisz i zakończ',
+  invite: 'Zaproś',
+  email: 'E-mail',
  approved: 'Zaakceptowany',
  reviewed: 'Przejrzany',
  other: 'Inny',
@@ -461,7 +534,8 @@ const pl = {
  payment: 'Płatność',
  number_phone_is_invalid: '{number} telefon jest nieprawidłowy',
  phone: 'Telefon',
-  submit_form: 'Wyślij Formularz',
+  start_now: 'Zacznij teraz',
+  continue: 'Kontynuuj',
  sign_now: 'Podpisz teraz',
  type_here_: 'Wpisz tutaj...',
  optional: 'opcjonalny',
@@ -482,9 +556,11 @@ const pl = {
  type_signature_here: 'Wpisz podpis tutaj',
  type_initial_here: 'Wpisz inicjały tutaj',
  form_has_been_completed: 'Formularz został wypełniony!',
+  document_has_been_signed: 'Dokument został podpisany!',
+  documents_have_been_signed: 'Dokumenty zostały podpisane!',
  create_a_free_account: 'Utwórz darmowe konto',
-  signed_with: 'Podpisane za pomocą',
-  please_check_the_box_to_continue: 'Proszę zaznaczyć pole, aby kontynuować',
+  powered_by: 'Napędzany przez',
+  please_check_the_box_to_continue: 'Proszę zaznaczyć pole, aby kontynuować.',
  open_source_documents_software: 'oprogramowanie do dokumentów open source',
  verified_phone_number: 'Zweryfikuj numer telefonu',
  use_international_format: 'Użyj międzynarodowego formatu: +1xxx',
@@ -506,10 +582,19 @@ const pl = {
  pay_with_strip: 'Płatność za pomocą Stripe',
  reupload: 'Ponowne przesłanie',
  upload: 'Przesyłanie',
-  files: 'Pliki'
+  files: 'Pliki',
+  signature_is_too_small_please_redraw: 'Podpis jest zbyt mały. Proszę narysować go ponownie.'
 }

 const uk = {
+  complete_all_required_fields_to_proceed_with_identity_verification: "Заповніть всі обов'язкові поля, щоб продовжити перевірку особи.",
+  verify_id: 'Підтвердження ідентичності',
+  identity_verification: 'Ідентифікація особи',
+  complete: 'Завершити',
+  fill_all_required_fields_to_complete: "Заповніть всі обов'язкові поля для завершення",
+  sign_and_complete: 'Підписати і завершити',
+  invite: 'Запросити',
+  email: 'Електронна пошта',
  approved: 'Затверджено',
  reviewed: 'Переглянуто',
  other: 'Інше',
@@ -546,7 +631,8 @@ const uk = {
  payment: 'Платіж',
  number_phone_is_invalid: '{number} телефон недійсний',
  phone: 'Телефон',
-  submit_form: 'Надіслати Форму',
+  start_now: 'Почати зараз',
+  continue: 'Продовжити',
  sign_now: 'Підписати зараз',
  type_here_: 'Введіть тут',
  optional: 'необов’язково',
@@ -567,9 +653,11 @@ const uk = {
  type_signature_here: 'Введіть підпис тут',
  type_initial_here: 'Введіть ініціали тут',
  form_has_been_completed: 'Форму заповнено!',
+  document_has_been_signed: 'Документ був підписаний!',
+  documents_have_been_signed: 'Документи були підписані!',
  create_a_free_account: 'Створити безкоштовний обліковий запис',
-  signed_with: 'Підписано за допомогою',
-  please_check_the_box_to_continue: 'Будь ласка, позначте прапорець, щоб продовжити',
+  powered_by: 'Працює на базі',
+  please_check_the_box_to_continue: 'Будь ласка, позначте прапорець, щоб продовжити.',
  open_source_documents_software: 'відкритий програмний засіб для документів',
  verified_phone_number: 'Підтвердіть номер телефону',
  use_international_format: 'Використовуйте міжнародний формат: +1xxx',
@@ -591,10 +679,20 @@ const uk = {
  pay_with_strip: 'Сплатити за допомогою Stripe',
  reupload: 'Перезавантажити',
  upload: 'Завантажити',
-  files: 'Файли'
+  files: 'Файли',
+  signature_is_too_small_please_redraw: 'Підпис занадто малий. Будь ласка, перемалюйте його.',
+  wait_countdown_seconds: 'Зачекайте {countdown} секунд'
 }

 const cs = {
+  complete_all_required_fields_to_proceed_with_identity_verification: 'Vyplňte všechna povinná pole, abyste mohli pokračovat v ověření identity.',
+  verify_id: 'Ověřit ID',
+  identity_verification: 'Ověření identity',
+  complete: 'Dokončit',
+  fill_all_required_fields_to_complete: 'Please complete all mandatory fields',
+  sign_and_complete: 'Podepsat a dokončit',
+  invite: 'Pozvat',
+  email: 'E-mail',
  approved: 'Schváleno',
  reviewed: 'Zkontrolováno',
  other: 'Jiné',
@@ -631,7 +729,8 @@ const cs = {
  payment: 'Platba',
  phone: 'Telefon',
  number_phone_is_invalid: '{number} telefon je neplatný',
-  submit_form: 'Odeslat formulář',
+  start_now: 'Začít nyní',
+  continue: 'Pokračovat',
  sign_now: 'Podepsat nyní',
  type_here_: 'Zadejte zde',
  optional: 'volitelné',
@@ -652,9 +751,11 @@ const cs = {
  type_signature_here: 'Sem zadejte podpis',
  type_initial_here: 'Sem zadejte iniciály',
  form_has_been_completed: 'Formulář byl dokončen!',
+  document_has_been_signed: 'Dokument byl podepsán!',
+  documents_have_been_signed: 'Dokumenty byly podepsány!',
  create_a_free_account: 'Vytvořit bezplatný účet',
-  signed_with: 'Podepsáno pomocí',
-  please_check_the_box_to_continue: 'Prosím, zaškrtněte políčko pro pokračování',
+  powered_by: 'Poháněno',
+  please_check_the_box_to_continue: 'Prosím, zaškrtněte políčko pro pokračování.',
  open_source_documents_software: 'open source software pro dokumenty',
  verified_phone_number: 'Ověřte telefonní číslo',
  use_international_format: 'Použijte mezinárodní formát: +1xxx',
@@ -676,10 +777,20 @@ const cs = {
  pay_with_strip: 'Zaplacení přes Stripe',
  reupload: 'Znovu nahrát',
  upload: 'Nahrát',
-  files: 'Soubory'
+  files: 'Soubory',
+  signature_is_too_small_please_redraw: 'Podpis je příliš malý. Prosím, překreslete ho.',
+  wait_countdown_seconds: 'Počkejte {countdown} sekund'
 }

 const pt = {
+  complete_all_required_fields_to_proceed_with_identity_verification: 'Preencha todos os campos obrigatórios para prosseguir com a verificação de identidade.',
+  verify_id: 'Verificar ID',
+  identity_verification: 'Verificação de identidade',
+  complete: 'Completar',
+  fill_all_required_fields_to_complete: 'Preencher todos os campos obrigatórios para concluir',
+  sign_and_complete: 'Assinar e Completar',
+  invite: 'Convidar',
+  email: 'E-mail',
  approved: 'Aprovado',
  reviewed: 'Revisado',
  other: 'Outro',
@@ -716,7 +827,8 @@ const pt = {
  payment: 'Pagamento',
  number_phone_is_invalid: '{number} telefone é inválido',
  phone: 'Telefone',
-  submit_form: 'Enviar Formulário',
+  start_now: 'Começar agora',
+  continue: 'Continuar',
  sign_now: 'Assinar agora',
  type_here_: 'Digite aqui',
  optional: 'opcional',
@@ -737,9 +849,11 @@ const pt = {
  type_signature_here: 'Digite a assinatura aqui',
  type_initial_here: 'Digite as iniciais aqui',
  form_has_been_completed: 'O formulário foi concluído!',
+  document_has_been_signed: 'O documento foi assinado!',
+  documents_have_been_signed: 'Os documentos foram assinados!',
  create_a_free_account: 'Criar uma Conta Gratuita',
-  signed_with: 'Assinado com',
-  please_check_the_box_to_continue: 'Por favor, marque a caixa para continuar',
+  powered_by: 'Desenvolvido por',
+  please_check_the_box_to_continue: 'Por favor, marque a caixa para continuar.',
  open_source_documents_software: 'software de documentos de código aberto',
  verified_phone_number: 'Verificar Número de Telefone',
  use_international_format: 'Use formato internacional: +1xxx',
@@ -761,10 +875,20 @@ const pt = {
  pay_with_strip: 'Pagar com Stripe',
  reupload: 'Reenviar',
  upload: 'Carregar',
-  files: 'Arquivos'
+  files: 'Arquivos',
+  signature_is_too_small_please_redraw: 'A assinatura é muito pequena. Por favor, redesenhe-a.',
+  wait_countdown_seconds: 'Aguarde {countdown} segundos'
 }

 const he = {
+  complete_all_required_fields_to_proceed_with_identity_verification: 'מלא את כל השדות הנדרשים כדי להמשיך עם אימות זהות.',
+  verify_id: 'אמת מזהה',
+  identity_verification: 'אימות זהות',
+  complete: 'השלם',
+  fill_all_required_fields_to_complete: 'נא למלא את כל השדות הנדרשים להשלמה',
+  sign_and_complete: 'חתום והשלם',
+  invite: 'הזמן',
+  email: 'דוא"ל',
  approved: 'מאושר',
  reviewed: 'נסקר',
  other: 'אחר',
@@ -801,7 +925,8 @@ const he = {
  payment: 'תשלום',
  phone: 'טלפון',
  number_phone_is_invalid: '{number} טלפון אינו חוקי',
-  submit_form: 'שלח טופס',
+  start_now: 'התחל עכשיו',
+  continue: 'המשך',
  sign_now: 'חתום כעת',
  type_here_: 'הקלד כאן',
  optional: 'אופציונלי',
@@ -823,9 +948,11 @@ const he = {
  type_signature_here: 'הקלד חתימה כאן',
  type_initial_here: 'הקלד ציוני ראשי תיבות כאן',
  form_has_been_completed: 'הטופס הושלם',
+  document_has_been_signed: 'המסמך נחתם!',
+  documents_have_been_signed: 'המסמכים נחתמו!',
  create_a_free_account: 'צור חשבון חינם',
-  signed_with: 'חתום באמצעות',
-  please_check_the_box_to_continue: 'אנא סמן את התיבה כדי להמשיך',
+  powered_by: 'מופעל על ידי',
+  please_check_the_box_to_continue: 'אנא סמן את התיבה כדי להמשיך.',
  open_source_documents_software: 'תוכנה פתוחה למסמכים',
  verified_phone_number: 'אימות מספר טלפון',
  use_international_format: 'השתמש בפורמט בינלאומי: +1xxx',
@@ -847,10 +974,20 @@ const he = {
  pay_with_strip: 'שלם עם סטרייפ',
  reupload: 'העלה שוב',
  upload: 'העלאה',
-  files: 'קבצים'
+  files: 'קבצים',
+  signature_is_too_small_please_redraw: 'החתימה קטנה מדי. אנא צייר מחדש.',
+  wait_countdown_seconds: 'המתן {countdown} שניות'
 }

 const nl = {
+  complete_all_required_fields_to_proceed_with_identity_verification: 'Vul alle verplichte velden in om door te gaan met de identiteitsverificatie.',
+  verify_id: 'Verifiëren ID',
+  identity_verification: 'Identiteitsverificatie',
+  complete: 'Voltooien',
+  fill_all_required_fields_to_complete: 'Vul alle verplichte velden in om te voltooien',
+  sign_and_complete: 'Ondertekenen en voltooien',
+  invite: 'Uitnodigen',
+  email: 'E-mail',
  approved: 'Goedgekeurd',
  reviewed: 'Beoordeeld',
  other: 'Anders',
@@ -888,7 +1025,8 @@ const nl = {
  payment: 'Betaling',
  phone: 'Telefoon',
  number_phone_is_invalid: '{number} telefoon is ongeldig',
-  submit_form: 'Formulier verzenden',
+  start_now: 'Nu beginnen',
+  continue: 'Doorgaan',
  sign_now: 'Nu ondertekenen',
  type_here_: 'Typ hier...',
  optional: 'Optioneel',
@@ -909,9 +1047,11 @@ const nl = {
  type_signature_here: 'Typ hier uw handtekening',
  type_initial_here: 'Typ hier uw initialen',
  form_has_been_completed: 'Formulier is voltooid!',
+  document_has_been_signed: 'Document is ondertekend!',
+  documents_have_been_signed: 'De documenten zijn ondertekend!',
  create_a_free_account: 'Maak een gratis account aan',
-  signed_with: 'Ondertekend met',
-  please_check_the_box_to_continue: 'Vink het vakje aan om door te gaan',
+  powered_by: 'Aangedreven door',
+  please_check_the_box_to_continue: 'Vink het vakje aan om door te gaan.',
  open_source_documents_software: 'Open source documenten software',
  verified_phone_number: 'Geverifieerd telefoonnummer',
  use_international_format: 'Gebruik internationaal formaat: +1xxx',
@@ -933,10 +1073,20 @@ const nl = {
  pay_with_strip: 'Betalen met Stripe',
  reupload: 'Opnieuw uploaden',
  upload: 'Uploaden',
-  files: 'Bestanden'
+  files: 'Bestanden',
+  signature_is_too_small_please_redraw: 'De handtekening is te klein. Teken deze opnieuw, alstublieft.',
+  wait_countdown_seconds: 'Wacht {countdown} seconden'
 }

 const ar = {
+  complete_all_required_fields_to_proceed_with_identity_verification: 'أكمل جميع الحقول المطلوبة للمتابعة في التحقق من الهوية.',
+  verify_id: 'تحقق من الهوية',
+  identity_verification: 'التحقق من الهوية',
+  complete: 'اكتمال',
+  fill_all_required_fields_to_complete: 'يرجى ملء جميع الحقول المطلوبة لإكمال',
+  sign_and_complete: 'التوقيع والاكتمال',
+  invite: 'دعوة',
+  email: 'البريد الإلكتروني',
  approved: 'موافق عليه',
  reviewed: 'تمت مراجعته',
  other: 'آخر',
@@ -973,7 +1123,8 @@ const ar = {
  payment: 'الدفع',
  phone: 'هاتف',
  number_phone_is_invalid: '{number} هاتف غير صالح',
-  submit_form: 'إرسال النموذج',
+  start_now: 'ابدأ الآن',
+  continue: 'متابعة',
  sign_now: 'وقع الآن',
  type_here_: 'اكتب هنا',
  optional: 'اختياري',
@@ -994,9 +1145,11 @@ const ar = {
  type_signature_here: 'اكتب التوقيع هنا',
  type_initial_here: 'اكتب الاختصارات هنا',
  form_has_been_completed: 'تم إكمال النموذج!',
+  document_has_been_signed: 'تم توقيع الوثيقة!',
+  documents_have_been_signed: 'تم توقيع الوثائق!',
  create_a_free_account: 'إنشاء حساب مجاني',
-  signed_with: 'تم التوقيع بواسطة',
-  please_check_the_box_to_continue: 'الرجاء التحقق من الخانة للمتابعة',
+  powered_by: 'مدعوم من',
+  please_check_the_box_to_continue: 'الرجاء التحقق من الخانة للمتابعة.',
  open_source_documents_software: 'برنامج وثائق مفتوح المصدر',
  verified_phone_number: 'تحقق من رقم الهاتف',
  use_international_format: 'استخدم الشكل الدولي: +1xxx',
@@ -1018,10 +1171,20 @@ const ar = {
  pay_with_strip: 'الدفع بواسطة Stripe',
  reupload: 'إعادة التحميل',
  upload: 'تحميل',
-  files: 'الملفات'
+  files: 'الملفات',
+  signature_is_too_small_please_redraw: 'التوقيع صغير جدًا. يرجى إعادة الرسم.',
+  wait_countdown_seconds: 'انتظر {countdown} ثانية'
 }

 const ko = {
+  complete_all_required_fields_to_proceed_with_identity_verification: '신원 확인을 진행하려면 모든 필수 필드를 작성하십시오.',
+  verify_id: '아이디 확인',
+  identity_verification: '신원 확인',
+  complete: '완료',
+  fill_all_required_fields_to_complete: '모든 필수 필드를 작성하여 완료하세요',
+  sign_and_complete: '서명하고 완료하기',
+  invite: '초대하기',
+  email: '이메일',
  approved: '승인됨',
  reviewed: '검토됨',
  other: '기타',
@@ -1057,7 +1220,8 @@ const ko = {
  payment: '결제',
  phone: '전화',
  number_phone_is_invalid: '{number} 전화번호가 유효하지 않습니다',
-  submit_form: '양식 제출',
+  start_now: '지금 시작하기',
+  continue: '계속하다',
  sign_now: '지금 서명',
  type_here_: '여기에 입력...',
  optional: '선택 사항',
@@ -1078,9 +1242,11 @@ const ko = {
  type_signature_here: '여기에 서명 입력',
  type_initial_here: '여기에 이니셜 입력',
  form_has_been_completed: '양식이 완료되었습니다!',
+  document_has_been_signed: '문서가 서명되었습니다!',
+  documents_have_been_signed: '문서가 서명되었습니다!',
  create_a_free_account: '무료 계정 생성',
-  signed_with: '다음으로 서명:',
-  please_check_the_box_to_continue: '계속하려면 확인란을 선택하십시오',
+  powered_by: '구동',
+  please_check_the_box_to_continue: '계속하려면 확인란을 선택하십시오.',
  open_source_documents_software: '오픈 소스 문서 소프트웨어',
  verified_phone_number: '전화번호 확인됨',
  use_international_format: '국제 포맷 사용: +1xxx',
@@ -1102,7 +1268,9 @@ const ko = {
  pay_with_strip: '스트라이프로 결제',
  reupload: '다시 업로드',
  upload: '업로드',
-  files: '파일'
+  files: '파일',
+  signature_is_too_small_please_redraw: '서명이 너무 작습니다. 다시 그려주세요.',
+  wait_countdown_seconds: '{countdown}초 기다리세요'
 }

 const i18n = { en, es, it, de, fr, pl, uk, cs, pt, he, nl, ar, ko }
--- a/Show More
+++ b/Show More