diff --git a/.github/workflows/capture-sdk.check.yml b/.github/workflows/capture-sdk.check.yml
index 060a26990a..cb9f8092ef 100644
--- a/.github/workflows/capture-sdk.check.yml
+++ b/.github/workflows/capture-sdk.check.yml
@@ -62,6 +62,65 @@ jobs:
 #          name: capture-sdk-unit-test-coverage
 #          path: capture-sdk/sdk/build/jacoco/jacocoHtml
 
+  instrumented-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+
+      - name: setup java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'gradle'
+
+      - name: enable KVM group perms for emulator
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: avd cache
+        uses: actions/cache@v4
+        id: avd-cache
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: avd-x86_64-33-${{ github.ref_name }}
+
+      - name: create avd and generate snapshot for caching
+        if: steps.avd-cache.outputs.cache-hit != 'true'
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: 33
+          arch: x86_64
+          force-avd-creation: false
+          emulator-options: -no-window -gpu swiftshader_indirect -no-audio -no-boot-anim -camera-back none
+          disable-animations: true
+          script: echo "Generated AVD snapshot for caching."
+
+      - name: run instrumented tests
+        timeout-minutes: 20
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: 33
+          arch: x86_64
+          force-avd-creation: false
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: true
+          script: >
+            adb uninstall net.gini.android.capture.test ; 
+            ./gradlew capture-sdk:sdk:connectedCheck
+
+      - name: archive instrumented test results
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: capture-sdk-instrumented-test-results
+          path: capture-sdk/sdk/build/outputs/androidTest-results/connected
+
   default-network-test:
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/merchant-sdk.check.yml b/.github/workflows/merchant-sdk.check.yml
new file mode 100644
index 0000000000..1569337013
--- /dev/null
+++ b/.github/workflows/merchant-sdk.check.yml
@@ -0,0 +1,157 @@
+name: Check Merchant SDK
+
+on:
+  push:
+    paths:
+      - 'merchant-sdk/**'
+      - 'health-api-library/**'
+      - 'core-api-library/**'
+      - 'gradle/**'
+    branches:
+      - '**'
+    tags-ignore:
+      - '**'
+  pull_request:
+    types: [opened, edited, reopened]
+    paths:
+      - 'merchant-sdk/**'
+      - 'health-api-library/**'
+      - 'core-api-library/**'
+      - 'gradle/**'
+  workflow_call:
+    secrets:
+      GINI_MOBILE_TEST_CLIENT_SECRET:
+        required: true
+      MERCHANT_SDK_EXAMPLE_APP_KEYSTORE_PASSWORD:
+        required: true
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+
+      - name: setup java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'gradle'
+
+      - name: run unit tests
+        run: ./gradlew merchant-sdk:sdk:testDebugUnitTest
+
+      - name: archive unit test results
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: merchant-sdk-unit-test-results
+          path: merchant-sdk/sdk/build/reports/tests
+
+  build-example-app:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'gradle'
+
+      - name: build release example app for QA
+        run: >
+          ./gradlew merchant-sdk:example-app:assembleQaRelease
+          -PclientId="gini-mobile-test" 
+          -PclientSecret="${{ secrets.GINI_MOBILE_TEST_CLIENT_SECRET }}"
+          -PreleaseKeystoreFile="merchant_sdk_example.jks"
+          -PreleaseKeystorePassword='${{ secrets.MERCHANT_SDK_EXAMPLE_APP_KEYSTORE_PASSWORD }}'
+          -PreleaseKeyAlias="merchant_sdk_example"
+          -PreleaseKeyPassword='${{ secrets.MERCHANT_SDK_EXAMPLE_APP_KEYSTORE_PASSWORD }}'
+
+      - name: archive release example app for QA
+        uses: actions/upload-artifact@v3
+        with:
+          name: merchant-sdk-example-app-qa-release
+          path: merchant-sdk/example-app/build/outputs/apk/qa/release
+
+      - name: build release example app for production
+        run: >
+          ./gradlew merchant-sdk:example-app:assembleProdRelease 
+          -PclientId="gini-mobile-test" 
+          -PclientSecret="${{ secrets.GINI_MOBILE_TEST_CLIENT_SECRET }}"
+          -PreleaseKeystoreFile="merchant_sdk_example.jks"
+          -PreleaseKeystorePassword='${{ secrets.MERCHANT_SDK_EXAMPLE_APP_KEYSTORE_PASSWORD }}'
+          -PreleaseKeyAlias="merchant_sdk_example"
+          -PreleaseKeyPassword='${{ secrets.MERCHANT_SDK_EXAMPLE_APP_KEYSTORE_PASSWORD }}'
+
+      - name: archive release example app for production
+        uses: actions/upload-artifact@v3
+        with:
+          name: merchant-sdk-example-app-prod-release
+          path: merchant-sdk/example-app/build/outputs/apk/prod/release
+
+  android-lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'gradle'
+
+      - name: run android lint
+        run: ./gradlew merchant-sdk:sdk:lint
+
+      - name: archive android lint report
+        uses: actions/upload-artifact@v3
+        with:
+          name: merchant-sdk-android-lint-report
+          path: merchant-sdk/sdk/build/reports/lint-results*.html
+
+  detekt:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'gradle'
+
+      - name: run detekt
+        run: ./gradlew merchant-sdk:sdk:detekt
+
+      - name: archive detekt report
+        uses: actions/upload-artifact@v3
+        with:
+          name: merchant-sdk-detekt-report
+          path: merchant-sdk/sdk/build/reports/detekt/*.html
+
+  ktlint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'gradle'
+
+      - name: run ktlint
+        run: ./gradlew merchant-sdk:sdk:ktlintCheck
+
+      - name: archive ktlint report
+        uses: actions/upload-artifact@v3
+        with:
+          name: merchant-sdk-ktlint-report
+          path: merchant-sdk/sdk/build/reports/ktlint/**/*.html
diff --git a/.github/workflows/merchant-sdk.docs.build.yml b/.github/workflows/merchant-sdk.docs.build.yml
new file mode 100644
index 0000000000..40fe3e989c
--- /dev/null
+++ b/.github/workflows/merchant-sdk.docs.build.yml
@@ -0,0 +1,55 @@
+name: Build docs for Merchant SDK
+
+on:
+  push:
+    paths:
+      - 'merchant-sdk/**'
+    branches:
+      - '**'
+    tags-ignore:
+      - '**'
+  pull_request:
+    types: [opened, edited, reopened]
+    paths:
+      - 'merchant-sdk/**'
+
+jobs:
+  build-docs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+
+      - name: setup java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'gradle'
+
+      - name: setup python
+        uses: actions/setup-python@v4
+        with:
+          python-version: 'pypy2.7'
+
+      - name: setup ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.2.0'
+          bundler-cache: true
+
+      - name: build documentation
+        uses: maierj/fastlane-action@v3.0.0
+        with:
+          lane: 'build_documentation'
+          options: >
+            { 
+              "project_id": "merchant-sdk", 
+              "module_id": "sdk"
+            }
+
+      - name: archive documentation
+        uses: actions/upload-artifact@v3
+        with:
+          name: merchant-sdk-documentation
+          path: merchant-sdk/sdk/build/docs
\ No newline at end of file
diff --git a/.github/workflows/merchant-sdk.docs.release.yml b/.github/workflows/merchant-sdk.docs.release.yml
new file mode 100644
index 0000000000..1b46426435
--- /dev/null
+++ b/.github/workflows/merchant-sdk.docs.release.yml
@@ -0,0 +1,75 @@
+name: Release docs for Merchant SDK
+
+on:
+  push:
+    tags:
+      - 'merchant-sdk;[0-9]+.[0-9]+.[0-9]+;doc**'
+      - 'merchant-sdk;[0-9]+.[0-9]+.[0-9]+-beta[0-9][0-9];doc**'
+  workflow_call:
+    secrets:
+      RELEASE_GITHUB_USER:
+        required: true
+      RELEASE_GITHUB_PASSWORD:
+        required: true
+
+jobs:
+  release-docs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: get branch name
+        id: branch
+        shell: bash
+        run: |
+          # Get the branch ref that contains the tag in github.ref
+          # (github.ref contains the tag because this workflow is triggered by tags: 
+          # https://docs.github.com/en/actions/learn-github-actions/contexts#github-context)
+          branch_ref=$(git branch -r --contains "${{ github.ref }}")
+          # Remove "origin/" prefix from branch_ref and trim whitespace
+          branch_name=$(echo ${branch_ref/origin\/} | tr -d '[:space:]')
+          echo "::set-output name=branch_name::$branch_name"
+          echo "branch_name: $branch_name"
+
+      - name: setup java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'gradle'
+
+      - name: setup python
+        uses: actions/setup-python@v4
+        with:
+          python-version: 'pypy2.7'
+
+      - name: setup ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.2.0'
+          bundler-cache: true
+
+      - name: release documentation
+        uses: maierj/fastlane-action@v3.0.0
+        with:
+          lane: 'release_documentation'
+          options: >
+            { 
+              "project_id": "merchant-sdk", 
+              "module_id": "sdk",
+              "documentation_title": "Gini Merchant SDK for Android",
+              "is_stable_release": "${{ steps.branch.outputs.branch_name == 'main' }}",
+              "git_tag": "${{ github.ref }}",
+              "ci": "true",
+              "git_user": "${{ secrets.RELEASE_GITHUB_USER }}",
+              "git_password": "${{ secrets.RELEASE_GITHUB_PASSWORD }}"
+            }
+
+      - name: archive documentation
+        uses: actions/upload-artifact@v3
+        with:
+          name: merchant-sdk-documentation
+          path: merchant-sdk/sdk/build/docs
diff --git a/.github/workflows/merchant-sdk.release.snapshots.yml b/.github/workflows/merchant-sdk.release.snapshots.yml
new file mode 100644
index 0000000000..91dd655165
--- /dev/null
+++ b/.github/workflows/merchant-sdk.release.snapshots.yml
@@ -0,0 +1,57 @@
+# Disabled until we find a way to avoid manually appending "-SNAPSHOT" to versions after every release.
+# Or we find a way to inject the version as a gradle property ONLY for the module we are releasing.
+
+# name: Release snapshot of Merchant SDK
+
+# on:
+#   pull_request:
+
+# jobs:
+#   release-snapshot:
+#     runs-on: ubuntu-latest
+#     steps:
+#       - name: checkout
+#         uses: actions/checkout@v3
+
+#       - name: setup java
+#         uses: actions/setup-java@v3
+#         with:
+#           distribution: 'temurin'
+#           java-version: '17'
+#           cache: 'gradle'
+
+#       - name: setup ruby
+#         uses: ruby/setup-ruby@v1
+#         with:
+#           ruby-version: '3.2.0'
+#           bundler-cache: true
+
+#       - name: "publish to gini's maven snapshots repo at https://repo.gini.net/nexus/content/repositories/snapshots"
+#         uses: maierj/fastlane-action@v3.0.0
+#         with:
+#           lane: 'publish_to_maven_snapshots_repo'
+#           options: >
+#             { 
+#               "repo_url": "https://repo.gini.net/nexus/content/repositories/snapshots",
+#               "repo_user": "jenkins",
+#               "repo_password": "${{ secrets.GINI_EXTERNAL_NEXUS_PASSWORD }}",
+#               "project_id": "merchant-sdk",
+#               "module_id": "sdk",
+#               "signing_key_base64": "${{ secrets.MAVEN_CENTRAL_SIGNING_KEY_BASE64 }}",
+#               "signing_password": "${{ secrets.MAVEN_CENTRAL_SIGNING_PASSWORD }}"
+#             }
+
+#       - name: "publish to Maven Central snapshots repo at https://oss.sonatype.org/content/repositories/snapshots/"
+#         uses: maierj/fastlane-action@v3.0.0
+#         with:
+#           lane: 'publish_to_maven_snapshots_repo'
+#           options: >
+#             {
+#               "repo_url": "https://oss.sonatype.org/content/repositories/snapshots/",
+#               "repo_user": "alpar.gini",
+#               "repo_password": "${{ secrets.MAVEN_CENTRAL_PASSWORD }}",
+#               "project_id": "merchant-sdk",
+#               "module_id": "sdk",
+#               "signing_key_base64": "${{ secrets.MAVEN_CENTRAL_SIGNING_KEY_BASE64 }}",
+#               "signing_password": "${{ secrets.MAVEN_CENTRAL_SIGNING_PASSWORD }}"
+#             }
diff --git a/.github/workflows/merchant-sdk.release.yml b/.github/workflows/merchant-sdk.release.yml
new file mode 100644
index 0000000000..53ab8f9968
--- /dev/null
+++ b/.github/workflows/merchant-sdk.release.yml
@@ -0,0 +1,58 @@
+name: Release Merchant SDK
+
+on:
+  push:
+    tags:
+      - 'merchant-sdk;[0-9]+.[0-9]+.[0-9]+'
+      - 'merchant-sdk;[0-9]+.[0-9]+.[0-9]+-beta[0-9][0-9]'
+
+jobs:
+  check:
+    uses: ./.github/workflows/merchant-sdk.check.yml
+    secrets:
+      GINI_MOBILE_TEST_CLIENT_SECRET: ${{ secrets.GINI_MOBILE_TEST_CLIENT_SECRET }}
+      MERCHANT_SDK_EXAMPLE_APP_KEYSTORE_PASSWORD: ${{ secrets.MERCHANT_SDK_EXAMPLE_APP_KEYSTORE_PASSWORD }}
+        
+  release:
+    needs: check
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+
+      - name: setup java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'gradle'
+
+      - name: setup ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.2.0'
+          bundler-cache: true
+
+      - name: "publish to Maven Central staging repo at https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+        uses: maierj/fastlane-action@v3.0.0
+        with:
+          lane: 'publish_to_maven_repo'
+          options: >
+            {
+              "repo_url": "https://oss.sonatype.org/service/local/staging/deploy/maven2/",
+              "repo_user": "${{ secrets.MAVEN_CENTRAL_USER_TOKEN_USERNAME }}",
+              "repo_password": "${{ secrets.MAVEN_CENTRAL_USER_TOKEN_PASSWORD }}",
+              "project_id": "merchant-sdk",
+              "module_id": "sdk",
+              "build_number": "${{ github.run_number }}",
+              "git_tag": "${{ github.ref }}",
+              "signing_key_base64": "${{ secrets.MAVEN_CENTRAL_SIGNING_KEY_BASE64 }}",
+              "signing_password": "${{ secrets.MAVEN_CENTRAL_SIGNING_PASSWORD }}"
+            }
+
+  release-documentation:
+    needs: release
+    uses: ./.github/workflows/merchant-sdk.docs.release.yml
+    secrets:
+      RELEASE_GITHUB_USER: ${{ secrets.RELEASE_GITHUB_USER }}
+      RELEASE_GITHUB_PASSWORD: ${{ secrets.RELEASE_GITHUB_PASSWORD }}
diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index e6d2cb3dba..0000000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,221 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    CFPropertyList (3.0.7)
-      base64
-      nkf
-      rexml
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
-    artifactory (3.0.17)
-    atomos (0.1.3)
-    aws-eventstream (1.3.0)
-    aws-partitions (1.940.0)
-    aws-sdk-core (3.197.0)
-      aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.8)
-      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.83.0)
-      aws-sdk-core (~> 3, >= 3.197.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.152.0)
-      aws-sdk-core (~> 3, >= 3.197.0)
-      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.8)
-    aws-sigv4 (1.8.0)
-      aws-eventstream (~> 1, >= 1.0.2)
-    babosa (1.0.4)
-    base64 (0.2.0)
-    claide (1.1.0)
-    colored (1.2)
-    colored2 (3.1.2)
-    commander (4.6.0)
-      highline (~> 2.0.0)
-    declarative (0.0.20)
-    digest-crc (0.6.5)
-      rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.6.20240107)
-    dotenv (2.8.1)
-    emoji_regex (3.2.3)
-    excon (0.110.0)
-    faraday (1.10.3)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
-      ruby2_keywords (>= 0.0.4)
-    faraday-cookie_jar (0.0.7)
-      faraday (>= 0.8.0)
-      http-cookie (~> 1.0.0)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (1.0.1)
-    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 (~> 1.0)
-    fastimage (2.3.1)
-    fastlane (2.220.0)
-      CFPropertyList (>= 2.3, < 4.0.0)
-      addressable (>= 2.8, < 3.0.0)
-      artifactory (~> 3.0)
-      aws-sdk-s3 (~> 1.0)
-      babosa (>= 1.0.3, < 2.0.0)
-      bundler (>= 1.12.0, < 3.0.0)
-      colored (~> 1.2)
-      commander (~> 4.6)
-      dotenv (>= 2.1.1, < 3.0.0)
-      emoji_regex (>= 0.1, < 4.0)
-      excon (>= 0.71.0, < 1.0.0)
-      faraday (~> 1.0)
-      faraday-cookie_jar (~> 0.0.6)
-      faraday_middleware (~> 1.0)
-      fastimage (>= 2.1.0, < 3.0.0)
-      gh_inspector (>= 1.1.2, < 2.0.0)
-      google-apis-androidpublisher_v3 (~> 0.3)
-      google-apis-playcustomapp_v1 (~> 0.1)
-      google-cloud-env (>= 1.6.0, < 2.0.0)
-      google-cloud-storage (~> 1.31)
-      highline (~> 2.0)
-      http-cookie (~> 1.0.5)
-      json (< 3.0.0)
-      jwt (>= 2.1.0, < 3)
-      mini_magick (>= 4.9.4, < 5.0.0)
-      multipart-post (>= 2.0.0, < 3.0.0)
-      naturally (~> 2.2)
-      optparse (>= 0.1.1, < 1.0.0)
-      plist (>= 3.1.0, < 4.0.0)
-      rubyzip (>= 2.0.0, < 3.0.0)
-      security (= 0.1.5)
-      simctl (~> 1.6.3)
-      terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (~> 3)
-      tty-screen (>= 0.6.3, < 1.0.0)
-      tty-spinner (>= 0.8.0, < 1.0.0)
-      word_wrap (~> 1.0.0)
-      xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.3.0)
-      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
-    gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.54.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.3)
-      addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.16.2, < 2.a)
-      httpclient (>= 2.8.1, < 3.a)
-      mini_mime (~> 1.0)
-      representable (~> 3.0)
-      retriable (>= 2.0, < 4.a)
-      rexml
-    google-apis-iamcredentials_v1 (0.17.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-playcustomapp_v1 (0.13.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.31.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-core (1.7.0)
-      google-cloud-env (>= 1.0, < 3.a)
-      google-cloud-errors (~> 1.0)
-    google-cloud-env (1.6.0)
-      faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.4.0)
-    google-cloud-storage (1.47.0)
-      addressable (~> 2.8)
-      digest-crc (~> 0.4)
-      google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.31.0)
-      google-cloud-core (~> 1.6)
-      googleauth (>= 0.16.2, < 2.a)
-      mini_mime (~> 1.0)
-    googleauth (1.8.1)
-      faraday (>= 0.17.3, < 3.a)
-      jwt (>= 1.4, < 3.0)
-      multi_json (~> 1.11)
-      os (>= 0.9, < 2.0)
-      signet (>= 0.16, < 2.a)
-    highline (2.0.3)
-    http-cookie (1.0.6)
-      domain_name (~> 0.5)
-    httpclient (2.8.3)
-    jmespath (1.6.2)
-    json (2.7.2)
-    jwt (2.8.1)
-      base64
-    mini_magick (4.12.0)
-    mini_mime (1.1.5)
-    multi_json (1.15.0)
-    multipart-post (2.4.1)
-    nanaimo (0.3.0)
-    naturally (2.2.1)
-    nkf (0.2.0)
-    optparse (0.5.0)
-    os (1.1.4)
-    plist (3.7.1)
-    public_suffix (5.0.5)
-    rake (13.2.1)
-    representable (3.2.0)
-      declarative (< 0.1.0)
-      trailblazer-option (>= 0.1.1, < 0.2.0)
-      uber (< 0.2.0)
-    retriable (3.1.2)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
-    rouge (2.0.7)
-    ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
-    security (0.1.5)
-    signet (0.19.0)
-      addressable (~> 2.8)
-      faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 3.0)
-      multi_json (~> 1.10)
-    simctl (1.6.10)
-      CFPropertyList
-      naturally
-    strscan (3.1.0)
-    terminal-notifier (2.0.0)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
-    trailblazer-option (0.1.2)
-    tty-cursor (0.7.1)
-    tty-screen (0.8.2)
-    tty-spinner (0.9.3)
-      tty-cursor (~> 0.7)
-    uber (0.1.0)
-    unicode-display_width (2.5.0)
-    word_wrap (1.0.0)
-    xcodeproj (1.24.0)
-      CFPropertyList (>= 2.3.3, < 4.0)
-      atomos (~> 0.1.3)
-      claide (>= 1.0.2, < 2.0)
-      colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-      rexml (~> 3.2.4)
-    xcpretty (0.3.0)
-      rouge (~> 2.0.7)
-    xcpretty-travis-formatter (1.0.1)
-      xcpretty (~> 0.2, >= 0.0.7)
-
-PLATFORMS
-  arm64-darwin-21
-  x86_64-darwin-20
-  x86_64-linux
-
-DEPENDENCIES
-  fastlane
-
-BUNDLED WITH
-   2.2.29
diff --git a/RELEASE-ORDER.md b/RELEASE-ORDER.md
index a976b7779d..74a7660857 100644
--- a/RELEASE-ORDER.md
+++ b/RELEASE-ORDER.md
@@ -1,35 +1,40 @@
 DO NOT EDIT MANUALLY!
 Automatically created by the updateReleaseOrderFile task.
 
-Release order for :capture-sdk:sdk 3.10.3:
- 1. :capture-sdk:sdk 3.10.3
-
-Release order for :core-api-library:library 2.1.4:
- 1. :core-api-library:library 2.1.4
-
-Release order for :bank-api-library:library 3.1.3:
- 1. :core-api-library:library 2.1.4
- 2. :bank-api-library:library 3.1.3
-
-Release order for :health-api-library:library 4.1.0:
- 1. :core-api-library:library 2.1.4
- 2. :health-api-library:library 4.1.0
-
-Release order for :health-sdk:sdk 4.1.0:
- 1. :core-api-library:library 2.1.4
- 2. :health-api-library:library 4.1.0
- 3. :health-sdk:sdk 4.1.0
-
-Release order for :capture-sdk:default-network 3.10.3:
- 1. :core-api-library:library 2.1.4
- 2. :bank-api-library:library 3.1.3
- 3. :capture-sdk:sdk 3.10.3
- 4. :capture-sdk:default-network 3.10.3
-
-Release order for :bank-sdk:sdk 3.11.2:
- 1. :core-api-library:library 2.1.4
- 2. :bank-api-library:library 3.1.3
- 3. :capture-sdk:sdk 3.10.3
- 4. :capture-sdk:default-network 3.10.3
- 5. :bank-sdk:sdk 3.11.2
+Release order for :capture-sdk:sdk 3.11.0:
+ 1. :capture-sdk:sdk 3.11.0
+
+Release order for :core-api-library:library 2.2.0:
+ 1. :core-api-library:library 2.2.0
+
+Release order for :bank-api-library:library 3.2.0:
+ 1. :core-api-library:library 2.2.0
+ 2. :bank-api-library:library 3.2.0
+
+Release order for :health-api-library:library 4.2.0:
+ 1. :core-api-library:library 2.2.0
+ 2. :health-api-library:library 4.2.0
+
+Release order for :health-sdk:sdk 4.2.0:
+ 1. :core-api-library:library 2.2.0
+ 2. :health-api-library:library 4.2.0
+ 3. :health-sdk:sdk 4.2.0
+
+Release order for :merchant-sdk:sdk 1.0.0:
+ 1. :core-api-library:library 2.2.0
+ 2. :health-api-library:library 4.2.0
+ 3. :merchant-sdk:sdk 1.0.0
+
+Release order for :capture-sdk:default-network 3.11.0:
+ 1. :core-api-library:library 2.2.0
+ 2. :bank-api-library:library 3.2.0
+ 3. :capture-sdk:sdk 3.11.0
+ 4. :capture-sdk:default-network 3.11.0
+
+Release order for :bank-sdk:sdk 3.12.0:
+ 1. :core-api-library:library 2.2.0
+ 2. :bank-api-library:library 3.2.0
+ 3. :capture-sdk:sdk 3.11.0
+ 4. :capture-sdk:default-network 3.11.0
+ 5. :bank-sdk:sdk 3.12.0
 
diff --git a/bank-api-library/library/build.gradle.kts b/bank-api-library/library/build.gradle.kts
index f98be00893..2a820657cf 100644
--- a/bank-api-library/library/build.gradle.kts
+++ b/bank-api-library/library/build.gradle.kts
@@ -19,7 +19,8 @@ android {
     }
     defaultConfig {
         minSdk = libs.versions.android.minSdk.get().toInt()
-        targetSdk = libs.versions.android.targetSdk.get().toInt()
+        testOptions.targetSdk = libs.versions.android.targetSdk.get().toInt()
+        lint.targetSdk = libs.versions.android.targetSdk.get().toInt()
 
         // Use the test runner with JUnit4 support
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -113,7 +114,7 @@ tasks.register<CreatePropertiesTask>("injectTestProperties") {
 
     doFirst {
         propertiesMap.clear()
-        propertiesMap.putAll(readLocalPropertiesToMap(project,
+        propertiesMap.putAll(readLocalPropertiesToMapSilent(project,
             listOf("testClientId", "testClientSecret", "testApiUri", "testUserCenterUri", "testHealthApiUri")))
     }
 
diff --git a/bank-api-library/library/gradle.properties b/bank-api-library/library/gradle.properties
index a5fa91765e..bd9803510d 100644
--- a/bank-api-library/library/gradle.properties
+++ b/bank-api-library/library/gradle.properties
@@ -1,7 +1,7 @@
 # Maven coordinates
 # groupId is in the root gradle.properties
 artifactId=gini-bank-api-lib
-version=3.1.3
+version=3.2.0
 # Version code is visible only in the generated BuildConfig file
 versionCode=0
 
diff --git a/bank-api-library/library/src/doc/source/guides/getting-started.rst b/bank-api-library/library/src/doc/source/guides/getting-started.rst
index 81c9b41c38..8f5f62fc40 100644
--- a/bank-api-library/library/src/doc/source/guides/getting-started.rst
+++ b/bank-api-library/library/src/doc/source/guides/getting-started.rst
@@ -13,7 +13,7 @@ build.gradle:
 .. code-block:: groovy
 
     dependencies {
-        implementation 'net.gini.android:gini-bank-api-lib:3.1.2'
+        implementation 'net.gini.android:gini-bank-api-lib:3.2.0'
     }
 
 Integrating the Gini Bank API Library
diff --git a/bank-api-library/library/src/main/java/net/gini/android/bank/api/BankApiDocumentManager.kt b/bank-api-library/library/src/main/java/net/gini/android/bank/api/BankApiDocumentManager.kt
index 251cc4cc90..edf1714b71 100644
--- a/bank-api-library/library/src/main/java/net/gini/android/bank/api/BankApiDocumentManager.kt
+++ b/bank-api-library/library/src/main/java/net/gini/android/bank/api/BankApiDocumentManager.kt
@@ -1,5 +1,7 @@
 package net.gini.android.bank.api;
 
+import net.gini.android.bank.api.models.AmplitudeRoot
+import net.gini.android.bank.api.models.Configuration
 import net.gini.android.bank.api.models.ExtractionsContainer
 import net.gini.android.bank.api.models.ResolvePaymentInput
 import net.gini.android.bank.api.models.ResolvedPayment
@@ -45,4 +47,11 @@ class BankApiDocumentManager internal constructor(private val documentRepository
         errorEvent: ErrorEvent
     ): Resource<Unit> =
         documentRepository.logErrorEvent(errorEvent)
+
+
+    suspend fun getConfigurations(): Resource<Configuration> =
+        documentRepository.getConfigurations()
+
+    suspend fun sendEvents(amplitudeRoot: AmplitudeRoot): Resource<Unit> =
+        documentRepository.sendEvents(amplitudeRoot)
 }
diff --git a/bank-api-library/library/src/main/java/net/gini/android/bank/api/BankApiDocumentRemoteSource.kt b/bank-api-library/library/src/main/java/net/gini/android/bank/api/BankApiDocumentRemoteSource.kt
index 86c40bdfb1..8511971ddd 100644
--- a/bank-api-library/library/src/main/java/net/gini/android/bank/api/BankApiDocumentRemoteSource.kt
+++ b/bank-api-library/library/src/main/java/net/gini/android/bank/api/BankApiDocumentRemoteSource.kt
@@ -1,11 +1,14 @@
 package net.gini.android.bank.api
 
 import kotlinx.coroutines.withContext
+import net.gini.android.bank.api.models.Configuration
 import net.gini.android.bank.api.models.ResolvePaymentInput
 import net.gini.android.bank.api.models.ResolvedPayment
 import net.gini.android.bank.api.models.toResolvedPayment
 import net.gini.android.bank.api.requests.ErrorEvent
+import net.gini.android.bank.api.requests.toAmplitudeRequestBody
 import net.gini.android.bank.api.requests.toResolvePaymentBody
+import net.gini.android.bank.api.response.toConfiguration
 import net.gini.android.core.api.DocumentRemoteSource
 import net.gini.android.core.api.requests.ApiException
 import net.gini.android.core.api.requests.SafeApiRequest
@@ -34,4 +37,11 @@ class BankApiDocumentRemoteSource internal constructor(
                 documentService.logErrorEvent(bearerHeaderMap(accessToken, contentType = giniApiType.giniJsonMediaType), errorEvent)
             }
         }
+
+    suspend fun getConfigurations(accessToken: String): Configuration = withContext(coroutineContext) {
+        val response = SafeApiRequest.apiRequest {
+            documentService.getConfigurations(bearerHeaderMap(accessToken, giniApiType.giniJsonMediaType))
+        }
+        response.body()?.toConfiguration() ?: throw ApiException.forResponse("Empty response body", response)
+    }
 }
diff --git a/bank-api-library/library/src/main/java/net/gini/android/bank/api/BankApiDocumentRepository.kt b/bank-api-library/library/src/main/java/net/gini/android/bank/api/BankApiDocumentRepository.kt
index 00d18dd376..c1372df64a 100644
--- a/bank-api-library/library/src/main/java/net/gini/android/bank/api/BankApiDocumentRepository.kt
+++ b/bank-api-library/library/src/main/java/net/gini/android/bank/api/BankApiDocumentRepository.kt
@@ -18,7 +18,8 @@ import org.json.JSONObject
 class BankApiDocumentRepository(
     private val documentRemoteSource: BankApiDocumentRemoteSource,
     sessionManager: SessionManager,
-    giniApiType: GiniBankApiType
+    giniApiType: GiniBankApiType,
+    private val trackingAnalysisRemoteSource: TrackingAnalysisRemoteSource
 ) : DocumentRepository<ExtractionsContainer>(documentRemoteSource, sessionManager, giniApiType) {
 
     override fun createExtractionsContainer(
@@ -26,15 +27,23 @@ class BankApiDocumentRepository(
         compoundExtractions: Map<String, CompoundExtraction>,
         responseJSON: JSONObject
     ): ExtractionsContainer {
-        val returnReasons: List<ReturnReason> = parseReturnReason(responseJSON.optJSONArray("returnReasons"))
+        val returnReasons: List<ReturnReason> =
+            parseReturnReason(responseJSON.optJSONArray("returnReasons"))
 
         return ExtractionsContainer(specificExtractions, compoundExtractions, returnReasons)
     }
 
-    suspend fun resolvePaymentRequest(requestId: String, resolvePaymentInput: ResolvePaymentInput): Resource<ResolvedPayment> =
+    suspend fun resolvePaymentRequest(
+        requestId: String,
+        resolvePaymentInput: ResolvePaymentInput
+    ): Resource<ResolvedPayment> =
         withAccessToken { accessToken ->
             wrapInResource {
-                documentRemoteSource.resolvePaymentRequests(accessToken, requestId, resolvePaymentInput)
+                documentRemoteSource.resolvePaymentRequests(
+                    accessToken,
+                    requestId,
+                    resolvePaymentInput
+                )
             }
         }
 
@@ -45,6 +54,19 @@ class BankApiDocumentRepository(
             }
         }
 
+    suspend fun getConfigurations(): Resource<Configuration> =
+        withAccessToken { accessToken ->
+            wrapInResource {
+                documentRemoteSource.getConfigurations(accessToken)
+            }
+        }
+
+    suspend fun sendEvents(amplitudeRoot: AmplitudeRoot): Resource<Unit> =
+        wrapInResource {
+            trackingAnalysisRemoteSource.sendEvents(amplitudeRoot)
+        }
+
+
     @Throws(JSONException::class)
     private fun parseReturnReason(returnReasonsJson: JSONArray?): List<ReturnReason> {
         if (returnReasonsJson == null) {
diff --git a/bank-api-library/library/src/main/java/net/gini/android/bank/api/BankApiDocumentService.kt b/bank-api-library/library/src/main/java/net/gini/android/bank/api/BankApiDocumentService.kt
index 3fa1130b47..9a84e98527 100644
--- a/bank-api-library/library/src/main/java/net/gini/android/bank/api/BankApiDocumentService.kt
+++ b/bank-api-library/library/src/main/java/net/gini/android/bank/api/BankApiDocumentService.kt
@@ -2,6 +2,7 @@ package net.gini.android.bank.api
 
 import net.gini.android.bank.api.requests.ErrorEvent
 import net.gini.android.bank.api.requests.ResolvePaymentBody
+import net.gini.android.bank.api.response.ConfigurationResponse
 import net.gini.android.bank.api.response.ResolvePaymentResponse
 import net.gini.android.core.api.DocumentService
 import okhttp3.RequestBody
@@ -19,4 +20,7 @@ internal interface BankApiDocumentService: DocumentService {
 
     @POST("events/error")
     suspend fun logErrorEvent(@HeaderMap bearer: Map<String, String>, @Body errorEvent: ErrorEvent): Response<ResponseBody>
+
+    @GET("configurations")
+    suspend fun getConfigurations(@HeaderMap bearer: Map<String, String>): Response<ConfigurationResponse>
 }
diff --git a/bank-api-library/library/src/main/java/net/gini/android/bank/api/GiniBankAPIBuilder.kt b/bank-api-library/library/src/main/java/net/gini/android/bank/api/GiniBankAPIBuilder.kt
index 2c66c476d5..cdf03301fa 100644
--- a/bank-api-library/library/src/main/java/net/gini/android/bank/api/GiniBankAPIBuilder.kt
+++ b/bank-api-library/library/src/main/java/net/gini/android/bank/api/GiniBankAPIBuilder.kt
@@ -48,7 +48,11 @@ class GiniBankAPIBuilder @JvmOverloads constructor(
         return BankApiDocumentRemoteSource(Dispatchers.IO, getApiRetrofit().create(BankApiDocumentService::class.java), bankApiType, getApiBaseUrl() ?: "")
     }
 
+    private fun createTrackingAnalysisRemoteSource(): TrackingAnalysisRemoteSource {
+        return TrackingAnalysisRemoteSource(Dispatchers.IO,getTrackingAnalyticsApiRetrofit().create(TrackingAnalysisService::class.java))
+    }
+
     override fun createDocumentRepository(): BankApiDocumentRepository {
-        return BankApiDocumentRepository(createDocumentRemoteSource(), getSessionManager(), bankApiType)
+        return BankApiDocumentRepository(createDocumentRemoteSource(), getSessionManager(), bankApiType, createTrackingAnalysisRemoteSource())
     }
 }
diff --git a/bank-api-library/library/src/main/java/net/gini/android/bank/api/TrackingAnalysisRemoteSource.kt b/bank-api-library/library/src/main/java/net/gini/android/bank/api/TrackingAnalysisRemoteSource.kt
new file mode 100644
index 0000000000..0a84df8720
--- /dev/null
+++ b/bank-api-library/library/src/main/java/net/gini/android/bank/api/TrackingAnalysisRemoteSource.kt
@@ -0,0 +1,24 @@
+package net.gini.android.bank.api
+
+import kotlinx.coroutines.withContext
+import net.gini.android.bank.api.models.AmplitudeRoot
+import net.gini.android.bank.api.requests.toAmplitudeRequestBody
+import net.gini.android.core.api.requests.SafeApiRequest
+import kotlin.coroutines.CoroutineContext
+
+/**
+ * Internal use only.
+ */
+class TrackingAnalysisRemoteSource internal constructor(
+    private val coroutineContext: CoroutineContext,
+    private val trackingAnalysisService: TrackingAnalysisService
+) {
+
+    suspend fun sendEvents(amplitudeRoot: AmplitudeRoot): Unit =
+        withContext(coroutineContext) {
+            SafeApiRequest.apiRequest {
+                trackingAnalysisService.sendEvents(amplitudeRoot.toAmplitudeRequestBody())
+            }
+        }
+
+}
diff --git a/bank-api-library/library/src/main/java/net/gini/android/bank/api/TrackingAnalysisService.kt b/bank-api-library/library/src/main/java/net/gini/android/bank/api/TrackingAnalysisService.kt
new file mode 100644
index 0000000000..1be0fcc415
--- /dev/null
+++ b/bank-api-library/library/src/main/java/net/gini/android/bank/api/TrackingAnalysisService.kt
@@ -0,0 +1,14 @@
+package net.gini.android.bank.api
+
+import net.gini.android.bank.api.requests.AmplitudeRequestBody
+import net.gini.android.core.api.DocumentService
+import okhttp3.ResponseBody
+import retrofit2.Response
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+internal interface TrackingAnalysisService: DocumentService {
+
+    @POST("/batch")
+    suspend fun sendEvents(@Body amplitudeBody: AmplitudeRequestBody): Response<ResponseBody>
+}
diff --git a/bank-api-library/library/src/main/java/net/gini/android/bank/api/models/AmplitudeEvent.kt b/bank-api-library/library/src/main/java/net/gini/android/bank/api/models/AmplitudeEvent.kt
new file mode 100644
index 0000000000..2ed9c71831
--- /dev/null
+++ b/bank-api-library/library/src/main/java/net/gini/android/bank/api/models/AmplitudeEvent.kt
@@ -0,0 +1,28 @@
+package net.gini.android.bank.api.models
+
+data class AmplitudeRoot(
+    val apiKey: String,
+    val events: List<AmplitudeEvent>,
+)
+
+data class AmplitudeEvent(
+    val userId: String,
+    val deviceId: String,
+    val eventType: String,
+    val sessionId: String,
+    val eventId: String,
+    val time: Long,
+    val platform: String,
+    val osVersion: String,
+    val deviceManufacturer: String,
+    val deviceBrand: String,
+    val deviceModel: String,
+    val versionName: String,
+    val osName: String,
+    val carrier: String,
+    val language: String,
+    val eventProperties: Map<String, Any>? = null,
+    val userProperties: Map<String, Any>? = null,
+)
+
+
diff --git a/bank-api-library/library/src/main/java/net/gini/android/bank/api/models/Configuration.kt b/bank-api-library/library/src/main/java/net/gini/android/bank/api/models/Configuration.kt
new file mode 100644
index 0000000000..45331cccb6
--- /dev/null
+++ b/bank-api-library/library/src/main/java/net/gini/android/bank/api/models/Configuration.kt
@@ -0,0 +1,11 @@
+package net.gini.android.bank.api.models
+
+data class Configuration(
+    val clientID: String,
+    val isUserJourneyAnalyticsEnabled: Boolean,
+    val isSkontoEnabled: Boolean,
+    val isReturnAssistantEnabled: Boolean,
+    val mixpanelToken: String?,
+    val amplitudeApiKey: String?,
+
+    )
\ No newline at end of file
diff --git a/bank-api-library/library/src/main/java/net/gini/android/bank/api/requests/AmplitudeBody.kt b/bank-api-library/library/src/main/java/net/gini/android/bank/api/requests/AmplitudeBody.kt
new file mode 100644
index 0000000000..87b696fcfc
--- /dev/null
+++ b/bank-api-library/library/src/main/java/net/gini/android/bank/api/requests/AmplitudeBody.kt
@@ -0,0 +1,60 @@
+package net.gini.android.bank.api.requests
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import net.gini.android.bank.api.models.AmplitudeEvent
+import net.gini.android.bank.api.models.AmplitudeRoot
+
+@JsonClass(generateAdapter = true)
+data class AmplitudeRequestBody(
+    @Json(name = "api_key") val apiKey: String,
+    @Json(name = "events") val events: List<AmplitudeEventBody>,
+)
+
+@JsonClass(generateAdapter = true)
+data class AmplitudeEventBody(
+    @Json(name = "user_id") val userId: String,
+    @Json(name = "device_id") val deviceId: String,
+    @Json(name = "event_type") val eventType: String,
+    @Json(name = "session_id") val sessionId: String,
+    @Json(name = "event_id") val eventId: String,
+    @Json(name = "time") val time: Long = 0,
+    @Json(name = "platform") val platform: String,
+    @Json(name = "os_version") val osVersion: String,
+    @Json(name = "device_manufacturer") val deviceManufacturer: String,
+    @Json(name = "device_brand") val deviceBrand: String,
+    @Json(name = "device_model") val deviceModel: String,
+    @Json(name = "version_name") val versionName: String,
+    @Json(name = "os_name") val osName: String,
+    @Json(name = "carrier") val carrier: String,
+    @Json(name = "language") val language: String,
+    @Json(name = "ip") val ip: String = "\$remote",
+    @Json(name = "event_properties") val eventProperties: Map<String, Any>? = null,
+    @Json(name = "user_properties") val userProperties: Map<String, Any>? = null,
+)
+
+
+internal fun AmplitudeRoot.toAmplitudeRequestBody() = AmplitudeRequestBody(
+    apiKey = apiKey,
+    events = events.map { it.toAmplitudeEventBody() }
+)
+
+internal fun AmplitudeEvent.toAmplitudeEventBody() = AmplitudeEventBody(
+    userId = userId,
+    deviceId = deviceId,
+    eventType = eventType,
+    sessionId = sessionId,
+    eventId = eventId,
+    time = time,
+    platform = platform,
+    osVersion = osVersion,
+    deviceManufacturer = deviceManufacturer,
+    deviceBrand = deviceBrand,
+    deviceModel = deviceModel,
+    versionName = versionName,
+    osName = osName,
+    carrier = carrier,
+    language = language,
+    eventProperties = eventProperties,
+    userProperties = userProperties,
+)
diff --git a/bank-api-library/library/src/main/java/net/gini/android/bank/api/response/ConfigurationResponse.kt b/bank-api-library/library/src/main/java/net/gini/android/bank/api/response/ConfigurationResponse.kt
new file mode 100644
index 0000000000..a359832881
--- /dev/null
+++ b/bank-api-library/library/src/main/java/net/gini/android/bank/api/response/ConfigurationResponse.kt
@@ -0,0 +1,25 @@
+package net.gini.android.bank.api.response
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import net.gini.android.bank.api.models.Configuration
+
+@JsonClass(generateAdapter = true)
+data class ConfigurationResponse(
+    @Json(name = "clientID") val clientID: String?,
+    @Json(name = "userJourneyAnalyticsEnabled") val userJourneyAnalyticsEnabled: Boolean?,
+    @Json(name = "skontoEnabled") val skontoEnabled: Boolean?,
+    @Json(name = "returnAssistantEnabled") val returnAssistantEnabled: Boolean?,
+    @Json(name = "mixpanelToken") val mixpanelToken: String?,
+    @Json(name = "amplitudeApiKey") val amplitudeApiKey: String?,
+)
+
+internal fun ConfigurationResponse.toConfiguration() = Configuration(
+    clientID = clientID ?: "",
+    isUserJourneyAnalyticsEnabled = userJourneyAnalyticsEnabled ?: false,
+    isSkontoEnabled = skontoEnabled ?: false,
+    isReturnAssistantEnabled = returnAssistantEnabled ?: false,
+    mixpanelToken = mixpanelToken,
+    amplitudeApiKey = amplitudeApiKey
+)
+
diff --git a/bank-api-library/library/src/test/java/net/gini/android/bank/api/BankApiDocumentRemoteSourceTest.kt b/bank-api-library/library/src/test/java/net/gini/android/bank/api/BankApiDocumentRemoteSourceTest.kt
index f8606e91fa..72cea28a49 100644
--- a/bank-api-library/library/src/test/java/net/gini/android/bank/api/BankApiDocumentRemoteSourceTest.kt
+++ b/bank-api-library/library/src/test/java/net/gini/android/bank/api/BankApiDocumentRemoteSourceTest.kt
@@ -11,6 +11,7 @@ import kotlinx.coroutines.test.runTest
 import net.gini.android.bank.api.models.ResolvePaymentInput
 import net.gini.android.bank.api.requests.ErrorEvent
 import net.gini.android.bank.api.requests.ResolvePaymentBody
+import net.gini.android.bank.api.response.ConfigurationResponse
 import net.gini.android.bank.api.response.ResolvePaymentResponse
 import net.gini.android.core.api.response.PaymentRequestResponse
 import net.gini.android.core.api.response.PaymentResponse
@@ -110,6 +111,10 @@ class BankApiDocumentRemoteSourceTest {
             return Response.success(null)
         }
 
+        override suspend fun getConfigurations(bearer: Map<String, String>): Response<ConfigurationResponse> {
+            return Response.success(ConfigurationResponse(null, null, null, null, null, null))
+        }
+
         override suspend fun uploadDocument(
             bearer: Map<String, String>,
             bytes: RequestBody,
diff --git a/bank-sdk/example-app/README.md b/bank-sdk/example-app/README.md
index c5040d2357..cb5563f9ca 100644
--- a/bank-sdk/example-app/README.md
+++ b/bank-sdk/example-app/README.md
@@ -34,8 +34,8 @@ is used for creating release builds which can be shared with clients while the `
 for QA purposes. The difference between `prod` and `qa` is that `qa` allows using custom SSL root certificates for
 SSL proxies (e.g. Charles Proxy).
 
-Payment Providers for testing Gini Pay Connect and the Health SDK
-==============================================================
+Payment Providers for testing Gini Pay Connect with the Health SDK or Merchant SDK
+==================================================================================
 
 Run `bundle exec fastlane install_test_payment_provider_apps` in the repository root to install test payment provider apps 
 on all running emulators and connected devices. You can run `bundle exec fastlane uninstall_test_payment_provider_apps`
diff --git a/bank-sdk/example-app/build.gradle.kts b/bank-sdk/example-app/build.gradle.kts
index 74dc4eb026..fa6f914f77 100644
--- a/bank-sdk/example-app/build.gradle.kts
+++ b/bank-sdk/example-app/build.gradle.kts
@@ -98,7 +98,7 @@ android {
             resValue("string", "gini_api_client_secret", credentials["clientSecret"] ?: "")
         }
         release {
-            isMinifyEnabled = true
+            isMinifyEnabled = false
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
 
             signingConfig = signingConfigs.getByName("release")
diff --git a/bank-sdk/example-app/detekt-baseline.xml b/bank-sdk/example-app/detekt-baseline.xml
new file mode 100644
index 0000000000..1fcd660502
--- /dev/null
+++ b/bank-sdk/example-app/detekt-baseline.xml
@@ -0,0 +1,96 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<SmellBaseline>
+  <ManuallySuppressedIssues/>
+  <CurrentIssues>
+    <ID>CyclomaticComplexMethod:ConfigurationViewModel.kt$ConfigurationViewModel$fun configureGiniBank(context: Context)</ID>
+    <ID>EmptyFunctionBlock:CustomOnButtonLoadingIndicatorAdapter.kt$CustomOnButtonLoadingIndicatorAdapter${}</ID>
+    <ID>LongMethod:ConfigurationActivity.kt$ConfigurationActivity$private fun setConfigurationFeatures()</ID>
+    <ID>LongMethod:ConfigurationActivity.kt$ConfigurationActivity$private fun updateUIWithConfigurationObject(configuration: Configuration)</ID>
+    <ID>LongMethod:ConfigurationViewModel.kt$ConfigurationViewModel$fun configureGiniBank(context: Context)</ID>
+    <ID>LongParameterList:ClientCaptureSDKFragment.kt$ClientCaptureSDKFragment$(paymentRecipient: String, paymentReference: String, paymentPurpose: String, iban: String, bic: String, amount: Amount )</ID>
+    <ID>MagicNumber:ExtractionsActivity.kt$ExtractionsActivity$0.5f</ID>
+    <ID>MagicNumber:MainActivity.kt$MainActivity$600</ID>
+    <ID>MaxLineLength:ClientBankSDKFragment.kt$ClientBankSDKFragment$"Error: ${(result.value as ResultError.Capture).giniCaptureError.errorCode} ${(result.value as ResultError.Capture).giniCaptureError.message}"</ID>
+    <ID>MaxLineLength:ClientBankSDKFragment.kt$ClientBankSDKFragment$"Error: ${(result.value as ResultError.FileImport).code} ${(result.value as ResultError.FileImport).message}"</ID>
+    <ID>MaxLineLength:ClientCaptureSDKFragment.kt$ClientCaptureSDKFragment$"Error: ${(result.value as ResultError.FileImport).code} ${(result.value as ResultError.FileImport).message}"</ID>
+    <ID>MaxLineLength:Configuration.kt$Configuration$// net.gini.android.capture.GiniCapture.Builder#setCameraNavigationBarBottomAdapter → on/off switch to show a custom adapter implementation</ID>
+    <ID>MaxLineLength:Configuration.kt$Configuration$// net.gini.android.capture.GiniCapture.Builder#setCustomOnboardingPages → on/off switch to show custom onboarding pages</ID>
+    <ID>MaxLineLength:Configuration.kt$Configuration$// net.gini.android.capture.GiniCapture.Builder#setDocumentImportEnabledFileTypes → radio buttons to select an available enum value</ID>
+    <ID>MaxLineLength:Configuration.kt$Configuration$// net.gini.android.capture.GiniCapture.Builder#setHelpNavigationBarBottomAdapter → on/off switch to show a custom adapter implementation</ID>
+    <ID>MaxLineLength:Configuration.kt$Configuration$// net.gini.android.capture.GiniCapture.Builder#setLoadingIndicatorAdapter → on/off switch to show a custom adapter implementation</ID>
+    <ID>MaxLineLength:Configuration.kt$Configuration$// net.gini.android.capture.GiniCapture.Builder#setNavigationBarTopAdapter → on/off switch to show a custom adapter implementation</ID>
+    <ID>MaxLineLength:Configuration.kt$Configuration$// net.gini.android.capture.GiniCapture.Builder#setOnButtonLoadingIndicatorAdapter → on/off switch to show a custom adapter implementation</ID>
+    <ID>MaxLineLength:Configuration.kt$Configuration$// net.gini.android.capture.GiniCapture.Builder#setOnboardingQRCodeIllustrationAdapter-> on/off switch to show custom adapter with animated illustrations</ID>
+    <ID>MaxLineLength:Configuration.kt$Configuration$// net.gini.android.capture.GiniCapture.Builder#setReviewBottomBarNavigationAdapter → on/off switch to show a custom adapter implementation</ID>
+    <ID>MaxLineLength:Configuration.kt$Configuration.Companion$fun</ID>
+    <ID>MaxLineLength:ConfigurationActivity.kt$ConfigurationActivity$binding.layoutBottomNavigationToggles.switchCameraScreenCustomBottomNavbar</ID>
+    <ID>MaxLineLength:ConfigurationActivity.kt$ConfigurationActivity$binding.layoutBottomNavigationToggles.switchDigitalInvoiceBottomNavigationBar</ID>
+    <ID>MaxLineLength:ConfigurationActivity.kt$ConfigurationActivity$binding.layoutBottomNavigationToggles.switchDigitalInvoiceHelpBottomNavigationBar</ID>
+    <ID>MaxLineLength:ConfigurationActivity.kt$ConfigurationActivity$binding.layoutBottomNavigationToggles.switchDigitalInvoiceOnboardingBottomNavigationBar</ID>
+    <ID>MaxLineLength:ConfigurationActivity.kt$ConfigurationActivity$binding.layoutBottomNavigationToggles.switchReviewScreenCustomBottomNavbar</ID>
+    <ID>MaxLineLength:ConfigurationActivity.kt$ConfigurationActivity$binding.layoutBottomNavigationToggles.switchShowBottomNavbar.isChecked = configuration.isBottomNavigationBarEnabled</ID>
+    <ID>MaxLineLength:ConfigurationActivity.kt$ConfigurationActivity$binding.layoutBottomNavigationToggles.switchShowHelpScreenCustomBottomNavbar</ID>
+    <ID>MaxLineLength:ConfigurationActivity.kt$ConfigurationActivity$binding.layoutBottomNavigationToggles.switchSkontoCustomBottomNavbar</ID>
+    <ID>MaxLineLength:ConfigurationActivity.kt$ConfigurationActivity$binding.layoutDebugDevelopmentOptionsToggles.switchCustomErrorLogger</ID>
+    <ID>MaxLineLength:ConfigurationActivity.kt$ConfigurationActivity$binding.layoutDebugDevelopmentOptionsToggles.switchCustomErrorLogger.isChecked = configuration.isCustomErrorLoggerEnabled</ID>
+    <ID>MaxLineLength:ConfigurationActivity.kt$ConfigurationActivity$binding.layoutDebugDevelopmentOptionsToggles.switchDisableCameraPermission</ID>
+    <ID>MaxLineLength:ConfigurationActivity.kt$ConfigurationActivity$binding.layoutDebugDevelopmentOptionsToggles.switchGiniErrorLogger.isChecked = configuration.isGiniErrorLoggerEnabled</ID>
+    <ID>MaxLineLength:ConfigurationActivity.kt$ConfigurationActivity$binding.layoutFeatureToggle.toggleBtnFileImportSetup</ID>
+    <ID>MaxLineLength:ConfigurationActivity.kt$ConfigurationActivity$binding.layoutGeneralUiCustomizationToggles.switchButtonsCustomLoadingIndicator</ID>
+    <ID>MaxLineLength:ConfigurationActivity.kt$ConfigurationActivity$binding.layoutGeneralUiCustomizationToggles.switchCustomNavigationController</ID>
+    <ID>MaxLineLength:ConfigurationActivity.kt$ConfigurationActivity$binding.layoutGeneralUiCustomizationToggles.switchCustomNavigationController.isChecked = configuration.isCustomNavBarEnabled</ID>
+    <ID>MaxLineLength:ConfigurationActivity.kt$ConfigurationActivity$binding.layoutOnboardingToggles.switchCustomOnboardingAlignCornersPage</ID>
+    <ID>MaxLineLength:ConfigurationActivity.kt$ConfigurationActivity$binding.layoutOnboardingToggles.switchCustomOnboardingPages.isChecked = configuration.isCustomOnboardingPagesEnabled</ID>
+    <ID>MaxLineLength:ConfigurationActivity.kt$ConfigurationActivity$binding.layoutOnboardingToggles.switchOnboardingScreensAtEveryLaunch</ID>
+    <ID>MaxLineLength:ConfigurationActivity.kt$ConfigurationActivity$binding.layoutReturnAssistantToggles.switchDigitalInvoiceOnboardingCustomIllustration</ID>
+    <ID>MaxLineLength:ConfigurationViewModel.kt$ConfigurationViewModel$@GiniCaptureNetworkServiceDebugDisabled private val giniCaptureDefaultNetworkServiceDebugDisabled: GiniCaptureDefaultNetworkService</ID>
+    <ID>MaxLineLength:ConfigurationViewModel.kt$ConfigurationViewModel$@GiniCaptureNetworkServiceDebugEnabled private val giniCaptureDefaultNetworkServiceDebugEnabled: GiniCaptureDefaultNetworkService</ID>
+    <ID>MaxLineLength:ConfigurationViewModel.kt$ConfigurationViewModel$if</ID>
+    <ID>MaxLineLength:ConfigurationViewModel.kt$ConfigurationViewModel$networkService = if (configuration.isDebugModeEnabled) giniCaptureDefaultNetworkServiceDebugEnabled else giniCaptureDefaultNetworkServiceDebugDisabled</ID>
+    <ID>MaxLineLength:CustomCameraNavigationBarBottomAdapter.kt$CustomCameraNavigationBarBottomAdapter$val binding = CustomCameraNavigationBarBottomBinding.inflate(LayoutInflater.from(container.context), container, false)</ID>
+    <ID>MaxLineLength:CustomDigitalInvoiceHelpNavigationBarBottomAdapter.kt$CustomDigitalInvoiceHelpNavigationBarBottomAdapter$val binding = CustomDigitalInvoiceHelpNavigationBarBottomBinding.inflate(LayoutInflater.from(container.context), container, false)</ID>
+    <ID>MaxLineLength:CustomDigitalInvoiceNavigationBarBottomAdapter.kt$CustomDigitalInvoiceNavigationBarBottomAdapter$binding = CustomDigitalInvoiceNavigationBarBinding.inflate(LayoutInflater.from(container.context), container, false)</ID>
+    <ID>MaxLineLength:CustomDigitalInvoiceOnboardingNavigationBarBottomAdapter.kt$CustomDigitalInvoiceOnboardingNavigationBarBottomAdapter$val binding = CustomDigitalInvoiceOnboardingBottomNavigationBarBinding.inflate(LayoutInflater.from(container.context), container, false)</ID>
+    <ID>MaxLineLength:CustomOnboardingNavigationBarBottomAdapter.kt$CustomOnboardingNavigationBarBottomAdapter$OnboardingNavigationBarBottomButton.GET_STARTED -> viewBinding?.buttonGetStarted?.visibility = View.VISIBLE</ID>
+    <ID>MaxLineLength:CustomReviewNavigationBarBottomAdapter.kt$CustomReviewNavigationBarBottomAdapter$viewBinding.injectedViewContainerInjectedLoadingIndicatorContainer.injectedViewAdapterHolder</ID>
+    <ID>MaxLineLength:DocumentAnalyzer.kt$DocumentAnalyzer$Log.d("gini-api", "Analysis failed for document ${giniApiDocument?.id}: ${extractionsResource!!.message}")</ID>
+    <ID>MaxLineLength:ExampleUtil.kt$ExampleUtil$return extractionName == "amountToPay" || extractionName == "bic" || extractionName == "iban" || extractionName == "paymentReference" || extractionName == "paymentRecipient"</ID>
+    <ID>MaxLineLength:GiniExampleModule.kt$GiniExampleModule$"Missing Gini API client credentials. Either create a local.properties file " + "with clientId and clientSecret properties or pass them in as gradle " + "parameters with -PclientId and -PclientSecret."</ID>
+    <ID>MaxLineLength:MainActivity.kt$MainActivity$"Error: ${(result.value as ResultError.Capture).giniCaptureError.errorCode} ${(result.value as ResultError.Capture).giniCaptureError.message}"</ID>
+    <ID>MaxLineLength:MainActivity.kt$MainActivity$"Error: ${(result.value as ResultError.FileImport).code} ${(result.value as ResultError.FileImport).message}"</ID>
+    <ID>MaxLineLength:PermissionHandler.kt$PermissionHandler$private</ID>
+    <ID>MaxLineLength:SplashActivity.kt$SplashActivity$is GiniBank.CreateDocumentFromImportedFileResult.Error -> showErrorToast("Open with failed with error ${documentCreationResult.error}")</ID>
+    <ID>NewLineAtEndOfFile:CaptureFlowHostActivity.kt$net.gini.android.bank.sdk.exampleapp.ui.CaptureFlowHostActivity.kt</ID>
+    <ID>NewLineAtEndOfFile:ConfigurationActivity.kt$net.gini.android.bank.sdk.exampleapp.ui.ConfigurationActivity.kt</ID>
+    <ID>NewLineAtEndOfFile:ConfigurationViewModel.kt$net.gini.android.bank.sdk.exampleapp.ui.ConfigurationViewModel.kt</ID>
+    <ID>NewLineAtEndOfFile:CustomCameraNavigationBarBottomAdapter.kt$net.gini.android.bank.sdk.exampleapp.ui.adapters.CustomCameraNavigationBarBottomAdapter.kt</ID>
+    <ID>NewLineAtEndOfFile:CustomDigitalInvoiceNavigationBarBottomAdapter.kt$net.gini.android.bank.sdk.exampleapp.ui.adapters.CustomDigitalInvoiceNavigationBarBottomAdapter.kt</ID>
+    <ID>NewLineAtEndOfFile:CustomDigitalInvoiceOnboardingNavigationBarBottomAdapter.kt$net.gini.android.bank.sdk.exampleapp.ui.adapters.CustomDigitalInvoiceOnboardingNavigationBarBottomAdapter.kt</ID>
+    <ID>NewLineAtEndOfFile:CustomHelpActivity.kt$net.gini.android.bank.sdk.exampleapp.ui.CustomHelpActivity.kt</ID>
+    <ID>NewLineAtEndOfFile:CustomNavigationBarTopAdapter.kt$net.gini.android.bank.sdk.exampleapp.ui.adapters.CustomNavigationBarTopAdapter.kt</ID>
+    <ID>NewLineAtEndOfFile:CustomOnButtonLoadingIndicatorAdapter.kt$net.gini.android.bank.sdk.exampleapp.ui.adapters.CustomOnButtonLoadingIndicatorAdapter.kt</ID>
+    <ID>NewLineAtEndOfFile:CustomOnboardingIllustrationAdapter.kt$net.gini.android.bank.sdk.exampleapp.ui.adapters.CustomOnboardingIllustrationAdapter.kt</ID>
+    <ID>NewLineAtEndOfFile:CustomOnboardingNavigationBarBottomAdapter.kt$net.gini.android.bank.sdk.exampleapp.ui.adapters.CustomOnboardingNavigationBarBottomAdapter.kt</ID>
+    <ID>NewLineAtEndOfFile:CustomReviewNavigationBarBottomAdapter.kt$net.gini.android.bank.sdk.exampleapp.ui.adapters.CustomReviewNavigationBarBottomAdapter.kt</ID>
+    <ID>NewLineAtEndOfFile:CustomSkontoNavigationBarBottomAdapter.kt$net.gini.android.bank.sdk.exampleapp.ui.adapters.CustomSkontoNavigationBarBottomAdapter.kt</ID>
+    <ID>NewLineAtEndOfFile:DocumentAnalyzer.kt$net.gini.android.bank.sdk.exampleapp.core.DocumentAnalyzer.kt</ID>
+    <ID>NewLineAtEndOfFile:ExampleApp.kt$net.gini.android.bank.sdk.exampleapp.ExampleApp.kt</ID>
+    <ID>NewLineAtEndOfFile:ExampleUtil.kt$net.gini.android.bank.sdk.exampleapp.core.ExampleUtil.kt</ID>
+    <ID>NewLineAtEndOfFile:MainActivity.kt$net.gini.android.bank.sdk.exampleapp.ui.MainActivity.kt</ID>
+    <ID>NewLineAtEndOfFile:PayViewModel.kt$net.gini.android.bank.sdk.exampleapp.ui.pay.PayViewModel.kt</ID>
+    <ID>NewLineAtEndOfFile:PermissionHandler.kt$net.gini.android.bank.sdk.exampleapp.core.PermissionHandler.kt</ID>
+    <ID>NewLineAtEndOfFile:ResultWrapper.kt$net.gini.android.bank.sdk.exampleapp.core.ResultWrapper.kt</ID>
+    <ID>NewLineAtEndOfFile:SplashActivity.kt$net.gini.android.bank.sdk.exampleapp.ui.SplashActivity.kt</ID>
+    <ID>SwallowedException:ExampleApp.kt$ExampleApp$e: IllegalStateException</ID>
+    <ID>TooGenericExceptionCaught:PayActivity.kt$PayActivity$t: Throwable</ID>
+    <ID>TooGenericExceptionCaught:ResultWrapper.kt$throwable: Throwable</ID>
+    <ID>TooManyFunctions:ExtractionsActivity.kt$ExtractionsActivity : AppCompatActivityExtractionsAdapterInterface</ID>
+    <ID>TooManyFunctions:MainActivity.kt$MainActivity : AppCompatActivity</ID>
+    <ID>UnusedParameter:ExtractionsActivity.kt$ExtractionsActivity$binding: ActivityExtractionsBinding</ID>
+    <ID>UnusedPrivateMember:ClientBankSDKFragment.kt$ClientBankSDKFragment$private fun overrideBankSDKConfiguration()</ID>
+    <ID>UnusedPrivateMember:ExtractionsActivity.kt$ExtractionsActivity$private fun hideProgressIndicator(binding: ActivityExtractionsBinding)</ID>
+    <ID>UnusedPrivateMember:ExtractionsActivity.kt$ExtractionsActivity$private fun showProgressIndicator(binding: ActivityExtractionsBinding)</ID>
+    <ID>UnusedPrivateProperty:ClientCaptureSDKFragment.kt$ClientCaptureSDKFragment$val capture = GiniCapture.Builder() .setGiniCaptureNetworkService(networkService) .setFileImportEnabled(true) .setDocumentImportEnabledFileTypes(DocumentImportEnabledFileTypes.PDF_AND_IMAGES) .setQRCodeScanningEnabled(true) .setFlashButtonEnabled(true) .setMultiPageEnabled(true) .build()</ID>
+    <ID>UnusedPrivateProperty:MainActivity.kt$MainActivity.Companion$private const val REQUEST_CONFIGURATION = 3</ID>
+  </CurrentIssues>
+</SmellBaseline>
diff --git a/bank-sdk/example-app/src/main/AndroidManifest.xml b/bank-sdk/example-app/src/main/AndroidManifest.xml
index 806bed0e97..0761fff595 100644
--- a/bank-sdk/example-app/src/main/AndroidManifest.xml
+++ b/bank-sdk/example-app/src/main/AndroidManifest.xml
@@ -4,7 +4,7 @@
 
     <application
         android:name=".ExampleApp"
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:largeHeap="true"
diff --git a/bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/ConfigurationActivity.kt b/bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/ConfigurationActivity.kt
index bba1f063eb..1afaba2a54 100644
--- a/bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/ConfigurationActivity.kt
+++ b/bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/ConfigurationActivity.kt
@@ -51,7 +51,7 @@ class ConfigurationActivity : AppCompatActivity() {
                 }
                 launch {
                     configurationViewModel.disableCameraPermissionFlow.collect {
-                        binding.switchDisableCameraPermission.isChecked =
+                        binding.layoutDebugDevelopmentOptionsToggles.switchDisableCameraPermission.isChecked =
                             it
                     }
                 }
@@ -59,7 +59,7 @@ class ConfigurationActivity : AppCompatActivity() {
             }
         }
 
-        binding.switchDisableCameraPermission.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutDebugDevelopmentOptionsToggles.switchDisableCameraPermission.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.disableCameraPermission(isChecked)
         }
 
@@ -104,21 +104,21 @@ class ConfigurationActivity : AppCompatActivity() {
 
     private fun updateUIWithConfigurationObject(configuration: Configuration) {
         // 0 setup sdk with default configuration
-        binding.switchSetupSdkWithDefaultConfiguration.isChecked =
+        binding.layoutFeatureToggle.switchSetupSdkWithDefaultConfiguration.isChecked =
             configuration.isDefaultSDKConfigurationsEnabled
         // 1 file import
-        binding.switchOpenWith.isChecked = configuration.isFileImportEnabled
+        binding.layoutFeatureToggle.switchOpenWith.isChecked = configuration.isFileImportEnabled
         // 2 QR code scanning
-        binding.switchQrCodeScanning.isChecked = configuration.isQrCodeEnabled
+        binding.layoutFeatureToggle.switchQrCodeScanning.isChecked = configuration.isQrCodeEnabled
         // 3 only QR code scanning
-        binding.switchOnlyQRCodeScanning.isChecked = configuration.isOnlyQrCodeEnabled
+        binding.layoutFeatureToggle.switchOnlyQRCodeScanning.isChecked = configuration.isOnlyQrCodeEnabled
 
         // 4 enable multi page
-        binding.switchMultiPage.isChecked = configuration.isMultiPageEnabled
+        binding.layoutFeatureToggle.switchMultiPage.isChecked = configuration.isMultiPageEnabled
         // 5 enable flash toggle
-        binding.switchDisplayFlashButton.isChecked = configuration.isFlashButtonDisplayed
+        binding.layoutCameraToggles.switchDisplayFlashButton.isChecked = configuration.isFlashButtonDisplayed
         // 6 enable flash on by default
-        binding.switchFlashOnByDefault.isChecked = configuration.isFlashDefaultStateEnabled
+        binding.layoutCameraToggles.switchFlashOnByDefault.isChecked = configuration.isFlashDefaultStateEnabled
         // 7 set import document type support
         val checkButtonId = when (configuration.documentImportEnabledFileTypes) {
             DocumentImportEnabledFileTypes.NONE -> R.id.btn_fileImportDisabled
@@ -126,101 +126,107 @@ class ConfigurationActivity : AppCompatActivity() {
             DocumentImportEnabledFileTypes.PDF_AND_IMAGES -> R.id.btn_fileImportPdfAndImage
             else -> R.id.btn_fileImportOnlyPdf
         }
-        binding.toggleBtnFileImportSetup.check(checkButtonId)
+        binding.layoutFeatureToggle.toggleBtnFileImportSetup.check(checkButtonId)
         // 8 enable bottom navigation bar
-        binding.switchShowBottomNavbar.isChecked = configuration.isBottomNavigationBarEnabled
+        binding.layoutBottomNavigationToggles.switchShowBottomNavbar.isChecked = configuration.isBottomNavigationBarEnabled
         // 9 enable Help screens custom bottom navigation bar
-        binding.switchShowHelpScreenCustomBottomNavbar.isChecked =
+        binding.layoutBottomNavigationToggles.switchShowHelpScreenCustomBottomNavbar.isChecked =
             configuration.isHelpScreensCustomBottomNavBarEnabled
         // 10 enable camera screens custom bottom navigation bar
-        binding.switchCameraScreenCustomBottomNavbar.isChecked =
+        binding.layoutBottomNavigationToggles.switchCameraScreenCustomBottomNavbar.isChecked =
             configuration.isCameraBottomNavBarEnabled
         // 11 enable review screens custom bottom navigation bar
-        binding.switchReviewScreenCustomBottomNavbar.isChecked =
+        binding.layoutBottomNavigationToggles.switchReviewScreenCustomBottomNavbar.isChecked =
             configuration.isReviewScreenCustomBottomNavBarEnabled
 
+        binding.layoutBottomNavigationToggles.switchSkontoCustomBottomNavbar.isChecked  =
+                configuration.isSkontoCustomNavBarEnabled
+
         // 12 enable image picker screens custom bottom navigation bar -> was implemented on iOS, not needed for Android
 
         // 13 enable onboarding screens at first launch
-        binding.switchOnboardingScreensAtFirstRun.isChecked =
+        binding.layoutOnboardingToggles.switchOnboardingScreensAtFirstRun.isChecked =
             configuration.isOnboardingAtFirstRunEnabled
         // 14 enable onboarding at every launch
-        binding.switchOnboardingScreensAtEveryLaunch.isChecked =
+        binding.layoutOnboardingToggles.switchOnboardingScreensAtEveryLaunch.isChecked =
             configuration.isOnboardingAtEveryLaunchEnabled
         // 15 enable custom onboarding pages
-        binding.switchCustomOnboardingPages.isChecked = configuration.isCustomOnboardingPagesEnabled
+        binding.layoutOnboardingToggles.switchCustomOnboardingPages.isChecked = configuration.isCustomOnboardingPagesEnabled
         // 16 enable align corners onboarding pages
-        binding.switchCustomOnboardingAlignCornersPage.isChecked =
+        binding.layoutOnboardingToggles.switchCustomOnboardingAlignCornersPage.isChecked =
             configuration.isAlignCornersInCustomOnboardingEnabled
         // 17 enable lighting in custom onboarding pages
-        binding.switchCustomOnboardingLightingPage.isChecked =
+        binding.layoutOnboardingToggles.switchCustomOnboardingLightingPage.isChecked =
             configuration.isLightingInCustomOnboardingEnabled
         // 18 enable QR code in custom onboarding pages
-        binding.switchCustomOnboardingQRCodePage.isChecked =
+        binding.layoutOnboardingToggles.switchCustomOnboardingQRCodePage.isChecked =
             configuration.isQRCodeInCustomOnboardingEnabled
         // 19 enable multi page in custom onboarding pages
-        binding.switchCustomOnboardingMultiPage.isChecked =
+        binding.layoutOnboardingToggles.switchCustomOnboardingMultiPage.isChecked =
             configuration.isMultiPageInCustomOnboardingEnabled
         // 20 enable custom navigation bar in custom onboarding pages
-        binding.switchOnboardingCustomNavBar.isChecked =
+        binding.layoutBottomNavigationToggles.switchOnboardingCustomNavBar.isChecked =
             configuration.isCustomNavigationBarInCustomOnboardingEnabled
         // 21 enable button's custom loading indicator
-        binding.switchButtonsCustomLoadingIndicator.isChecked =
+        binding.layoutGeneralUiCustomizationToggles.switchButtonsCustomLoadingIndicator.isChecked =
             configuration.isButtonsCustomLoadingIndicatorEnabled
         // 22 enable screen's custom loading indicator
-        binding.switchScreenCustomLoadingIndicator.isChecked =
+        binding.layoutAnalysisToggles.switchScreenCustomLoadingIndicator.isChecked =
             configuration.isScreenCustomLoadingIndicatorEnabled
         // 23 enable supported format help screen
-        binding.switchSupportedFormatsScreen.isChecked =
+        binding.layoutHelpToggles.switchSupportedFormatsScreen.isChecked =
             configuration.isSupportedFormatsHelpScreenEnabled
         // 24 enable custom help items
-        binding.switchCustomHelpMenuItems.isChecked = configuration.isCustomHelpItemsEnabled
+        binding.layoutHelpToggles.switchCustomHelpMenuItems.isChecked = configuration.isCustomHelpItemsEnabled
         // 25 enable custom navigation bar
-        binding.switchCustomNavigationController.isChecked = configuration.isCustomNavBarEnabled
+        binding.layoutGeneralUiCustomizationToggles.switchCustomNavigationController.isChecked = configuration.isCustomNavBarEnabled
         // 26 enable event tracker
-        binding.switchEventTracker.isChecked = configuration.isEventTrackerEnabled
+        binding.layoutFeatureToggle.switchEventTracker.isChecked = configuration.isEventTrackerEnabled
         // 27 enable Gini error logger
-        binding.switchGiniErrorLogger.isChecked = configuration.isGiniErrorLoggerEnabled
+        binding.layoutDebugDevelopmentOptionsToggles.switchGiniErrorLogger.isChecked = configuration.isGiniErrorLoggerEnabled
         // 28 enable custom error logger
-        binding.switchCustomErrorLogger.isChecked = configuration.isCustomErrorLoggerEnabled
+        binding.layoutDebugDevelopmentOptionsToggles.switchCustomErrorLogger.isChecked = configuration.isCustomErrorLoggerEnabled
         // 29 set imported file size bytes limit
-        binding.editTextImportedFileSizeBytesLimit.hint =
+        binding.layoutDebugDevelopmentOptionsToggles.editTextImportedFileSizeBytesLimit.hint =
             configuration.importedFileSizeBytesLimit.toString()
 
         // 31 enable return assistant
-        binding.switchReturnAssistantFeature.isChecked = configuration.isReturnAssistantEnabled
+        binding.layoutFeatureToggle.switchReturnAssistantFeature.isChecked = configuration.isReturnAssistantEnabled
 
         // 32 enable return reasons dialog
-        binding.switchReturnReasonsDialog.isChecked = configuration.isReturnReasonsEnabled
+        binding.layoutReturnAssistantToggles.switchReturnReasonsDialog.isChecked = configuration.isReturnReasonsEnabled
 
         // 33 Digital invoice onboarding custom illustration
-        binding.switchDigitalInvoiceOnboardingCustomIllustration.isChecked =
+        binding.layoutReturnAssistantToggles.switchDigitalInvoiceOnboardingCustomIllustration.isChecked =
             configuration.isDigitalInvoiceOnboardingCustomIllustrationEnabled
 
         // 34 Digital invoice help bottom navigation bar
-        binding.switchDigitalInvoiceHelpBottomNavigationBar.isChecked =
+        binding.layoutBottomNavigationToggles.switchDigitalInvoiceHelpBottomNavigationBar.isChecked =
             configuration.isDigitalInvoiceHelpBottomNavigationBarEnabled
 
         // 35 Digital invoice onboarding bottom navigation bar
-        binding.switchDigitalInvoiceOnboardingBottomNavigationBar.isChecked =
+        binding.layoutBottomNavigationToggles.switchDigitalInvoiceOnboardingBottomNavigationBar.isChecked =
             configuration.isDigitalInvoiceOnboardingBottomNavigationBarEnabled
 
         // 36 Digital invoice bottom navigation bar
-        binding.switchDigitalInvoiceBottomNavigationBar.isChecked =
+        binding.layoutBottomNavigationToggles.switchDigitalInvoiceBottomNavigationBar.isChecked =
             configuration.isDigitalInvoiceBottomNavigationBarEnabled
 
         // Allow screenshots
-        binding.switchAllowScreenshots.isChecked =
+        binding.layoutDebugDevelopmentOptionsToggles.switchAllowScreenshots.isChecked =
             configuration.isAllowScreenshotsEnabled
 
         // 37 Debug mode
-        binding.switchDebugMode.isChecked =
+        binding.layoutDebugDevelopmentOptionsToggles.switchDebugMode.isChecked =
             configuration.isDebugModeEnabled
+
+        // 40 enable skonto
+        binding.layoutFeatureToggle.switchSkontoFeature.isChecked = configuration.isSkontoEnabled
     }
 
     private fun setConfigurationFeatures() {
         // 0 setup sdk with default configuration
-        binding.switchSetupSdkWithDefaultConfiguration.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutFeatureToggle.switchSetupSdkWithDefaultConfiguration.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isDefaultSDKConfigurationsEnabled = isChecked
@@ -232,7 +238,7 @@ class ConfigurationActivity : AppCompatActivity() {
         }
 
         // 1 file import
-        binding.switchOpenWith.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutFeatureToggle.switchOpenWith.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isFileImportEnabled = isChecked
@@ -241,7 +247,7 @@ class ConfigurationActivity : AppCompatActivity() {
         }
 
         // 2 QR code scanning
-        binding.switchQrCodeScanning.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutFeatureToggle.switchQrCodeScanning.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isQrCodeEnabled = isChecked
@@ -257,7 +263,7 @@ class ConfigurationActivity : AppCompatActivity() {
 
         }
         // 3 only QR code scanning
-        binding.switchOnlyQRCodeScanning.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutFeatureToggle.switchOnlyQRCodeScanning.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isOnlyQrCodeEnabled = isChecked
@@ -272,7 +278,7 @@ class ConfigurationActivity : AppCompatActivity() {
             }
         }
         // 4 enable multi page
-        binding.switchMultiPage.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutFeatureToggle.switchMultiPage.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isMultiPageEnabled = isChecked
@@ -280,7 +286,7 @@ class ConfigurationActivity : AppCompatActivity() {
             )
         }
         // 5 enable flash toggle
-        binding.switchDisplayFlashButton.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutCameraToggles.switchDisplayFlashButton.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isFlashButtonDisplayed = isChecked
@@ -295,7 +301,7 @@ class ConfigurationActivity : AppCompatActivity() {
             }
         }
         // 6 enable flash on by default
-        binding.switchFlashOnByDefault.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutCameraToggles.switchFlashOnByDefault.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isFlashDefaultStateEnabled = isChecked
@@ -310,7 +316,7 @@ class ConfigurationActivity : AppCompatActivity() {
             }
         }
         // 7 set import document type support
-        binding.toggleBtnFileImportSetup.addOnButtonCheckedListener { toggleButton, checkedId, isChecked ->
+        binding.layoutFeatureToggle.toggleBtnFileImportSetup.addOnButtonCheckedListener { toggleButton, checkedId, isChecked ->
             val checked = toggleButton.checkedButtonId
             configurationViewModel.setConfiguration(
                 when (checked) {
@@ -334,7 +340,7 @@ class ConfigurationActivity : AppCompatActivity() {
         }
 
         // 8 enable bottom navigation bar
-        binding.switchShowBottomNavbar.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutBottomNavigationToggles.switchShowBottomNavbar.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isBottomNavigationBarEnabled = isChecked
@@ -343,7 +349,7 @@ class ConfigurationActivity : AppCompatActivity() {
         }
 
         // 9 enable Help screens custom bottom navigation bar
-        binding.switchShowHelpScreenCustomBottomNavbar.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutBottomNavigationToggles.switchShowHelpScreenCustomBottomNavbar.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isHelpScreensCustomBottomNavBarEnabled = isChecked
@@ -352,7 +358,7 @@ class ConfigurationActivity : AppCompatActivity() {
         }
 
         // 10 enable camera screens custom bottom navigation bar
-        binding.switchCameraScreenCustomBottomNavbar.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutBottomNavigationToggles.switchCameraScreenCustomBottomNavbar.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isCameraBottomNavBarEnabled = isChecked
@@ -361,7 +367,7 @@ class ConfigurationActivity : AppCompatActivity() {
         }
 
         // 11 enable review screens custom bottom navigation bar
-        binding.switchReviewScreenCustomBottomNavbar.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutBottomNavigationToggles.switchReviewScreenCustomBottomNavbar.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isReviewScreenCustomBottomNavBarEnabled = isChecked
@@ -369,10 +375,18 @@ class ConfigurationActivity : AppCompatActivity() {
             )
         }
 
+        binding.layoutBottomNavigationToggles.switchSkontoCustomBottomNavbar.setOnCheckedChangeListener { _, isChecked ->
+            configurationViewModel.setConfiguration(
+                configurationViewModel.configurationFlow.value.copy(
+                    isSkontoCustomNavBarEnabled = isChecked
+                )
+            )
+        }
+
         // 12 enable image picker screens custom bottom navigation bar -> was implemented on iOS, not needed for Android
 
         // 13 enable onboarding screens at first launch
-        binding.switchOnboardingScreensAtFirstRun.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutOnboardingToggles.switchOnboardingScreensAtFirstRun.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isOnboardingAtFirstRunEnabled = isChecked
@@ -381,7 +395,7 @@ class ConfigurationActivity : AppCompatActivity() {
         }
 
         // 14 enable onboarding at every launch
-        binding.switchOnboardingScreensAtEveryLaunch.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutOnboardingToggles.switchOnboardingScreensAtEveryLaunch.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isOnboardingAtEveryLaunchEnabled = isChecked
@@ -390,7 +404,7 @@ class ConfigurationActivity : AppCompatActivity() {
         }
 
         // 15 enable custom onboarding pages
-        binding.switchCustomOnboardingPages.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutOnboardingToggles.switchCustomOnboardingPages.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isCustomOnboardingPagesEnabled = isChecked
@@ -398,7 +412,7 @@ class ConfigurationActivity : AppCompatActivity() {
             )
         }
         // 16 enable align corners onboarding pages
-        binding.switchCustomOnboardingAlignCornersPage.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutOnboardingToggles.switchCustomOnboardingAlignCornersPage.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isAlignCornersInCustomOnboardingEnabled = isChecked
@@ -406,7 +420,7 @@ class ConfigurationActivity : AppCompatActivity() {
             )
         }
         // 17 enable lighting in custom onboarding pages
-        binding.switchCustomOnboardingLightingPage.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutOnboardingToggles.switchCustomOnboardingLightingPage.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isLightingInCustomOnboardingEnabled = isChecked
@@ -414,15 +428,16 @@ class ConfigurationActivity : AppCompatActivity() {
             )
         }
         // 18 enable QR code in custom onboarding pages
-        binding.switchCustomOnboardingQRCodePage.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutOnboardingToggles.switchCustomOnboardingQRCodePage.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isQRCodeInCustomOnboardingEnabled = isChecked
                 )
             )
         }
+
         // 19 enable multi page in custom onboarding pages
-        binding.switchCustomOnboardingMultiPage.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutOnboardingToggles.switchCustomOnboardingMultiPage.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isMultiPageInCustomOnboardingEnabled = isChecked
@@ -430,7 +445,7 @@ class ConfigurationActivity : AppCompatActivity() {
             )
         }
         // 20 enable custom navigation bar in custom onboarding pages
-        binding.switchOnboardingCustomNavBar.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutBottomNavigationToggles.switchOnboardingCustomNavBar.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isCustomNavigationBarInCustomOnboardingEnabled = isChecked
@@ -438,7 +453,7 @@ class ConfigurationActivity : AppCompatActivity() {
             )
         }
         // 21 enable button's custom loading indicator
-        binding.switchButtonsCustomLoadingIndicator.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutGeneralUiCustomizationToggles.switchButtonsCustomLoadingIndicator.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isButtonsCustomLoadingIndicatorEnabled = isChecked
@@ -447,7 +462,7 @@ class ConfigurationActivity : AppCompatActivity() {
         }
 
         // 22 enable screen's custom loading indicator
-        binding.switchScreenCustomLoadingIndicator.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutAnalysisToggles.switchScreenCustomLoadingIndicator.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isScreenCustomLoadingIndicatorEnabled = isChecked
@@ -456,7 +471,7 @@ class ConfigurationActivity : AppCompatActivity() {
         }
 
         // 23 enable supported format help screen
-        binding.switchSupportedFormatsScreen.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutHelpToggles.switchSupportedFormatsScreen.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isSupportedFormatsHelpScreenEnabled = isChecked
@@ -465,7 +480,7 @@ class ConfigurationActivity : AppCompatActivity() {
         }
 
         // 24 enable custom help items
-        binding.switchCustomHelpMenuItems.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutHelpToggles.switchCustomHelpMenuItems.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isCustomHelpItemsEnabled = isChecked
@@ -474,7 +489,7 @@ class ConfigurationActivity : AppCompatActivity() {
         }
 
         // 25 enable custom navigation bar
-        binding.switchCustomNavigationController.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutGeneralUiCustomizationToggles.switchCustomNavigationController.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isCustomNavBarEnabled = isChecked
@@ -483,7 +498,7 @@ class ConfigurationActivity : AppCompatActivity() {
         }
 
         // 26 enable event tracker
-        binding.switchEventTracker.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutFeatureToggle.switchEventTracker.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isEventTrackerEnabled = isChecked
@@ -492,7 +507,7 @@ class ConfigurationActivity : AppCompatActivity() {
         }
 
         // 27 enable Gini error logger
-        binding.switchGiniErrorLogger.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutDebugDevelopmentOptionsToggles.switchGiniErrorLogger.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isGiniErrorLoggerEnabled = isChecked
@@ -501,7 +516,7 @@ class ConfigurationActivity : AppCompatActivity() {
         }
 
         // 28 enable custom error logger
-        binding.switchCustomErrorLogger.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutDebugDevelopmentOptionsToggles.switchCustomErrorLogger.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isCustomErrorLoggerEnabled = isChecked
@@ -510,7 +525,7 @@ class ConfigurationActivity : AppCompatActivity() {
         }
 
         // 29 set imported file size bytes limit
-        binding.editTextImportedFileSizeBytesLimit.doAfterTextChanged {
+        binding.layoutDebugDevelopmentOptionsToggles.editTextImportedFileSizeBytesLimit.doAfterTextChanged {
             if (it.toString().isNotEmpty()) {
                 configurationViewModel.setConfiguration(
                     configurationViewModel.configurationFlow.value.copy(
@@ -521,7 +536,7 @@ class ConfigurationActivity : AppCompatActivity() {
         }
 
         // 31 enable return assistant
-        binding.switchReturnAssistantFeature.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutFeatureToggle.switchReturnAssistantFeature.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isReturnAssistantEnabled = isChecked
@@ -530,7 +545,7 @@ class ConfigurationActivity : AppCompatActivity() {
         }
 
         // 32 enable return reasons dialog
-        binding.switchReturnReasonsDialog.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutReturnAssistantToggles.switchReturnReasonsDialog.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isReturnReasonsEnabled = isChecked
@@ -539,7 +554,7 @@ class ConfigurationActivity : AppCompatActivity() {
         }
 
         // 33 Digital invoice onboarding custom illustration
-        binding.switchDigitalInvoiceOnboardingCustomIllustration.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutReturnAssistantToggles.switchDigitalInvoiceOnboardingCustomIllustration.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isDigitalInvoiceOnboardingCustomIllustrationEnabled = isChecked
@@ -548,7 +563,7 @@ class ConfigurationActivity : AppCompatActivity() {
         }
 
         // 34 Digital invoice help bottom navigation bar
-        binding.switchDigitalInvoiceHelpBottomNavigationBar.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutBottomNavigationToggles.switchDigitalInvoiceHelpBottomNavigationBar.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isDigitalInvoiceHelpBottomNavigationBarEnabled = isChecked
@@ -557,7 +572,7 @@ class ConfigurationActivity : AppCompatActivity() {
         }
 
         // 35 Digital invoice onboarding bottom navigation bar
-        binding.switchDigitalInvoiceOnboardingBottomNavigationBar.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutBottomNavigationToggles.switchDigitalInvoiceOnboardingBottomNavigationBar.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isDigitalInvoiceOnboardingBottomNavigationBarEnabled = isChecked
@@ -566,7 +581,7 @@ class ConfigurationActivity : AppCompatActivity() {
         }
 
         // 36 Digital invoice bottom navigation bar
-        binding.switchDigitalInvoiceBottomNavigationBar.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutBottomNavigationToggles.switchDigitalInvoiceBottomNavigationBar.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isDigitalInvoiceBottomNavigationBarEnabled = isChecked
@@ -575,7 +590,7 @@ class ConfigurationActivity : AppCompatActivity() {
         }
 
         // Allow screenshots
-        binding.switchAllowScreenshots.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutDebugDevelopmentOptionsToggles.switchAllowScreenshots.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isAllowScreenshotsEnabled = isChecked
@@ -584,13 +599,21 @@ class ConfigurationActivity : AppCompatActivity() {
         }
 
         // 37 Debug mode
-        binding.switchDebugMode.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutDebugDevelopmentOptionsToggles.switchDebugMode.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isDebugModeEnabled = isChecked
                 )
             )
         }
+
+        binding.layoutFeatureToggle.switchSkontoFeature.setOnCheckedChangeListener { _, isChecked ->
+            configurationViewModel.setConfiguration(
+                configurationViewModel.configurationFlow.value.copy(
+                    isSkontoEnabled = isChecked
+                )
+            )
+        }
     }
 
 }
\ No newline at end of file
diff --git a/bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/ConfigurationViewModel.kt b/bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/ConfigurationViewModel.kt
index e2abeb843b..94475f05c3 100644
--- a/bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/ConfigurationViewModel.kt
+++ b/bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/ConfigurationViewModel.kt
@@ -26,6 +26,7 @@ import net.gini.android.bank.sdk.exampleapp.ui.adapters.CustomOnButtonLoadingInd
 import net.gini.android.bank.sdk.exampleapp.ui.adapters.CustomOnboardingIllustrationAdapter
 import net.gini.android.bank.sdk.exampleapp.ui.adapters.CustomOnboardingNavigationBarBottomAdapter
 import net.gini.android.bank.sdk.exampleapp.ui.adapters.CustomReviewNavigationBarBottomAdapter
+import net.gini.android.bank.sdk.exampleapp.ui.adapters.CustomSkontoNavigationBarBottomAdapter
 import net.gini.android.bank.sdk.exampleapp.ui.data.Configuration
 import net.gini.android.capture.GiniCaptureDebug
 import net.gini.android.capture.help.HelpItem
@@ -122,7 +123,10 @@ class ConfigurationViewModel @Inject constructor(
             returnAssistantEnabled = configuration.isReturnAssistantEnabled,
 
             // allow screenshots
-            allowScreenshots = configuration.isAllowScreenshotsEnabled
+            allowScreenshots = configuration.isAllowScreenshotsEnabled,
+
+            // 40 enable skonto
+            skontoEnabled = configuration.isSkontoEnabled,
         )
 
         // 9 enable Help screens custom bottom navigation bar
@@ -275,6 +279,12 @@ class ConfigurationViewModel @Inject constructor(
                 CustomDigitalInvoiceHelpNavigationBarBottomAdapter()
         }
 
+        if (configuration.isSkontoCustomNavBarEnabled) {
+            GiniBank.skontoNavigationBarBottomAdapter = CustomSkontoNavigationBarBottomAdapter()
+        } else {
+            GiniBank.skontoNavigationBarBottomAdapter = null
+        }
+
         // 35 Digital invoice onboarding bottom navigation bar
         if (configuration.isDigitalInvoiceOnboardingBottomNavigationBarEnabled) {
             GiniBank.digitalInvoiceOnboardingNavigationBarBottomAdapter =
diff --git a/bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/MainActivity.kt b/bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/MainActivity.kt
index 967e2f8d6a..3b3858c233 100644
--- a/bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/MainActivity.kt
+++ b/bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/MainActivity.kt
@@ -77,7 +77,7 @@ class MainActivity : AppCompatActivity() {
         cancellationToken?.cancel()
     }
 
-    override fun onNewIntent(intent: Intent?) {
+    override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         if (intent != null && isIntentActionViewOrSend(intent)) {
             startGiniBankSdkForOpenWith(intent)
diff --git a/bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/adapters/CustomSkontoNavigationBarBottomAdapter.kt b/bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/adapters/CustomSkontoNavigationBarBottomAdapter.kt
new file mode 100644
index 0000000000..21bea13e37
--- /dev/null
+++ b/bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/adapters/CustomSkontoNavigationBarBottomAdapter.kt
@@ -0,0 +1,59 @@
+package net.gini.android.bank.sdk.exampleapp.ui.adapters
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import net.gini.android.bank.sdk.capture.skonto.SkontoNavigationBarBottomAdapter
+import net.gini.android.bank.sdk.exampleapp.databinding.CustomSkontoNavigationBarBinding
+
+class CustomSkontoNavigationBarBottomAdapter : SkontoNavigationBarBottomAdapter {
+
+    private var binding: CustomSkontoNavigationBarBinding? = null
+
+    override fun setOnBackClickListener(onClick: () -> Unit) {
+        binding?.gbsBackBtn?.setOnClickListener { onClick() }
+    }
+
+    override fun setOnProceedClickListener(onClick: () -> Unit) {
+        binding?.gbsPay?.setOnClickListener { onClick() }
+    }
+
+
+    override fun onTotalAmountUpdated(amount: String) {
+        binding?.priceTotal?.text = amount
+    }
+
+    override fun setOnHelpClickListener(onClick: () -> Unit) {
+        // Unused now
+    }
+
+    override fun onSkontoPercentageBadgeUpdated(text: String) {
+        binding?.discountInfo?.text = text
+    }
+
+    override fun onSkontoPercentageBadgeVisibilityUpdate(isVisible: Boolean) {
+        binding?.discountInfo?.isVisible = isVisible
+    }
+
+    override fun onSkontoSavingsAmountUpdated(text: String) {
+        binding?.skontoSavingsAmount?.text = text
+    }
+
+    override fun onSkontoSavingsAmountVisibilityUpdated(isVisible: Boolean) {
+        binding?.skontoSavingsAmount?.isVisible = isVisible
+    }
+
+    override fun onCreateView(container: ViewGroup): View {
+        binding = CustomSkontoNavigationBarBinding.inflate(
+            LayoutInflater.from(container.context),
+            container,
+            false
+        )
+        return binding!!.root
+    }
+
+    override fun onDestroy() {
+        binding = null
+    }
+}
\ No newline at end of file
diff --git a/bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/data/Configuration.kt b/bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/data/Configuration.kt
index cc40c366fa..4af4125c3e 100644
--- a/bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/data/Configuration.kt
+++ b/bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/data/Configuration.kt
@@ -154,8 +154,15 @@ data class Configuration(
     // 37 Debug mode
     val isDebugModeEnabled: Boolean = true,
 
+    // 38 Is Allow Screenshots
     val isAllowScreenshotsEnabled: Boolean = true,
 
+    // 39 Skonto Custom bottom navigation
+    val isSkontoCustomNavBarEnabled: Boolean = false,
+
+    // 40 enable Skonto
+    val isSkontoEnabled: Boolean = true,
+
     ) : Parcelable {
 
     companion object {
@@ -174,7 +181,8 @@ data class Configuration(
                 isSupportedFormatsHelpScreenEnabled = defaultCaptureConfiguration.supportedFormatsHelpScreenEnabled,
                 isGiniErrorLoggerEnabled = defaultCaptureConfiguration.giniErrorLoggerIsOn,
                 isReturnAssistantEnabled = defaultCaptureConfiguration.returnAssistantEnabled,
-                isAllowScreenshotsEnabled = defaultCaptureConfiguration.allowScreenshots
+                isAllowScreenshotsEnabled = defaultCaptureConfiguration.allowScreenshots,
+                isSkontoEnabled = defaultCaptureConfiguration.skontoEnabled
             )
 
 
diff --git a/bank-sdk/example-app/src/main/res/drawable/bg_round_corners.xml b/bank-sdk/example-app/src/main/res/drawable/bg_round_corners.xml
new file mode 100644
index 0000000000..bee373f09d
--- /dev/null
+++ b/bank-sdk/example-app/src/main/res/drawable/bg_round_corners.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/gc_color_01"/>
+    <corners android:radius="10dp"/>
+    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
+</shape>
\ No newline at end of file
diff --git a/bank-sdk/example-app/src/main/res/layout/activity_configuration.xml b/bank-sdk/example-app/src/main/res/layout/activity_configuration.xml
index 845396ef52..3bedeb0241 100644
--- a/bank-sdk/example-app/src/main/res/layout/activity_configuration.xml
+++ b/bank-sdk/example-app/src/main/res/layout/activity_configuration.xml
@@ -1,557 +1,116 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ui.ConfigurationActivity">
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/gc_color_03"
+        android:orientation="vertical">
 
-    <ScrollView
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginHorizontal="@dimen/gc_large"
+            android:layout_margin="16dp"
+            android:background="@drawable/bg_round_corners"
             android:orientation="vertical"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp">
+            android:padding="8dp">
 
             <TextView
                 android:id="@+id/tv_relaunchForDefaultConfiguration"
                 style="@style/TextAppearance.MaterialComponents.Body1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/relaunch_to_use_default_configuration"
-                 />
+                android:text="@string/relaunch_to_use_default_configuration" />
 
             <TextView
                 android:id="@+id/tv_closeForConfigurationsToTakePlace"
                 style="@style/TextAppearance.MaterialComponents.Body1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/close_screen_for_configurations_to_take_place"
                 android:layout_marginTop="@dimen/gc_medium_12"
-                />
-
-            <com.google.android.material.divider.MaterialDivider
-                android:id="@+id/divider2"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium" />
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_setupSdkWithDefaultConfiguration"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/default_sdk_configuration_switch_label"
-                />
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_openWith"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/file_import_switch_label"
-                />
-
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_qrCodeScanning"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/qr_code_scanning_switch_label" />
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_onlyQRCodeScanning"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/only_qr_code_scanning_switch_label" />
-
-            <TextView
-                android:id="@+id/tv_onlyQrCodeDescription"
-                style="@style/TextAppearance.MaterialComponents.Caption"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/only_qr_code_scanning_switch_description" />
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_multiPage"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                android:text="@string/multi_page_switch_label" />
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_displayFlashButton"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/flash_button_switch_label" />
-
-            <TextView
-                android:id="@+id/tv_flashButtonDescription"
-                style="@style/TextAppearance.MaterialComponents.Caption"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/flash_button_switch_description" />
-
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_flashOnByDefault"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/flash_on_by_default_switch_label" />
-
-            <TextView
-                android:id="@+id/tv_flashOnByDefaultDescription"
-                style="@style/TextAppearance.MaterialComponents.Caption"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/flash_on_by_default_switch_description" />
-
-            <TextView
-                android:id="@+id/tv_fileImportLabel"
-                style="@style/SwitchConfigurationStyle"                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_large"
-                android:text="@string/document_import_file_types_segmented_button_label" />
-
-            <com.google.android.material.button.MaterialButtonToggleGroup
-                android:id="@+id/toggleBtn_fileImportSetup"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                app:selectionRequired="true"
-                app:singleSelection="true">
-
-                <Button
-                    android:id="@+id/btn_fileImportDisabled"
-                    style="?attr/materialButtonOutlinedStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/document_import_file_types_disabled_button_label" />
-
-                <Button
-                    android:id="@+id/btn_fileImportOnlyPdf"
-                    style="?attr/materialButtonOutlinedStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/document_import_file_types_only_pdf_button_label" />
-
-                <Button
-                    android:id="@+id/btn_fileImportPdfAndImage"
-                    style="?attr/materialButtonOutlinedStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/document_import_file_types_pdf_and_image_button_label" />
-            </com.google.android.material.button.MaterialButtonToggleGroup>
-
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_showBottomNavbar"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/bottom_navbar_switch_label" />
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_showHelpScreenCustomBottomNavbar"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/help_screens_bottom_navbar_switch_label" />
-
-            <TextView
-                android:id="@+id/tv_showHelpScreenCustomBottomNavbarDescription"
-                style="@style/TextAppearance.MaterialComponents.Caption"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/custom_bottom_navbar_switch_description" />
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_cameraScreenCustomBottomNavbar"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                android:text="@string/camera_screen_custom_bottom_navbar_switch_label" />
-
-            <TextView
-                android:id="@+id/tv_cameraScreenCustomBottomNavbarDescription"
-                style="@style/TextAppearance.MaterialComponents.Caption"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/custom_bottom_navbar_switch_description" />
-
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_reviewScreenCustomBottomNavbar"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                android:text="@string/review_screen_custom_bottom_navbar_switch_label" />
-
-            <TextView
-                android:id="@+id/tv_reviewScreenCustomBottomNavbarDescription"
-                style="@style/TextAppearance.MaterialComponents.Caption"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/custom_bottom_navbar_switch_description" />
-
-
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_onboardingScreensAtFirstRun"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                android:text="@string/onboarding_screens_at_first_launch_switch_label" />
-
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_onboardingScreensAtEveryLaunch"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                android:text="@string/onboarding_screens_at_every_launch_switch_label" />
-
-            <TextView
-                android:id="@+id/tv_onboardingScreensAtEveryLaunchDescription"
-                style="@style/TextAppearance.MaterialComponents.Caption"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/onboarding_screens_at_every_launch_switch_description" />
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_customOnboardingPages"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                android:text="@string/custom_onboarding_pages_switch_label" />
-
-            <TextView
-                android:id="@+id/tv_customOnboardingPagesDescription"
-                style="@style/TextAppearance.MaterialComponents.Caption"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/custom_onboarding_pages_switch_description" />
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_customOnboardingAlignCornersPage"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                android:text="@string/custom_onboarding_align_corners_page_switch_label" />
-
-            <TextView
-                android:id="@+id/tv_customOnboardingAlignCornerPageDescription"
-                style="@style/TextAppearance.MaterialComponents.Caption"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/custom_onboarding_pages_switch_description" />
-
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_customOnboardingLightingPage"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                android:text="@string/custom_onboarding_lighting_page_switch_label" />
-
-            <TextView
-                android:id="@+id/tv_customOnboardingLightingPageDescription"
-                style="@style/TextAppearance.MaterialComponents.Caption"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/custom_onboarding_pages_switch_description" />
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_customOnboardingQRCodePage"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                android:text="@string/custom_onboarding_qr_code_page_switch_label" />
-
-            <TextView
-                android:id="@+id/tv_customOnboardingQRCodePageDescription"
-                style="@style/TextAppearance.MaterialComponents.Caption"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/custom_onboarding_pages_switch_description" />
-
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_customOnboardingMultiPage"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                android:text="@string/custom_onboarding_multi_page_switch_label" />
-
-            <TextView
-                android:id="@+id/tv_customOnboardingMultiPageDescription"
-                style="@style/TextAppearance.MaterialComponents.Caption"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/custom_onboarding_pages_switch_description" />
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_onboardingCustomNavBar"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                android:text="@string/onboarding_custom_bottom_nav_bar_switch_label" />
-
-            <TextView
-                android:id="@+id/tv_onboardingCustomNavBarDescription"
-                style="@style/TextAppearance.MaterialComponents.Caption"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/onboarding_custom_bottom_nav_bar_switch_description" />
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_buttonsCustomLoadingIndicator"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                android:text="@string/buttons_custom_loading_indicator_switch_label" />
-
-            <TextView
-                android:id="@+id/tv_buttonsCustomLoadingIndicatorDescription"
-                style="@style/TextAppearance.MaterialComponents.Caption"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/buttons_custom_loading_indicator_switch_description" />
-
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_screenCustomLoadingIndicator"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                android:text="@string/screen_custom_loading_indicator_switch_label" />
-
-            <TextView
-                android:id="@+id/tv_screenCustomLoadingIndicatorDescription"
-                style="@style/TextAppearance.MaterialComponents.Caption"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/screen_custom_loading_indicator_switch_description" />
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_supportedFormatsScreen"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                android:text="@string/supported_formats_screen_switch_label" />
-
-            <TextView
-                android:id="@+id/tv_supportedFormatsScreenDescription"
-                style="@style/TextAppearance.MaterialComponents.Caption"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/supported_formats_screen_switch_description" />
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_customHelpMenuItems"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                android:text="@string/help_custom_menu_items_switch_label" />
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_customNavigationController"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                android:text="@string/custom_navigation_controller_switch_label" />
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_returnAssistantFeature"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                android:text="@string/return_assistant_feature_switch_label" />
-
-
-            <TextView
-                android:id="@+id/tv_returnAssistantFeatureDescription"
-                style="@style/TextAppearance.MaterialComponents.Caption"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/return_assistant_feature_switch_description" />
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_digitalInvoiceOnboardingCustomIllustration"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                android:text="@string/digital_invoice_onboarding_custom_illustration_switch_label" />
-
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_digitalInvoiceHelpBottomNavigationBar"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                android:text="@string/digital_invoice_help_bottom_navigation_bar_switch_label" />
-
-            <TextView
-                android:id="@+id/tv_digitalInvoiceHelpBottomNavigationBarDescription"
-                style="@style/TextAppearance.MaterialComponents.Caption"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/digital_invoice_bottom_navigation_bar_switch_description" />
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_digitalInvoiceOnboardingBottomNavigationBar"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                android:text="@string/digital_invoice_onboarding_bottom_navigation_bar_switch_label" />
-
-            <TextView
-                android:id="@+id/tv_digitalInvoiceOnboardingBottomNavigationBarDescription"
-                style="@style/TextAppearance.MaterialComponents.Caption"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/digital_invoice_bottom_navigation_bar_switch_description" />
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_digitalInvoiceBottomNavigationBar"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                android:text="@string/digital_invoice_bottom_navigation_bar_switch_label" />
-
-            <TextView
-                android:id="@+id/tv_digitalInvoiceBottomNavigationBarDescription"
-                style="@style/TextAppearance.MaterialComponents.Caption"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/digital_invoice_bottom_navigation_bar_switch_description" />
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_eventTracker"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                android:text="@string/event_tracker_switch_label" />
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_returnReasonsDialog"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                android:text="@string/return_reasons_dialog_switch_label" />
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_giniErrorLogger"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                android:text="@string/gini_error_switch_label" />
+                android:text="@string/close_screen_for_configurations_to_take_place" />
 
+        </LinearLayout>
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_customErrorLogger"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                android:text="@string/custom_error_switch_label" />
+        <include
+            android:id="@+id/layout_featureToggle"
+            layout="@layout/layout_feature_toggles"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginBottom="16dp" />
 
-            <TextView
-                android:id="@+id/textView_importedFileSizeBytesLimitTitle"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/imported_file_size_bytes_limit"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                app:layout_constraintTop_toTopOf="parent" />
+        <include
+            android:id="@+id/layout_bottomNavigationToggles"
+            layout="@layout/layout_bottom_navigation_toggles"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginBottom="16dp" />
 
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/textInputLayout_importedFileSizeBytesLimit"
-                style="?attr/textInputOutlinedStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                >
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/editText_importedFileSizeBytesLimit"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textSize="18sp"
-                    android:textColor="@drawable/edittext_selector"
-                    android:inputType="number"
-                    android:maxLines="1"
-                    tools:text="Hello@World and stuff and foo and bar and whatchamacallit"/>
-            </com.google.android.material.textfield.TextInputLayout>
+        <include
+            android:id="@+id/layout_onboardingToggles"
+            layout="@layout/layout_onboarding_toggles"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginBottom="16dp" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_disableCameraPermission"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                android:text="@string/disable_camera_permission" />
+        <include
+            android:id="@+id/layout_cameraToggles"
+            layout="@layout/layout_camera_toggles"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginBottom="16dp" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_allowScreenshots"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                android:text="@string/allow_screenshots_label" />
+        <include
+            android:id="@+id/layout_analysisToggles"
+            layout="@layout/layout_analysis_toggles"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginBottom="16dp" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_debugMode"
-                style="@style/SwitchConfigurationStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/gc_medium_12"
-                android:text="@string/debug_mode_switch_label" />
+        <include
+            android:id="@+id/layout_helpToggles"
+            layout="@layout/layout_help_toggles"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginBottom="16dp" />
 
+        <include
+            android:id="@+id/layout_returnAssistantToggles"
+            layout="@layout/layout_return_assistant_toggles"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginBottom="16dp" />
 
-        </LinearLayout>
+        <include
+            android:id="@+id/layout_generalUiCustomizationToggles"
+            layout="@layout/layout_ui_customization_toggles"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginBottom="16dp" />
 
+        <include
+            android:id="@+id/layout_debugDevelopmentOptionsToggles"
+            layout="@layout/layout_debug_development_toggles"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginBottom="16dp" />
 
-    </ScrollView>
+    </LinearLayout>
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/bank-sdk/example-app/src/main/res/layout/custom_skonto_navigation_bar.xml b/bank-sdk/example-app/src/main/res/layout/custom_skonto_navigation_bar.xml
new file mode 100644
index 0000000000..49a499b0d7
--- /dev/null
+++ b/bank-sdk/example-app/src/main/res/layout/custom_skonto_navigation_bar.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/gbs_bottom_wrapper"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/colorError"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent">
+
+    <TextView
+        android:id="@+id/total_label"
+        style="@style/GiniCaptureTheme.Typography.Body1"
+        android:layout_width="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/gc_large_24"
+        android:text="@string/gbs_skonto_section_footer_title"
+        app:layout_constraintHorizontal_chainStyle="spread_inside"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/price_total"
+        style="@style/GiniCaptureTheme.Typography.Headline5"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/gc_large_24"
+        android:layout_marginTop="@dimen/gc_small"
+        app:layout_constraintStart_toStartOf="@id/total_label"
+        app:layout_constraintTop_toBottomOf="@id/total_label"
+        tools:text="€242.99" />
+
+    <TextView
+        android:id="@+id/discount_info"
+        style="@style/GiniCaptureTheme.Typography.Body1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/gc_medium"
+        android:layout_marginTop="@dimen/gc_small"
+        app:layout_constraintBottom_toBottomOf="@+id/price_total"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toEndOf="@+id/price_total"
+        app:layout_constraintTop_toBottomOf="@id/total_label"
+        tools:text="3% discount" />
+
+    <TextView
+        android:id="@+id/skonto_savings_amount"
+        style="@style/GiniCaptureTheme.Typography.Body1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="@+id/price_total"
+        app:layout_constraintTop_toBottomOf="@+id/price_total"
+        tools:text="16.58 EUR Skonto" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/gbs_pay"
+        style="@style/GiniCaptureTheme.Widget.Button.UnelevatedButton"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/gc_large"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="@dimen/gc_large"
+        android:layout_marginBottom="@dimen/gc_large_24"
+        android:text="@string/gbs_skonto_section_footer_continue_button_text"
+        app:cornerRadius="@dimen/gc_small"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/gbs_help_btn"
+        app:layout_constraintStart_toEndOf="@+id/gbs_placeholder"
+        app:layout_constraintTop_toBottomOf="@+id/skonto_savings_amount" />
+
+    <ImageButton
+        android:id="@+id/gbs_help_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/gc_medium"
+        android:background="@android:color/transparent"
+        android:contentDescription="@string/gbs_digital_invoice_help_info"
+        android:padding="@dimen/gc_medium"
+        android:visibility="invisible"
+        app:layout_constraintBottom_toBottomOf="@+id/gbs_pay"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/gbs_pay"
+        app:srcCompat="@drawable/gbs_menu_question_circle_info"
+        app:tint="?attr/colorOnBackground" />
+
+    <ImageButton
+        android:id="@+id/gbs_back_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
+        android:contentDescription="@string/gbs_digital_invoice_help_info"
+        android:padding="@dimen/gc_medium"
+        app:layout_constraintBottom_toBottomOf="@+id/gbs_pay"
+        app:layout_constraintEnd_toStartOf="@+id/gbs_pay"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/gbs_pay"
+        app:srcCompat="@drawable/gc_action_bar_back"
+        app:tint="?attr/colorOnBackground" />
+
+    <Space
+        android:id="@+id/gbs_placeholder"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/gc_large_48"
+        app:layout_constraintBottom_toBottomOf="@+id/gbs_pay"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/gbs_pay" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/bank-sdk/example-app/src/main/res/layout/layout_analysis_toggles.xml b/bank-sdk/example-app/src/main/res/layout/layout_analysis_toggles.xml
new file mode 100644
index 0000000000..044c713233
--- /dev/null
+++ b/bank-sdk/example-app/src/main/res/layout/layout_analysis_toggles.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:background="@drawable/bg_round_corners"
+    android:padding="8dp">
+
+    <TextView
+        style="@style/Base.TextAppearance.MaterialComponents.Headline6"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/configuration_analysis_label" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_screenCustomLoadingIndicator"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/screen_custom_loading_indicator_switch_label" />
+
+    <TextView
+        android:id="@+id/tv_screenCustomLoadingIndicatorDescription"
+        style="@style/TextAppearance.MaterialComponents.Caption"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/screen_custom_loading_indicator_switch_description" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/bank-sdk/example-app/src/main/res/layout/layout_bottom_navigation_toggles.xml b/bank-sdk/example-app/src/main/res/layout/layout_bottom_navigation_toggles.xml
new file mode 100644
index 0000000000..67cfd4a1b2
--- /dev/null
+++ b/bank-sdk/example-app/src/main/res/layout/layout_bottom_navigation_toggles.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/bg_round_corners"
+    android:orientation="vertical"
+    android:padding="8dp">
+
+    <TextView
+        style="@style/Base.TextAppearance.MaterialComponents.Headline6"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/configuration_bottom_nav_label" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_showBottomNavbar"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/bottom_navbar_switch_label" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_onboardingCustomNavBar"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/onboarding_custom_bottom_nav_bar_switch_label" />
+
+    <TextView
+        android:id="@+id/tv_onboardingCustomNavBarDescription"
+        style="@style/TextAppearance.MaterialComponents.Caption"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/onboarding_custom_bottom_nav_bar_switch_description" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_cameraScreenCustomBottomNavbar"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/camera_screen_custom_bottom_navbar_switch_label" />
+
+    <TextView
+        android:id="@+id/tv_cameraScreenCustomBottomNavbarDescription"
+        style="@style/TextAppearance.MaterialComponents.Caption"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/custom_bottom_navbar_switch_description" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_showHelpScreenCustomBottomNavbar"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/help_screens_bottom_navbar_switch_label" />
+
+    <TextView
+        android:id="@+id/tv_showHelpScreenCustomBottomNavbarDescription"
+        style="@style/TextAppearance.MaterialComponents.Caption"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/custom_bottom_navbar_switch_description" />
+
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_reviewScreenCustomBottomNavbar"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/review_screen_custom_bottom_navbar_switch_label" />
+
+    <TextView
+        android:id="@+id/tv_reviewScreenCustomBottomNavbarDescription"
+        style="@style/TextAppearance.MaterialComponents.Caption"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/custom_bottom_navbar_switch_description" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_digitalInvoiceHelpBottomNavigationBar"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/return_assistant_help_bottom_navigation_bar_switch_label" />
+
+    <TextView
+        android:id="@+id/tv_digitalInvoiceHelpBottomNavigationBarDescription"
+        style="@style/TextAppearance.MaterialComponents.Caption"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/return_assistant_bottom_navigation_bar_switch_description" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_digitalInvoiceOnboardingBottomNavigationBar"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/return_assistant_onboarding_bottom_navigation_bar_switch_label" />
+
+    <TextView
+        android:id="@+id/tv_digitalInvoiceOnboardingBottomNavigationBarDescription"
+        style="@style/TextAppearance.MaterialComponents.Caption"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/return_assistant_bottom_navigation_bar_switch_description" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_digitalInvoiceBottomNavigationBar"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/return_assistant_bottom_navigation_bar_switch_label" />
+
+    <TextView
+        android:id="@+id/tv_digitalInvoiceBottomNavigationBarDescription"
+        style="@style/TextAppearance.MaterialComponents.Caption"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/return_assistant_bottom_navigation_bar_switch_description" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_skontoCustomBottomNavbar"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/skonto_screen_custom_bottom_navbar_switch_label" />
+
+    <TextView
+        style="@style/TextAppearance.MaterialComponents.Caption"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/custom_bottom_navbar_switch_description" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/bank-sdk/example-app/src/main/res/layout/layout_camera_toggles.xml b/bank-sdk/example-app/src/main/res/layout/layout_camera_toggles.xml
new file mode 100644
index 0000000000..22de0603b6
--- /dev/null
+++ b/bank-sdk/example-app/src/main/res/layout/layout_camera_toggles.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:background="@drawable/bg_round_corners"
+    android:padding="8dp">
+
+    <TextView
+        style="@style/Base.TextAppearance.MaterialComponents.Headline6"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/configuration_camera_label" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_displayFlashButton"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/flash_button_switch_label" />
+
+    <TextView
+        android:id="@+id/tv_flashButtonDescription"
+        style="@style/TextAppearance.MaterialComponents.Caption"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/flash_button_switch_description" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_flashOnByDefault"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/flash_on_by_default_switch_label" />
+
+    <TextView
+        android:id="@+id/tv_flashOnByDefaultDescription"
+        style="@style/TextAppearance.MaterialComponents.Caption"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/flash_on_by_default_switch_description" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/bank-sdk/example-app/src/main/res/layout/layout_debug_development_toggles.xml b/bank-sdk/example-app/src/main/res/layout/layout_debug_development_toggles.xml
new file mode 100644
index 0000000000..d1e0f5be01
--- /dev/null
+++ b/bank-sdk/example-app/src/main/res/layout/layout_debug_development_toggles.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:background="@drawable/bg_round_corners"
+    android:padding="8dp">
+
+    <TextView
+        style="@style/Base.TextAppearance.MaterialComponents.Headline6"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/configuration_debug_development_label" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_giniErrorLogger"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/gini_error_switch_label" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_customErrorLogger"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/custom_error_switch_label" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_debugMode"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/debug_mode_switch_label" />
+
+    <TextView
+        android:id="@+id/textView_importedFileSizeBytesLimitTitle"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/imported_file_size_bytes_limit"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/textInputLayout_importedFileSizeBytesLimit"
+        style="?attr/textInputOutlinedStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/editText_importedFileSizeBytesLimit"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="number"
+            android:maxLines="1"
+            android:textColor="@drawable/edittext_selector"
+            android:textSize="18sp"
+            tools:text="Hello@World and stuff and foo and bar and whatchamacallit" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_disableCameraPermission"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/disable_camera_permission" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_allowScreenshots"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/allow_screenshots_label" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/bank-sdk/example-app/src/main/res/layout/layout_feature_toggles.xml b/bank-sdk/example-app/src/main/res/layout/layout_feature_toggles.xml
new file mode 100644
index 0000000000..99e999eeb8
--- /dev/null
+++ b/bank-sdk/example-app/src/main/res/layout/layout_feature_toggles.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/bg_round_corners"
+    android:orientation="vertical"
+    android:padding="8dp">
+
+    <TextView
+        style="@style/Base.TextAppearance.MaterialComponents.Headline6"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/configuration_feature_label" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_openWith"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/open_with_switch_label" />
+
+    <TextView
+        android:id="@+id/tv_fileImportLabel"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_large"
+        android:text="@string/document_import_file_types_segmented_button_label" />
+
+    <com.google.android.material.button.MaterialButtonToggleGroup
+        android:id="@+id/toggleBtn_fileImportSetup"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        app:selectionRequired="true"
+        app:singleSelection="true">
+
+        <Button
+            android:id="@+id/btn_fileImportDisabled"
+            style="?attr/materialButtonOutlinedStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/document_import_file_types_disabled_button_label" />
+
+        <Button
+            android:id="@+id/btn_fileImportOnlyPdf"
+            style="?attr/materialButtonOutlinedStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/document_import_file_types_only_pdf_button_label" />
+
+        <Button
+            android:id="@+id/btn_fileImportPdfAndImage"
+            style="?attr/materialButtonOutlinedStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/document_import_file_types_pdf_and_image_button_label" />
+    </com.google.android.material.button.MaterialButtonToggleGroup>
+
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_qrCodeScanning"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/qr_code_scanning_switch_label" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_onlyQRCodeScanning"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/only_qr_code_scanning_switch_label" />
+
+    <TextView
+        android:id="@+id/tv_onlyQrCodeDescription"
+        style="@style/TextAppearance.MaterialComponents.Caption"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/only_qr_code_scanning_switch_description" />
+
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_multiPage"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/multi_page_switch_label" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_returnAssistantFeature"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/return_assistant_feature_switch_label" />
+
+    <TextView
+        android:id="@+id/tv_returnAssistantFeatureDescription"
+        style="@style/TextAppearance.MaterialComponents.Caption"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/return_assistant_feature_switch_description" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_skontoFeature"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/skonto_feature_switch_label" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_setupSdkWithDefaultConfiguration"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/default_sdk_configuration_switch_label" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_eventTracker"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/event_tracker_switch_label" />
+
+</LinearLayout>
+
diff --git a/bank-sdk/example-app/src/main/res/layout/layout_help_toggles.xml b/bank-sdk/example-app/src/main/res/layout/layout_help_toggles.xml
new file mode 100644
index 0000000000..6bd614544e
--- /dev/null
+++ b/bank-sdk/example-app/src/main/res/layout/layout_help_toggles.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:background="@drawable/bg_round_corners"
+    android:padding="8dp">
+
+    <TextView
+        style="@style/Base.TextAppearance.MaterialComponents.Headline6"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/configuration_help_label" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_supportedFormatsScreen"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/supported_formats_screen_switch_label" />
+
+    <TextView
+        android:id="@+id/tv_supportedFormatsScreenDescription"
+        style="@style/TextAppearance.MaterialComponents.Caption"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/supported_formats_screen_switch_description" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_customHelpMenuItems"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/help_custom_menu_items_switch_label" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/bank-sdk/example-app/src/main/res/layout/layout_onboarding_toggles.xml b/bank-sdk/example-app/src/main/res/layout/layout_onboarding_toggles.xml
new file mode 100644
index 0000000000..e4a05cca26
--- /dev/null
+++ b/bank-sdk/example-app/src/main/res/layout/layout_onboarding_toggles.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:background="@drawable/bg_round_corners"
+    android:padding="8dp">
+
+    <TextView
+        style="@style/Base.TextAppearance.MaterialComponents.Headline6"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/configuration_onboarding_label" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_onboardingScreensAtFirstRun"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/onboarding_screens_at_first_launch_switch_label" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_onboardingScreensAtEveryLaunch"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/onboarding_screens_at_every_launch_switch_label" />
+
+    <TextView
+        android:id="@+id/tv_onboardingScreensAtEveryLaunchDescription"
+        style="@style/TextAppearance.MaterialComponents.Caption"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/onboarding_screens_at_every_launch_switch_description" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_customOnboardingPages"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/custom_onboarding_pages_switch_label" />
+
+    <TextView
+        android:id="@+id/tv_customOnboardingPagesDescription"
+        style="@style/TextAppearance.MaterialComponents.Caption"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/custom_onboarding_pages_switch_description" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_customOnboardingAlignCornersPage"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/custom_onboarding_align_corners_page_switch_label" />
+
+    <TextView
+        android:id="@+id/tv_customOnboardingAlignCornerPageDescription"
+        style="@style/TextAppearance.MaterialComponents.Caption"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/custom_onboarding_pages_switch_description" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_customOnboardingLightingPage"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/custom_onboarding_lighting_page_switch_label" />
+
+    <TextView
+        android:id="@+id/tv_customOnboardingLightingPageDescription"
+        style="@style/TextAppearance.MaterialComponents.Caption"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/custom_onboarding_pages_switch_description" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_customOnboardingQRCodePage"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/custom_onboarding_qr_code_page_switch_label" />
+
+    <TextView
+        android:id="@+id/tv_customOnboardingQRCodePageDescription"
+        style="@style/TextAppearance.MaterialComponents.Caption"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/custom_onboarding_pages_switch_description" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_customOnboardingMultiPage"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/custom_onboarding_multi_page_switch_label" />
+
+    <TextView
+        android:id="@+id/tv_customOnboardingMultiPageDescription"
+        style="@style/TextAppearance.MaterialComponents.Caption"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/custom_onboarding_pages_switch_description" />
+</LinearLayout>
\ No newline at end of file
diff --git a/bank-sdk/example-app/src/main/res/layout/layout_return_assistant_toggles.xml b/bank-sdk/example-app/src/main/res/layout/layout_return_assistant_toggles.xml
new file mode 100644
index 0000000000..25f91bae15
--- /dev/null
+++ b/bank-sdk/example-app/src/main/res/layout/layout_return_assistant_toggles.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:background="@drawable/bg_round_corners"
+    android:padding="8dp">
+
+    <TextView
+        style="@style/Base.TextAppearance.MaterialComponents.Headline6"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/configuration_return_assistant_label" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_returnReasonsDialog"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/return_reasons_dialog_switch_label" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_digitalInvoiceOnboardingCustomIllustration"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/return_assistant_onboarding_custom_illustration_switch_label" />
+</LinearLayout>
\ No newline at end of file
diff --git a/bank-sdk/example-app/src/main/res/layout/layout_ui_customization_toggles.xml b/bank-sdk/example-app/src/main/res/layout/layout_ui_customization_toggles.xml
new file mode 100644
index 0000000000..1dbf7a29b4
--- /dev/null
+++ b/bank-sdk/example-app/src/main/res/layout/layout_ui_customization_toggles.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:background="@drawable/bg_round_corners"
+    android:padding="8dp">
+
+    <TextView
+        style="@style/Base.TextAppearance.MaterialComponents.Headline6"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/configuration_ui_customization_label" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_buttonsCustomLoadingIndicator"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/buttons_custom_loading_indicator_switch_label" />
+
+    <TextView
+        android:id="@+id/tv_buttonsCustomLoadingIndicatorDescription"
+        style="@style/TextAppearance.MaterialComponents.Caption"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/buttons_custom_loading_indicator_switch_description" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switch_customNavigationController"
+        style="@style/SwitchConfigurationStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gc_medium_12"
+        android:text="@string/custom_navigation_controller_switch_label" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/bank-sdk/example-app/src/main/res/values/strings.xml b/bank-sdk/example-app/src/main/res/values/strings.xml
index 5ed91dbac2..5c9c4db394 100644
--- a/bank-sdk/example-app/src/main/res/values/strings.xml
+++ b/bank-sdk/example-app/src/main/res/values/strings.xml
@@ -44,12 +44,21 @@
 
     <!-- Strings for ConfigurationActivity -->
     <string name="configuration_activity_title">Configuration</string>
+    <string name="configuration_feature_label">Features</string>
+    <string name="configuration_bottom_nav_label">Bottom navigation bar</string>
+    <string name="configuration_onboarding_label">Onboarding</string>
+    <string name="configuration_camera_label">Camera</string>
+    <string name="configuration_analysis_label">Analysis</string>
+    <string name="configuration_help_label">Help</string>
+    <string name="configuration_return_assistant_label">Return assistant</string>
+    <string name="configuration_ui_customization_label">UI customization</string>
+    <string name="configuration_debug_development_label">Debug and development</string>
     <string name="close_gini_sdk_configuration">Close</string>
     <string name="example_label">Example</string>
     <string name="relaunch_to_use_default_configuration">Please relaunch the app to use the default GiniConfiguration values.</string>
     <string name="close_screen_for_configurations_to_take_place">The configuration changes will take effect after closing this screen.</string>
     <string name="default_sdk_configuration_switch_label">SDK default configurations</string>
-    <string name="file_import_switch_label">File import</string>
+    <string name="open_with_switch_label">Open with</string>
     <string name="qr_code_scanning_switch_label">QR code scanning</string>
     <string name="only_qr_code_scanning_switch_label">QR code scanning only</string>
     <string name="only_qr_code_scanning_switch_description">This will work if the \'Qr code scanning\' switch is also enabled.</string>
@@ -67,6 +76,7 @@
     <string name="custom_bottom_navbar_switch_description">The custom bottom navigation bar is shown if \'Bottom navigation bar\' is also enabled.</string>
     <string name="camera_screen_custom_bottom_navbar_switch_label">Camera screen custom bottom navigation bar</string>
     <string name="review_screen_custom_bottom_navbar_switch_label">Review screen custom bottom navigation bar</string>
+    <string name="skonto_screen_custom_bottom_navbar_switch_label">Skonto screen custom bottom navigation bar</string>
     <string name="onboarding_screens_at_every_launch_switch_label">Onboarding screens at every launch</string>
     <string name="onboarding_screens_at_first_launch_switch_label">Onboarding screens at first launch</string>
     <string name="onboarding_screens_at_every_launch_switch_description">Overwrites \'Onboarding screens at first launch\'.</string>
@@ -95,11 +105,12 @@
     <string name="custom_navigation_controller_switch_label">Custom navigation controller</string>
     <string name="return_assistant_feature_switch_label">Return assistant feature</string>
     <string name="return_assistant_feature_switch_description">Present a digital representation of the invoice</string>
-    <string name="digital_invoice_onboarding_custom_illustration_switch_label">Digital invoice onboarding custom illustration</string>
-    <string name="digital_invoice_help_bottom_navigation_bar_switch_label">Digital invoice help bottom navigation bar</string>
-    <string name="digital_invoice_bottom_navigation_bar_switch_description">The custom bottom navigation bar is shown if both \`Bottom navigation bar\` and \`Return assistant feature\` are enabled.</string>
-    <string name="digital_invoice_onboarding_bottom_navigation_bar_switch_label">Digital invoice onboarding bottom navigation bar</string>
-    <string name="digital_invoice_bottom_navigation_bar_switch_label">Digital invoice bottom navigation bar</string>
+    <string name="skonto_feature_switch_label">Skonto feature</string>
+    <string name="return_assistant_onboarding_custom_illustration_switch_label">Return assistant onboarding custom illustration</string>
+    <string name="return_assistant_help_bottom_navigation_bar_switch_label">Return assistant help bottom navigation bar</string>
+    <string name="return_assistant_bottom_navigation_bar_switch_description">The custom bottom navigation bar is shown if both \`Bottom navigation bar\` and \`Return assistant feature\` are enabled.</string>
+    <string name="return_assistant_onboarding_bottom_navigation_bar_switch_label">Return assistant onboarding bottom navigation bar</string>
+    <string name="return_assistant_bottom_navigation_bar_switch_label">Return assistant bottom navigation bar</string>
     <string name="event_tracker_switch_label">Event tracker</string>
     <string name="return_reasons_dialog_switch_label">Return reasons dialog</string>
     <string name="gini_error_switch_label">Gini error logger</string>
diff --git a/bank-sdk/example-app/src/main/res/values/styles.xml b/bank-sdk/example-app/src/main/res/values/styles.xml
index 5edc7c9561..92311e7a10 100644
--- a/bank-sdk/example-app/src/main/res/values/styles.xml
+++ b/bank-sdk/example-app/src/main/res/values/styles.xml
@@ -10,6 +10,7 @@
         <item name="dividerColor">@color/gc_color_02</item>
         <item name="colorSurface">@color/gc_color_01</item>
         <item name="colorOnSurface">?attr/colorOnBackground</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="colorSurfaceInverse">@color/gc_color_contrast_03</item>
         <item name="colorOnSurfaceInverse">@color/gc_color_02</item>
         <item name="colorSurfaceVariant">@color/gc_color_01</item>
diff --git a/bank-sdk/sdk/build.gradle.kts b/bank-sdk/sdk/build.gradle.kts
index 47789333f2..8653ab4f33 100644
--- a/bank-sdk/sdk/build.gradle.kts
+++ b/bank-sdk/sdk/build.gradle.kts
@@ -26,7 +26,8 @@ android {
     }
     defaultConfig {
         minSdk = libs.versions.android.minSdk.get().toInt()
-        targetSdk = libs.versions.android.targetSdk.get().toInt()
+        testOptions.targetSdk = libs.versions.android.targetSdk.get().toInt()
+        lint.targetSdk = libs.versions.android.targetSdk.get().toInt()
 
         // Use the test runner with JUnit4 support
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -51,6 +52,11 @@ android {
 
     buildFeatures {
         viewBinding = true
+        compose = true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.4.6"
     }
 
     buildTypes {
@@ -115,6 +121,18 @@ dependencies {
     implementation(libs.navigation.fragment.ktx)
     implementation(libs.navigation.ui.ktx)
 
+    implementation(platform(libs.compose.bom))
+    implementation(libs.compose.material3)
+    implementation(libs.compose.activity)
+    implementation(libs.compose.tools.uiToolingPreview)
+    implementation(libs.accompanist.themeAdapter)
+    debugImplementation(libs.compose.tools.uiTooling)
+
+    implementation(platform(libs.koin.bom))
+    implementation(libs.koin.core)
+    implementation(libs.koin.android)
+    implementation(libs.koin.androidx.compose)
+
     testImplementation(libs.junit)
     testImplementation(libs.mockk)
     testImplementation(libs.kotlinx.coroutines.test)
@@ -147,8 +165,9 @@ tasks.register<CreatePropertiesTask>("injectTestProperties") {
 
     doFirst {
         propertiesMap.clear()
-        propertiesMap.putAll(readLocalPropertiesToMap(project,
-            listOf("testClientId", "testClientSecret", "testApiUri", "testUserCenterUri")))
+        propertiesMap.putAll(readLocalPropertiesToMapSilent(project,
+            listOf("testClientId", "testClientSecret", "testApiUri", "testUserCenterUri"))
+        )
     }
 
     destinations.put(
diff --git a/bank-sdk/sdk/detekt-baseline.xml b/bank-sdk/sdk/detekt-baseline.xml
new file mode 100644
index 0000000000..92023d97f2
--- /dev/null
+++ b/bank-sdk/sdk/detekt-baseline.xml
@@ -0,0 +1,192 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<SmellBaseline>
+  <ManuallySuppressedIssues/>
+  <CurrentIssues>
+    <ID>CyclomaticComplexMethod:Configuration.kt$internal fun GiniCapture.Builder.applyConfiguration(configuration: CaptureConfiguration): GiniCapture.Builder</ID>
+    <ID>EmptyFunctionBlock:DigitalInvoiceBottomSheet.kt$DigitalInvoiceBottomSheet${ }</ID>
+    <ID>EmptyFunctionBlock:DigitalInvoiceScreenPresenter.kt$DigitalInvoiceScreenPresenter${ }</ID>
+    <ID>EmptyFunctionBlock:DigitalOnboardingScreenPresenter.kt$DigitalOnboardingScreenPresenter${ }</ID>
+    <ID>EmptyFunctionBlock:EditTextExtensions.kt$&lt;no name provided>${ }</ID>
+    <ID>EmptyFunctionBlock:GiniBank.kt$GiniBank.&lt;no name provided>${ }</ID>
+    <ID>EmptyFunctionBlock:LineItemDetailsScreenPresenter.kt$LineItemDetailsScreenPresenter${ }</ID>
+    <ID>EmptyFunctionBlock:LineItemsAdapter.kt$ViewHolder.AddonViewHolder${ }</ID>
+    <ID>EmptyFunctionBlock:TextExtensions.kt$&lt;no name provided>${ }</ID>
+    <ID>ForbiddenComment:DigitalInvoiceOnboardingFragment.kt$DigitalInvoiceOnboardingFragment$* You should show the `DigitalInvoiceOnboardingFragment` when the * [DigitalInvoiceFragmentListener.showOnboarding()] is called. * * Include the `DigitalInvoiceOnboardingFragment` into your layout by using the [DigitalInvoiceOnboardingFragment.createInstance()] factory method to create * an instance and display it using the [androidx.fragment.app.FragmentManager]. * * A [DigitalInvoiceOnboardingFragmentListener] instance must be available before the `DigitalInvoiceOnboardingFragment` is attached to an activity. Failing * to do so will throw an exception. The listener instance can be provided either implicitly by making the hosting Activity implement the * [DigitalInvoiceOnboardingFragmentListener] interface or explicitly by setting the listener using [DigitalInvoiceOnboardingFragment.listener]. * * Your Activity is automatically set as the listener in [DigitalInvoiceOnboardingFragment.onCreate()]. * * ### Customizing the Digital Invoice Onboarding Screen * * TODO: PPL-14: Customization guide for return assistant - Android</ID>
+    <ID>FunctionNaming:SkontoFragment.kt$@Composable @Preview private fun ScreenReadyStatePreviewLight()</ID>
+    <ID>FunctionNaming:SkontoFragment.kt$@Composable @Preview(uiMode = UI_MODE_NIGHT_YES) private fun ScreenReadyStatePreviewDark()</ID>
+    <ID>FunctionNaming:SkontoFragment.kt$@Composable private fun FooterSection( totalAmount: SkontoData.Amount, savedAmount: SkontoData.Amount, discountValue: BigDecimal, colors: SkontoFooterSectionColors, isBottomNavigationBarEnabled: Boolean, isSkontoSectionActive: Boolean, onBackClicked: () -> Unit, onProceedClicked: () -> Unit, modifier: Modifier = Modifier, customBottomNavBarAdapter: InjectedViewAdapterInstance&lt;SkontoNavigationBarBottomAdapter>?, )</ID>
+    <ID>FunctionNaming:SkontoFragment.kt$@Composable private fun InfoBanner( colors: SkontoSectionColors.InfoBannerColors, text: String, clickable: Boolean, onClicked: () -> Unit, modifier: Modifier = Modifier, icon: Painter = painterResource(id = R.drawable.gbs_icon_important_info), )</ID>
+    <ID>FunctionNaming:SkontoFragment.kt$@Composable private fun InfoDialog( text: String, colors: SkontoInfoDialogColors, onDismissRequest: () -> Unit, modifier: Modifier = Modifier, )</ID>
+    <ID>FunctionNaming:SkontoFragment.kt$@Composable private fun NavigationActionBack( onClick: () -> Unit, modifier: Modifier = Modifier, )</ID>
+    <ID>FunctionNaming:SkontoFragment.kt$@Composable private fun ScreenContent( navigateBack: () -> Unit, viewModel: SkontoFragmentViewModel, modifier: Modifier = Modifier, screenColorScheme: SkontoScreenColors = SkontoScreenColors.colors(), isBottomNavigationBarEnabled: Boolean, customBottomNavBarAdapter: InjectedViewAdapterInstance&lt;SkontoNavigationBarBottomAdapter>?, )</ID>
+    <ID>FunctionNaming:SkontoFragment.kt$@Composable private fun ScreenReadyState( onBackClicked: () -> Unit, onProceedClicked: () -> Unit, state: SkontoFragmentContract.State.Ready, onDiscountSectionActiveChange: (Boolean) -> Unit, onDiscountAmountChange: (BigDecimal) -> Unit, onDueDateChanged: (LocalDate) -> Unit, onFullAmountChange: (BigDecimal) -> Unit, isBottomNavigationBarEnabled: Boolean, customBottomNavBarAdapter: InjectedViewAdapterInstance&lt;SkontoNavigationBarBottomAdapter>?, modifier: Modifier = Modifier, screenColorScheme: SkontoScreenColors = SkontoScreenColors.colors(), onInfoBannerClicked: () -> Unit, onInfoDialogDismissed: () -> Unit, )</ID>
+    <ID>FunctionNaming:SkontoFragment.kt$@Composable private fun ScreenReadyStatePreview()</ID>
+    <ID>FunctionNaming:SkontoFragment.kt$@Composable private fun ScreenStateContent( state: SkontoFragmentContract.State, onDiscountSectionActiveChange: (Boolean) -> Unit, onSkontoAmountChange: (BigDecimal) -> Unit, onFullAmountChange: (BigDecimal) -> Unit, onDueDateChanged: (LocalDate) -> Unit, onBackClicked: () -> Unit, onProceedClicked: () -> Unit, isBottomNavigationBarEnabled: Boolean, customBottomNavBarAdapter: InjectedViewAdapterInstance&lt;SkontoNavigationBarBottomAdapter>?, onInfoBannerClicked: () -> Unit, onInfoDialogDismissed: () -> Unit, modifier: Modifier = Modifier, screenColorScheme: SkontoScreenColors = SkontoScreenColors.colors() )</ID>
+    <ID>FunctionNaming:SkontoFragment.kt$@Composable private fun SkontoSection( colors: SkontoSectionColors, amount: SkontoData.Amount, dueDate: LocalDate, infoPaymentInDays: Int, infoDiscountValue: BigDecimal, onActiveChange: (Boolean) -> Unit, onSkontoAmountChange: (BigDecimal) -> Unit, onDueDateChanged: (LocalDate) -> Unit, onInfoBannerClicked: () -> Unit, edgeCase: SkontoFragmentContract.SkontoEdgeCase?, modifier: Modifier = Modifier, isActive: Boolean, )</ID>
+    <ID>FunctionNaming:SkontoFragment.kt$@Composable private fun TopAppBar( onBackClicked: () -> Unit, modifier: Modifier = Modifier, isBottomNavigationBarEnabled: Boolean, colors: GiniTopBarColors, )</ID>
+    <ID>FunctionNaming:SkontoFragment.kt$@Composable private fun WithoutSkontoSection( colors: WithoutSkontoSectionColors, amount: SkontoData.Amount, modifier: Modifier = Modifier, onFullAmountChange: (BigDecimal) -> Unit, isActive: Boolean, )</ID>
+    <ID>FunctionNaming:SkontoFragment.kt$@Composable private fun YourInvoiceScanSection( modifier: Modifier = Modifier, colorScheme: SkontoInvoiceScanSectionColors, )</ID>
+    <ID>LongMethod:Configuration.kt$internal fun GiniCapture.Builder.applyConfiguration(configuration: CaptureConfiguration): GiniCapture.Builder</ID>
+    <ID>LongMethod:SkontoFragment.kt$@Composable private fun FooterSection( totalAmount: SkontoData.Amount, savedAmount: SkontoData.Amount, discountValue: BigDecimal, colors: SkontoFooterSectionColors, isBottomNavigationBarEnabled: Boolean, isSkontoSectionActive: Boolean, onBackClicked: () -> Unit, onProceedClicked: () -> Unit, modifier: Modifier = Modifier, customBottomNavBarAdapter: InjectedViewAdapterInstance&lt;SkontoNavigationBarBottomAdapter>?, )</ID>
+    <ID>LongMethod:SkontoFragment.kt$@Composable private fun ScreenReadyState( onBackClicked: () -> Unit, onProceedClicked: () -> Unit, state: SkontoFragmentContract.State.Ready, onDiscountSectionActiveChange: (Boolean) -> Unit, onDiscountAmountChange: (BigDecimal) -> Unit, onDueDateChanged: (LocalDate) -> Unit, onFullAmountChange: (BigDecimal) -> Unit, isBottomNavigationBarEnabled: Boolean, customBottomNavBarAdapter: InjectedViewAdapterInstance&lt;SkontoNavigationBarBottomAdapter>?, modifier: Modifier = Modifier, screenColorScheme: SkontoScreenColors = SkontoScreenColors.colors(), onInfoBannerClicked: () -> Unit, onInfoDialogDismissed: () -> Unit, )</ID>
+    <ID>LongMethod:SkontoFragment.kt$@Composable private fun SkontoSection( colors: SkontoSectionColors, amount: SkontoData.Amount, dueDate: LocalDate, infoPaymentInDays: Int, infoDiscountValue: BigDecimal, onActiveChange: (Boolean) -> Unit, onSkontoAmountChange: (BigDecimal) -> Unit, onDueDateChanged: (LocalDate) -> Unit, onInfoBannerClicked: () -> Unit, edgeCase: SkontoFragmentContract.SkontoEdgeCase?, modifier: Modifier = Modifier, isActive: Boolean, )</ID>
+    <ID>LongParameterList:DigitalInvoiceScreenPresenter.kt$DigitalInvoiceScreenPresenter$( activity: Activity, view: DigitalInvoiceScreenContract.View, val extractions: Map&lt;String, GiniCaptureSpecificExtraction> = emptyMap(), val compoundExtractions: Map&lt;String, GiniCaptureCompoundExtraction> = emptyMap(), val returnReasons: List&lt;GiniCaptureReturnReason> = emptyList(), private val isInaccurateExtraction: Boolean = false, savedInstanceBundle: Bundle?, private val oncePerInstallEventStore: OncePerInstallEventStore = OncePerInstallEventStore( activity ), private val simpleBusEventStore: SimpleBusEventStore = SimpleBusEventStore(activity) )</ID>
+    <ID>LongParameterList:GiniBank.kt$GiniBank$( context: Context, paymentRecipient: String, paymentReference: String, paymentPurpose: String, iban: String, bic: String, amount: Amount )</ID>
+    <ID>LongParameterList:GiniBank.kt$GiniBank$( paymentRecipient: String, paymentReference: String, paymentPurpose: String, iban: String, bic: String, amount: Amount )</ID>
+    <ID>LongParameterList:LineItem.kt$LineItem$( id: String = this.id, description: String = this.description, quantity: Int = this.quantity, rawGrossPrice: String = this.rawGrossPrice, origQuantity: Int = this.origQuantity, origRawGrossPrice: String = this.origRawGrossPrice )</ID>
+    <ID>LongParameterList:SkontoFooterSectionColors.kt$SkontoFooterSectionColors.Companion$( cardBackgroundColor: Color = GiniTheme.colorScheme.card.container, titleTextColor: Color = GiniTheme.colorScheme.text.primary, amountTextColor: Color = GiniTheme.colorScheme.text.primary, savedAmountTextColor: Color = GiniTheme.colorScheme.text.success, discountLabelColorScheme: DiscountLabelColorScheme = DiscountLabelColorScheme.colors(), continueButtonColors: GiniButtonColors = GiniButtonColors.colors(), )</ID>
+    <ID>LongParameterList:SkontoFragment.kt$( colors: SkontoSectionColors, amount: SkontoData.Amount, dueDate: LocalDate, infoPaymentInDays: Int, infoDiscountValue: BigDecimal, onActiveChange: (Boolean) -> Unit, onSkontoAmountChange: (BigDecimal) -> Unit, onDueDateChanged: (LocalDate) -> Unit, onInfoBannerClicked: () -> Unit, edgeCase: SkontoFragmentContract.SkontoEdgeCase?, modifier: Modifier = Modifier, isActive: Boolean, )</ID>
+    <ID>LongParameterList:SkontoFragment.kt$( colors: SkontoSectionColors.InfoBannerColors, text: String, clickable: Boolean, onClicked: () -> Unit, modifier: Modifier = Modifier, icon: Painter = painterResource(id = R.drawable.gbs_icon_important_info), )</ID>
+    <ID>LongParameterList:SkontoFragment.kt$( navigateBack: () -> Unit, viewModel: SkontoFragmentViewModel, modifier: Modifier = Modifier, screenColorScheme: SkontoScreenColors = SkontoScreenColors.colors(), isBottomNavigationBarEnabled: Boolean, customBottomNavBarAdapter: InjectedViewAdapterInstance&lt;SkontoNavigationBarBottomAdapter>?, )</ID>
+    <ID>LongParameterList:SkontoFragment.kt$( onBackClicked: () -> Unit, onProceedClicked: () -> Unit, state: SkontoFragmentContract.State.Ready, onDiscountSectionActiveChange: (Boolean) -> Unit, onDiscountAmountChange: (BigDecimal) -> Unit, onDueDateChanged: (LocalDate) -> Unit, onFullAmountChange: (BigDecimal) -> Unit, isBottomNavigationBarEnabled: Boolean, customBottomNavBarAdapter: InjectedViewAdapterInstance&lt;SkontoNavigationBarBottomAdapter>?, modifier: Modifier = Modifier, screenColorScheme: SkontoScreenColors = SkontoScreenColors.colors(), onInfoBannerClicked: () -> Unit, onInfoDialogDismissed: () -> Unit, )</ID>
+    <ID>LongParameterList:SkontoFragment.kt$( state: SkontoFragmentContract.State, onDiscountSectionActiveChange: (Boolean) -> Unit, onSkontoAmountChange: (BigDecimal) -> Unit, onFullAmountChange: (BigDecimal) -> Unit, onDueDateChanged: (LocalDate) -> Unit, onBackClicked: () -> Unit, onProceedClicked: () -> Unit, isBottomNavigationBarEnabled: Boolean, customBottomNavBarAdapter: InjectedViewAdapterInstance&lt;SkontoNavigationBarBottomAdapter>?, onInfoBannerClicked: () -> Unit, onInfoDialogDismissed: () -> Unit, modifier: Modifier = Modifier, screenColorScheme: SkontoScreenColors = SkontoScreenColors.colors() )</ID>
+    <ID>LongParameterList:SkontoFragment.kt$( totalAmount: SkontoData.Amount, savedAmount: SkontoData.Amount, discountValue: BigDecimal, colors: SkontoFooterSectionColors, isBottomNavigationBarEnabled: Boolean, isSkontoSectionActive: Boolean, onBackClicked: () -> Unit, onProceedClicked: () -> Unit, modifier: Modifier = Modifier, customBottomNavBarAdapter: InjectedViewAdapterInstance&lt;SkontoNavigationBarBottomAdapter>?, )</ID>
+    <ID>LongParameterList:SkontoInvoiceScanSectionColors.kt$SkontoInvoiceScanSectionColors.Companion$( cardBackgroundColor: Color = GiniTheme.colorScheme.card.container, titleTextColor: Color = GiniTheme.colorScheme.text.primary, subtitleTextColor: Color = GiniTheme.colorScheme.text.secondary, iconBackgroundColor: Color = GiniTheme.colorScheme.placeholder.background, iconTint: Color = GiniTheme.colorScheme.placeholder.tint, arrowTint: Color = GiniTheme.colorScheme.icons.secondary, )</ID>
+    <ID>LongParameterList:SkontoScreenColors.kt$SkontoScreenColors.Companion$( backgroundColor: Color = GiniTheme.colorScheme.background.primary, topAppBarColors: GiniTopBarColors = GiniTopBarColors.colors(), skontoInvoiceScanSectionColors: SkontoInvoiceScanSectionColors = SkontoInvoiceScanSectionColors.colors(), discountSectionColors: SkontoSectionColors = SkontoSectionColors.colors(), withoutSkontoSectionColors: WithoutSkontoSectionColors = WithoutSkontoSectionColors.colors(), skontoFooterSectionColors: SkontoFooterSectionColors = SkontoFooterSectionColors.colors(), datePickerColor: GiniDatePickerDialogColors = GiniDatePickerDialogColors.colors(), infoDialogColors: SkontoInfoDialogColors = SkontoInfoDialogColors.colors(), )</ID>
+    <ID>LongParameterList:SkontoSectionColors.kt$SkontoSectionColors.Companion$( titleTextColor: Color = GiniTheme.colorScheme.text.primary, switchColors: GiniSwitchColors = GiniSwitchColors.colors(), cardBackgroundColor: Color = GiniTheme.colorScheme.card.container, enabledHintTextColor: Color = GiniTheme.colorScheme.text.success, successInfoBannerColors: InfoBannerColors = InfoBannerColors.success(), warningInfoBannerColors: InfoBannerColors = InfoBannerColors.warning(), errorInfoBannerColors: InfoBannerColors = InfoBannerColors.error(), amountFieldColors: GiniTextInputColors = GiniTextInputColors.colors(), dueDateTextFieldColor: GiniTextInputColors = GiniTextInputColors.colors(), )</ID>
+    <ID>MagicNumber:DigitalInvoiceFragment.kt$DigitalInvoiceFragment$200</ID>
+    <ID>MagicNumber:DigitalInvoiceFragment.kt$DigitalInvoiceFragment$3</ID>
+    <ID>MagicNumber:DigitalInvoiceFragment.kt$DigitalInvoiceFragment$350</ID>
+    <ID>MagicNumber:DigitalInvoiceFragment.kt$DigitalInvoiceFragment.SmoothScroller$2400f</ID>
+    <ID>MagicNumber:LineItemsAdapter.kt$ViewHolder.LineItemViewHolder$0.5f</ID>
+    <ID>MagicNumber:SkontoFragment.kt$0.1f</ID>
+    <ID>MagicNumber:SkontoFragment.kt$&lt;no name provided>$6</ID>
+    <ID>MagicNumber:SkontoFragmentViewModel.kt$SkontoFragmentViewModel$4</ID>
+    <ID>MagicNumber:TextExtensions.kt$&lt;no name provided>$100</ID>
+    <ID>MagicNumber:TextExtensions.kt$&lt;no name provided>$7</ID>
+    <ID>MatchingDeclarationName:Configuration.kt$CaptureConfiguration</ID>
+    <ID>MaxLineLength:BigDecimalExtensions.kt$internal</ID>
+    <ID>MaxLineLength:CaptureFlowActivity.kt$CaptureFlowActivity$* Entry point for Screen API. It exists for the purpose of communication between Capture SDK's Screen API and Return Assistant.</ID>
+    <ID>MaxLineLength:CaptureFlowFragment.kt$CaptureFlowFragment$// To be the first to handle back button pressed events we need to set this fragment as the primary navigation fragment</ID>
+    <ID>MaxLineLength:Configuration.kt$CaptureConfiguration$* Enable and configure the document import feature or disable it by passing in [DocumentImportEnabledFileTypes.NONE].</ID>
+    <ID>MaxLineLength:DigitalInvoice.kt$DigitalInvoice$private</ID>
+    <ID>MaxLineLength:DigitalInvoice.kt$DigitalInvoice$selectableLineItems.map { sli -> if (sli.lineItem.id == selectableLineItem.lineItem.id) selectableLineItem else sli }</ID>
+    <ID>MaxLineLength:DigitalInvoiceBottomSheet.kt$DigitalInvoiceBottomSheet$binding = GbsEditItemBottomSheetBinding.inflate(getLayoutInflaterWithGiniCaptureTheme(it.layoutInflater), null, false)</ID>
+    <ID>MaxLineLength:DigitalInvoiceBottomSheet.kt$DigitalInvoiceBottomSheet$selectableLineItem = BundleCompat.getParcelable(it, ARGS_SELECTABLE_LINE_ITEM, SelectableLineItem::class.java)</ID>
+    <ID>MaxLineLength:DigitalInvoiceBottomSheet.kt$DigitalInvoiceBottomSheet$typedArray.getColor(R.styleable.GBSCurrencyStyle_gbsBottomSheetItemTitle, net.gini.android.capture.R.color.gc_light_01)</ID>
+    <ID>MaxLineLength:DigitalInvoiceBottomSheet.kt$DigitalInvoiceBottomSheet$val bottomSheetInternal = (it as? BottomSheetDialog)?.findViewById&lt;View>(com.google.android.material.R.id.design_bottom_sheet)</ID>
+    <ID>MaxLineLength:DigitalInvoiceBottomSheet.kt$DigitalInvoiceBottomSheet.CurrencyAdapter$convertView.setBackgroundColor(typedArray.getColor(R.styleable.GBSCurrencyStyle_gbsCurrencyPickerItemBackgroundColor, net.gini.android.capture.R.color.gc_light_01))</ID>
+    <ID>MaxLineLength:DigitalInvoiceBottomSheet.kt$DigitalInvoiceBottomSheet.CurrencyAdapter$convertView.setBackgroundColor(typedArray.getColor(R.styleable.GBSCurrencyStyle_gbsCurrencyPickerItemSelectedColor, net.gini.android.capture.R.color.gc_light_01))</ID>
+    <ID>MaxLineLength:DigitalInvoiceBottomSheet.kt$DigitalInvoiceBottomSheet.CurrencyAdapter$private var selectedCurrency: String</ID>
+    <ID>MaxLineLength:DigitalInvoiceException.kt$DigitalInvoiceException.DescriptionMissingException$class</ID>
+    <ID>MaxLineLength:DigitalInvoiceException.kt$DigitalInvoiceException.GrossPriceMissingException$class</ID>
+    <ID>MaxLineLength:DigitalInvoiceException.kt$DigitalInvoiceException.GrossPriceParsingException$class</ID>
+    <ID>MaxLineLength:DigitalInvoiceException.kt$DigitalInvoiceException.LineItemsMissingException$class</ID>
+    <ID>MaxLineLength:DigitalInvoiceException.kt$DigitalInvoiceException.MixedCurrenciesException$class</ID>
+    <ID>MaxLineLength:DigitalInvoiceException.kt$DigitalInvoiceException.QuantityMissingException$class</ID>
+    <ID>MaxLineLength:DigitalInvoiceException.kt$DigitalInvoiceException.QuantityParsingException$class</ID>
+    <ID>MaxLineLength:DigitalInvoiceFragment.kt$DigitalInvoiceFragment$InjectedViewAdapterHolder</ID>
+    <ID>MaxLineLength:DigitalInvoiceFragment.kt$DigitalInvoiceFragment.Companion$internal</ID>
+    <ID>MaxLineLength:DigitalInvoiceHelpFragment.kt$DigitalInvoiceHelpFragment$InjectedViewAdapterHolder</ID>
+    <ID>MaxLineLength:DigitalInvoiceHelpNavigationBarBottomAdapter.kt$DefaultDigitalInvoiceHelpNavigationBarBottomAdapter$val binding = GbsHelpNavigationBarBottomBinding.inflate(LayoutInflater.from(container.context), container, false)</ID>
+    <ID>MaxLineLength:DigitalInvoiceNavigationBarBottomAdapter.kt$DefaultDigitalInvoiceNavigationBarBottomAdapter$binding = GbsDigitalInvoiceNavigationBarBottomBinding.inflate(LayoutInflater.from(container.context), container, false)</ID>
+    <ID>MaxLineLength:DigitalInvoiceOnboardingFragment.kt$DigitalInvoiceOnboardingFragment$*</ID>
+    <ID>MaxLineLength:DigitalInvoiceOnboardingFragment.kt$DigitalInvoiceOnboardingFragment$InjectedViewAdapterHolder(GiniBank.digitalInvoiceOnboardingIllustrationAdapterInstance) { it.onVisible() }</ID>
+    <ID>MaxLineLength:DigitalInvoiceOnboardingNavigationBarBottomAdapter.kt$DefaultDigitalInvoiceOnboardingNavigationBarBottomAdapter$val binding = GbsDigitalInvoiceOnboardingNavigationBarBottomBinding.inflate(LayoutInflater.from(container.context), container, false)</ID>
+    <ID>MaxLineLength:DigitalInvoiceScreenPresenter.kt$DigitalInvoiceScreenPresenter$totalGrossPriceIntegralAndFractionalParts = digitalInvoice.totalPriceIntegralAndFractionalParts()</ID>
+    <ID>MaxLineLength:GiniBank.kt$GiniBank$"Please use sendTransferSummary() to provide the required transfer summary first (if the user has completed TAN verification) and then releaseCapture() to let the SDK free up used resources."</ID>
+    <ID>MaxLineLength:GiniBank.kt$GiniBank$"Please use setCaptureConfiguration(context, captureConfiguration) which allows instance recreation without having to call releaseCapture()"</ID>
+    <ID>MaxLineLength:GiniBank.kt$GiniBank$*</ID>
+    <ID>MaxLineLength:GiniBank.kt$GiniBank$check(capture != null) { "Capture feature is not configured. Call setCaptureConfiguration before starting the flow." }</ID>
+    <ID>MaxLineLength:GiniBank.kt$GiniBank$check(giniCapture != null) { "Capture feature is not configured. Call setCaptureConfiguration before creating the CaptureFlowFragment." }</ID>
+    <ID>MaxLineLength:GiniBank.kt$GiniBank$check(giniCapture != null) { "Capture feature is not configured. Call setCaptureConfiguration before starting the flow." }</ID>
+    <ID>MaxLineLength:GiniBank.kt$GiniBank$check(giniCapture == null) { "Gini Capture already configured. Call releaseCapture() before setting a new configuration." }</ID>
+    <ID>MaxLineLength:GiniBank.kt$GiniBank$internal</ID>
+    <ID>MaxLineLength:HelpItem.kt$HelpItem$enum</ID>
+    <ID>MaxLineLength:LineItem.kt$LineItem$override fun toString()</ID>
+    <ID>MaxLineLength:LineItemsAdapter.kt$LineItemsAdapter$// Adding padding for the last addon item, so the item looks full height without modifying the layout file</ID>
+    <ID>MaxLineLength:LineItemsAdapter.kt$LineItemsAdapter$viewHolder.itemView.setPadding(context.resources.getDimension(net.gini.android.capture.R.dimen.gc_large).toInt(), 0, 0, bottomPadding)</ID>
+    <ID>MaxLineLength:LineItemsValidator.kt$if</ID>
+    <ID>MaxLineLength:OncePerInstallEventStore.kt$OncePerInstallEventStore$private val mSharedPreferences: SharedPreferences = context.getSharedPreferences(ONCE_PER_INSTALL_EVENTS, Context.MODE_PRIVATE)</ID>
+    <ID>MaxLineLength:SelectableLineItem.kt$SelectableLineItem$*</ID>
+    <ID>MaxLineLength:SelectableLineItem.kt$SelectableLineItem$override fun toString()</ID>
+    <ID>NewLineAtEndOfFile:AmountParsingException.kt$net.gini.android.bank.sdk.error.AmountParsingException.kt</ID>
+    <ID>NewLineAtEndOfFile:AutoClearedValue.kt$net.gini.android.bank.sdk.capture.util.AutoClearedValue.kt</ID>
+    <ID>NewLineAtEndOfFile:AutoClearedValue.kt$net.gini.android.bank.sdk.util.AutoClearedValue.kt</ID>
+    <ID>NewLineAtEndOfFile:BigDecimalExtensions.kt$net.gini.android.bank.sdk.capture.digitalinvoice.BigDecimalExtensions.kt</ID>
+    <ID>NewLineAtEndOfFile:CaptureFlowActivity.kt$net.gini.android.bank.sdk.capture.CaptureFlowActivity.kt</ID>
+    <ID>NewLineAtEndOfFile:ContextExtensions.kt$net.gini.android.bank.sdk.util.ContextExtensions.kt</ID>
+    <ID>NewLineAtEndOfFile:CoroutineContinuationHelper.kt$net.gini.android.bank.sdk.util.CoroutineContinuationHelper.kt</ID>
+    <ID>NewLineAtEndOfFile:DigitalInvoice.kt$net.gini.android.bank.sdk.capture.digitalinvoice.DigitalInvoice.kt</ID>
+    <ID>NewLineAtEndOfFile:DigitalInvoiceAddon.kt$net.gini.android.bank.sdk.capture.digitalinvoice.DigitalInvoiceAddon.kt</ID>
+    <ID>NewLineAtEndOfFile:DigitalInvoiceAnalyticsExt.kt$net.gini.android.bank.sdk.analytics.DigitalInvoiceAnalyticsExt.kt</ID>
+    <ID>NewLineAtEndOfFile:DigitalInvoiceException.kt$net.gini.android.bank.sdk.capture.digitalinvoice.DigitalInvoiceException.kt</ID>
+    <ID>NewLineAtEndOfFile:DigitalInvoiceFragmentListener.kt$net.gini.android.bank.sdk.capture.digitalinvoice.DigitalInvoiceFragmentListener.kt</ID>
+    <ID>NewLineAtEndOfFile:DigitalInvoiceHelpFragment.kt$net.gini.android.bank.sdk.capture.digitalinvoice.help.DigitalInvoiceHelpFragment.kt</ID>
+    <ID>NewLineAtEndOfFile:DigitalInvoiceNavigationBarBottomAdapter.kt$net.gini.android.bank.sdk.capture.digitalinvoice.view.DigitalInvoiceNavigationBarBottomAdapter.kt</ID>
+    <ID>NewLineAtEndOfFile:DigitalInvoiceOnboardingFragmentListener.kt$net.gini.android.bank.sdk.capture.digitalinvoice.onboarding.DigitalInvoiceOnboardingFragmentListener.kt</ID>
+    <ID>NewLineAtEndOfFile:DigitalInvoiceOnboardingNavigationBarBottomAdapter.kt$net.gini.android.bank.sdk.capture.digitalinvoice.view.DigitalInvoiceOnboardingNavigationBarBottomAdapter.kt</ID>
+    <ID>NewLineAtEndOfFile:DigitalInvoiceScreenContract.kt$net.gini.android.bank.sdk.capture.digitalinvoice.DigitalInvoiceScreenContract.kt</ID>
+    <ID>NewLineAtEndOfFile:DigitalInvoiceScreenPresenter.kt$net.gini.android.bank.sdk.capture.digitalinvoice.DigitalInvoiceScreenPresenter.kt</ID>
+    <ID>NewLineAtEndOfFile:DigitalOnboardingScreenContract.kt$net.gini.android.bank.sdk.capture.digitalinvoice.onboarding.DigitalOnboardingScreenContract.kt</ID>
+    <ID>NewLineAtEndOfFile:DigitalOnboardingScreenPresenter.kt$net.gini.android.bank.sdk.capture.digitalinvoice.onboarding.DigitalOnboardingScreenPresenter.kt</ID>
+    <ID>NewLineAtEndOfFile:EditTextExtensions.kt$net.gini.android.bank.sdk.capture.digitalinvoice.details.EditTextExtensions.kt</ID>
+    <ID>NewLineAtEndOfFile:FragmentExtension.kt$net.gini.android.bank.sdk.capture.util.FragmentExtension.kt</ID>
+    <ID>NewLineAtEndOfFile:FragmentExtensions.kt$net.gini.android.bank.sdk.util.FragmentExtensions.kt</ID>
+    <ID>NewLineAtEndOfFile:GiniBankAPI.kt$net.gini.android.bank.sdk.util.GiniBankAPI.kt</ID>
+    <ID>NewLineAtEndOfFile:IsolatedKoinContext.kt$net.gini.android.bank.sdk.di.IsolatedKoinContext.kt</ID>
+    <ID>NewLineAtEndOfFile:LineItem.kt$net.gini.android.bank.sdk.capture.digitalinvoice.LineItem.kt</ID>
+    <ID>NewLineAtEndOfFile:LineItemDetailsScreenPresenter.kt$net.gini.android.bank.sdk.capture.digitalinvoice.details.LineItemDetailsScreenPresenter.kt</ID>
+    <ID>NewLineAtEndOfFile:LineItemsValidator.kt$net.gini.android.bank.sdk.capture.digitalinvoice.LineItemsValidator.kt</ID>
+    <ID>NewLineAtEndOfFile:PaymentRequestIntent.kt$net.gini.android.bank.sdk.pay.PaymentRequestIntent.kt</ID>
+    <ID>NewLineAtEndOfFile:PreferencesExtension.kt$net.gini.android.bank.sdk.capture.util.PreferencesExtension.kt</ID>
+    <ID>NewLineAtEndOfFile:ResolvePaymentInputExtensions.kt$net.gini.android.bank.sdk.util.ResolvePaymentInputExtensions.kt</ID>
+    <ID>NewLineAtEndOfFile:ReturnReasonsDialog.kt$net.gini.android.bank.sdk.capture.digitalinvoice.ReturnReasonsDialog.kt</ID>
+    <ID>NewLineAtEndOfFile:SelectableLineItem.kt$net.gini.android.bank.sdk.capture.digitalinvoice.SelectableLineItem.kt</ID>
+    <ID>NewLineAtEndOfFile:SkontoFooterSectionColors.kt$net.gini.android.bank.sdk.capture.skonto.colors.section.SkontoFooterSectionColors.kt</ID>
+    <ID>NewLineAtEndOfFile:SkontoFragment.kt$net.gini.android.bank.sdk.capture.skonto.SkontoFragment.kt</ID>
+    <ID>NewLineAtEndOfFile:SkontoFragmentContract.kt$net.gini.android.bank.sdk.capture.skonto.SkontoFragmentContract.kt</ID>
+    <ID>NewLineAtEndOfFile:SkontoFragmentListener.kt$net.gini.android.bank.sdk.capture.skonto.SkontoFragmentListener.kt</ID>
+    <ID>NewLineAtEndOfFile:SkontoFragmentViewModel.kt$net.gini.android.bank.sdk.capture.skonto.SkontoFragmentViewModel.kt</ID>
+    <ID>NewLineAtEndOfFile:SkontoInfoDialogColors.kt$net.gini.android.bank.sdk.capture.skonto.colors.section.SkontoInfoDialogColors.kt</ID>
+    <ID>NewLineAtEndOfFile:SkontoInvoiceScanSectionColors.kt$net.gini.android.bank.sdk.capture.skonto.colors.section.SkontoInvoiceScanSectionColors.kt</ID>
+    <ID>NewLineAtEndOfFile:SkontoNavigationBarBottomAdapter.kt$net.gini.android.bank.sdk.capture.skonto.SkontoNavigationBarBottomAdapter.kt</ID>
+    <ID>NewLineAtEndOfFile:SkontoScreenModule.kt$net.gini.android.bank.sdk.capture.skonto.SkontoScreenModule.kt</ID>
+    <ID>NewLineAtEndOfFile:SkontoSectionColors.kt$net.gini.android.bank.sdk.capture.skonto.colors.section.SkontoSectionColors.kt</ID>
+    <ID>NewLineAtEndOfFile:WithoutSkontoSectionColors.kt$net.gini.android.bank.sdk.capture.skonto.colors.section.WithoutSkontoSectionColors.kt</ID>
+    <ID>ReturnCount:CaptureFlowFragment.kt$CaptureFlowFragment$override fun onFinishedWithResult(result: CaptureSDKResult)</ID>
+    <ID>SerialVersionUIDInSerializableClass:SkontoData.kt$SkontoData : Serializable</ID>
+    <ID>SerialVersionUIDInSerializableClass:SkontoData.kt$SkontoData$Amount : Serializable</ID>
+    <ID>SerialVersionUIDInSerializableClass:SkontoData.kt$SkontoData$SkontoPaymentMethod : Serializable</ID>
+    <ID>SwallowedException:CaptureFlowFragment.kt$CaptureFlowFragment$e: Exception</ID>
+    <ID>SwallowedException:CaptureFlowFragment.kt$CaptureFlowFragment$notUsed: DigitalInvoiceException</ID>
+    <ID>SwallowedException:DigitalInvoiceAddon.kt$DigitalInvoiceAddon.Companion$e: Exception</ID>
+    <ID>SwallowedException:LineItem.kt$LineItem$e: Exception</ID>
+    <ID>ThrowsCount:SkontoDataExtractor.kt$SkontoDataExtractor.Companion$fun extractSkontoData( extractions: Map&lt;String, GiniCaptureSpecificExtraction>, compoundExtractions: Map&lt;String, GiniCaptureCompoundExtraction>, ): SkontoData</ID>
+    <ID>TooGenericExceptionCaught:CaptureFlowFragment.kt$CaptureFlowFragment$e: Exception</ID>
+    <ID>TooGenericExceptionCaught:DigitalInvoiceAddon.kt$DigitalInvoiceAddon.Companion$e: Exception</ID>
+    <ID>TooGenericExceptionCaught:LineItem.kt$LineItem$e: Exception</ID>
+    <ID>TooGenericExceptionCaught:LineItemsValidator.kt$e: Exception</ID>
+    <ID>TooGenericExceptionThrown:GiniBank.kt$GiniBank$throw Exception( paymentRequestResource.message, paymentRequestResource.exception )</ID>
+    <ID>TooGenericExceptionThrown:GiniBank.kt$GiniBank$throw Exception( resolvedPaymentResource.message, resolvedPaymentResource.exception )</ID>
+    <ID>TooGenericExceptionThrown:GiniBank.kt$GiniBank$throw Exception("Cancelled")</ID>
+    <ID>TooManyFunctions:CaptureFlowFragment.kt$CaptureFlowFragment : FragmentGiniCaptureFragmentListenerDigitalInvoiceFragmentListenerSkontoFragmentListenerCancelListener</ID>
+    <ID>TooManyFunctions:DigitalInvoice.kt$DigitalInvoice</ID>
+    <ID>TooManyFunctions:DigitalInvoiceBottomSheet.kt$DigitalInvoiceBottomSheet : BottomSheetDialogFragmentView</ID>
+    <ID>TooManyFunctions:DigitalInvoiceFragment.kt$DigitalInvoiceFragment : FragmentViewLineItemsAdapterListener</ID>
+    <ID>TooManyFunctions:DigitalInvoiceOnboardingFragment.kt$DigitalInvoiceOnboardingFragment : FragmentView</ID>
+    <ID>TooManyFunctions:DigitalInvoiceScreenPresenter.kt$DigitalInvoiceScreenPresenter : Presenter</ID>
+    <ID>TooManyFunctions:GiniBank.kt$GiniBank</ID>
+    <ID>TooManyFunctions:LineItemDetailsScreenContract.kt$LineItemDetailsScreenContract$View : GiniCaptureBaseView</ID>
+    <ID>TooManyFunctions:LineItemDetailsScreenPresenter.kt$LineItemDetailsScreenPresenter : Presenter</ID>
+    <ID>TooManyFunctions:ReturnReasonsDialog.kt$ReturnReasonDialog : BottomSheetDialogFragment</ID>
+    <ID>TooManyFunctions:SkontoFragment.kt$net.gini.android.bank.sdk.capture.skonto.SkontoFragment.kt</ID>
+    <ID>TooManyFunctions:SkontoFragmentViewModel.kt$SkontoFragmentViewModel : ViewModel</ID>
+    <ID>TopLevelPropertyNaming:PaymentRequestIntent.kt$internal const val Scheme = "ginipay" // It has to match the scheme in query tag in manifest</ID>
+    <ID>TopLevelPropertyNaming:PaymentRequestIntent.kt$private const val PaymentPath = "payment"</ID>
+    <ID>UnusedPrivateMember:SkontoFragment.kt$@Composable @Preview private fun ScreenReadyStatePreviewLight()</ID>
+    <ID>UnusedPrivateMember:SkontoFragment.kt$@Composable @Preview(uiMode = UI_MODE_NIGHT_YES) private fun ScreenReadyStatePreviewDark()</ID>
+    <ID>UnusedPrivateMember:SkontoFragment.kt$@Composable private fun YourInvoiceScanSection( modifier: Modifier = Modifier, colorScheme: SkontoInvoiceScanSectionColors, )</ID>
+    <ID>UnusedPrivateProperty:DigitalInvoiceFragment.kt$private const val TAG_WHAT_IS_THIS_DIALOG = "TAG_WHAT_IS_THIS_DIALOG"</ID>
+    <ID>UnusedPrivateProperty:SkontoDataExtractor.kt$SkontoDataExtractor.Companion$val skontoAmountDiscounted = skontoDiscountData.extractDataByKeys( "skontoAmountDiscounted", "skontoAmountDiscountedCalculated" )</ID>
+    <ID>UseCheckOrError:AutoClearedValue.kt$AutoClearedValue$throw IllegalStateException( "should never call auto-cleared-value get when it might not be available" )</ID>
+    <ID>UseCheckOrError:LineItemsAdapter.kt$ViewType.Companion$throw IllegalStateException("Unknow adapter view type id: $viewTypeId")</ID>
+    <ID>UtilityClassWithPublicConstructor:LineItemsValidator.kt$LineItemsValidator</ID>
+    <ID>UtilityClassWithPublicConstructor:SkontoDataExtractor.kt$SkontoDataExtractor</ID>
+    <ID>WildcardImport:CoroutineContinuationHelper.kt$import kotlinx.coroutines.*</ID>
+    <ID>WildcardImport:GiniBank.kt$import net.gini.android.capture.*</ID>
+    <ID>WildcardImport:LineItemsAdapter.kt$import net.gini.android.bank.sdk.capture.digitalinvoice.ViewType.*</ID>
+    <ID>WildcardImport:LineItemsValidator.kt$import net.gini.android.bank.sdk.capture.digitalinvoice.DigitalInvoiceException.*</ID>
+    <ID>WildcardImport:SimpleBusEventStore.kt$import kotlinx.coroutines.flow.*</ID>
+  </CurrentIssues>
+</SmellBaseline>
diff --git a/bank-sdk/sdk/gradle.properties b/bank-sdk/sdk/gradle.properties
index 7a3ce419db..c7c91f878f 100644
--- a/bank-sdk/sdk/gradle.properties
+++ b/bank-sdk/sdk/gradle.properties
@@ -1,7 +1,7 @@
 # Maven coordinates
 # groupId is in the root gradle.properties
 artifactId=gini-bank-sdk
-version=3.11.2
+version=3.12.0
 # Version code is visible only in the generated BuildConfig file
 versionCode=0
 
diff --git a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/GiniBank.kt b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/GiniBank.kt
index d86a1a582f..4b158e9a23 100644
--- a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/GiniBank.kt
+++ b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/GiniBank.kt
@@ -24,6 +24,7 @@ import net.gini.android.bank.sdk.capture.digitalinvoice.view.DefaultDigitalInvoi
 import net.gini.android.bank.sdk.capture.digitalinvoice.view.DefaultDigitalInvoiceOnboardingNavigationBarBottomAdapter
 import net.gini.android.bank.sdk.capture.digitalinvoice.view.DigitalInvoiceNavigationBarBottomAdapter
 import net.gini.android.bank.sdk.capture.digitalinvoice.view.DigitalInvoiceOnboardingNavigationBarBottomAdapter
+import net.gini.android.bank.sdk.capture.skonto.SkontoNavigationBarBottomAdapter
 import net.gini.android.bank.sdk.error.AmountParsingException
 import net.gini.android.bank.sdk.pay.getBusinessIntent
 import net.gini.android.bank.sdk.pay.getRequestId
@@ -101,6 +102,18 @@ object GiniBank {
         }
         get() = digitalInvoiceNavigationBarBottomAdapterInstance.viewAdapter
 
+
+    internal var skontoNavigationBarBottomAdapterInstance: InjectedViewAdapterInstance<SkontoNavigationBarBottomAdapter>? =
+        null
+
+    var skontoNavigationBarBottomAdapter: SkontoNavigationBarBottomAdapter?
+        set(value) {
+            skontoNavigationBarBottomAdapterInstance =
+                value?.let { InjectedViewAdapterInstance(it) }
+        }
+        get() = skontoNavigationBarBottomAdapterInstance?.viewAdapter
+
+
     internal fun getCaptureConfiguration() = captureConfiguration
 
     /**
@@ -316,18 +329,26 @@ object GiniBank {
     ): CancellationToken {
         giniCapture.let { capture ->
             check(capture != null) { "Capture feature is not configured. Call setCaptureConfiguration before starting the flow." }
-            return capture.createDocumentForImportedFiles(intent, context, object : AsyncCallback<Document, ImportedFileValidationException> {
-                override fun onSuccess(result: Document) {
-                    resultLauncher.launch(CaptureImportInput.Forward(result))
-                }
-
-                override fun onError(exception: ImportedFileValidationException?) {
-                    resultLauncher.launch(CaptureImportInput.Error(exception?.validationError, exception?.message))
-                }
+            return capture.createDocumentForImportedFiles(
+                intent,
+                context,
+                object : AsyncCallback<Document, ImportedFileValidationException> {
+                    override fun onSuccess(result: Document) {
+                        resultLauncher.launch(CaptureImportInput.Forward(result))
+                    }
+
+                    override fun onError(exception: ImportedFileValidationException?) {
+                        resultLauncher.launch(
+                            CaptureImportInput.Error(
+                                exception?.validationError,
+                                exception?.message
+                            )
+                        )
+                    }
 
-                override fun onCancelled() {
-                }
-            })
+                    override fun onCancelled() {
+                    }
+                })
         }
     }
 
@@ -413,17 +434,18 @@ object GiniBank {
         /**
          * The document was processed successfully.
          */
-        data class Success(val document: Document?): CreateDocumentFromImportedFileResult()
+        data class Success(val document: Document?) : CreateDocumentFromImportedFileResult()
 
         /**
          * Document processing returned an error.
          */
-        data class Error(val error: ImportedFileValidationException?): CreateDocumentFromImportedFileResult()
+        data class Error(val error: ImportedFileValidationException?) :
+            CreateDocumentFromImportedFileResult()
 
         /**
          * Document processing was cancelled.
          */
-        object Cancelled: CreateDocumentFromImportedFileResult()
+        object Cancelled : CreateDocumentFromImportedFileResult()
     }
 
     /**
@@ -442,7 +464,7 @@ object GiniBank {
         return giniCapture?.createDocumentForImportedFiles(
             intent,
             context,
-            object: AsyncCallback<Document, ImportedFileValidationException> {
+            object : AsyncCallback<Document, ImportedFileValidationException> {
                 override fun onSuccess(result: Document?) {
                     callback(CreateDocumentFromImportedFileResult.Success(result))
                 }
diff --git a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/analytics/DigitalInvoiceAnalyticsExt.kt b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/analytics/DigitalInvoiceAnalyticsExt.kt
new file mode 100644
index 0000000000..cb99436a0b
--- /dev/null
+++ b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/analytics/DigitalInvoiceAnalyticsExt.kt
@@ -0,0 +1,15 @@
+package net.gini.android.bank.sdk.analytics
+
+import net.gini.android.bank.sdk.capture.digitalinvoice.LineItem
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsEventProperty.ItemsChanged.DifferenceType
+
+internal fun LineItem.getDifferences(compareTo: LineItem?): Set<DifferenceType> {
+
+    compareTo ?: return emptySet()
+
+    return setOfNotNull(
+        DifferenceType.Quantity.takeIf { this.quantity != compareTo.quantity },
+        DifferenceType.Name.takeIf { this.description != compareTo.description },
+        DifferenceType.Price.takeIf { this.grossPrice != compareTo.grossPrice }
+    )
+}
\ No newline at end of file
diff --git a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/CaptureFlowActivity.kt b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/CaptureFlowActivity.kt
index 45e243279f..8bd50d6cbd 100644
--- a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/CaptureFlowActivity.kt
+++ b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/CaptureFlowActivity.kt
@@ -11,6 +11,7 @@ import net.gini.android.bank.sdk.R
 import net.gini.android.capture.Document
 import net.gini.android.capture.internal.util.FileImportValidator
 
+
 /**
  * Entry point for Screen API. It exists for the purpose of communication between Capture SDK's Screen API and Return Assistant.
  */
@@ -36,14 +37,18 @@ internal class CaptureFlowActivity : AppCompatActivity(), CaptureFlowFragmentLis
                     )
                 )
             )
+
             is CaptureImportInput.Forward -> initFragment(input.openWithDocument)
             CaptureImportInput.Default -> initFragment()
         }
     }
 
     private fun getCaptureImportInput(intent: Intent): CaptureImportInput =
-        IntentCompat.getParcelableExtra(intent, EXTRA_IN_CAPTURE_IMPORT_INPUT, CaptureImportInput::class.java)
-            ?: CaptureImportInput.Default
+        IntentCompat.getParcelableExtra(
+            intent,
+            EXTRA_IN_CAPTURE_IMPORT_INPUT,
+            CaptureImportInput::class.java
+        ) ?: CaptureImportInput.Default
 
     private fun initFragment(document: Document? = null) {
         if (!isFragmentShown()) {
@@ -101,8 +106,10 @@ internal class CaptureFlowActivity : AppCompatActivity(), CaptureFlowFragmentLis
  * Input used when a document was shared from another app. It will be created internally.
  */
 @Parcelize
-sealed class CaptureImportInput: Parcelable {
+sealed class CaptureImportInput : Parcelable {
     data class Forward(val openWithDocument: Document) : CaptureImportInput()
-    data class Error(val error: FileImportValidator.Error? = null, val message: String? = null) : CaptureImportInput()
+    data class Error(val error: FileImportValidator.Error? = null, val message: String? = null) :
+        CaptureImportInput()
+
     object Default : CaptureImportInput()
 }
\ No newline at end of file
diff --git a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/CaptureFlowFragment.kt b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/CaptureFlowFragment.kt
index 8e22bb78c9..d4316d540f 100644
--- a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/CaptureFlowFragment.kt
+++ b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/CaptureFlowFragment.kt
@@ -1,5 +1,6 @@
 package net.gini.android.bank.sdk.capture
 
+import android.content.pm.ActivityInfo
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -9,13 +10,18 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentFactory
 import androidx.navigation.NavController
 import androidx.navigation.fragment.findNavController
+import net.gini.android.bank.sdk.BuildConfig
 import net.gini.android.bank.sdk.GiniBank
 import net.gini.android.bank.sdk.R
 import net.gini.android.bank.sdk.capture.digitalinvoice.DigitalInvoiceException
 import net.gini.android.bank.sdk.capture.digitalinvoice.DigitalInvoiceFragment
 import net.gini.android.bank.sdk.capture.digitalinvoice.DigitalInvoiceFragmentListener
 import net.gini.android.bank.sdk.capture.digitalinvoice.LineItemsValidator
+import net.gini.android.bank.sdk.capture.skonto.SkontoDataExtractor
+import net.gini.android.bank.sdk.capture.skonto.SkontoFragment
+import net.gini.android.bank.sdk.capture.skonto.SkontoFragmentListener
 import net.gini.android.bank.sdk.util.disallowScreenshots
+
 import net.gini.android.capture.CaptureSDKResult
 import net.gini.android.capture.Document
 import net.gini.android.capture.GiniCapture
@@ -23,16 +29,22 @@ import net.gini.android.capture.GiniCaptureFragment
 import net.gini.android.capture.GiniCaptureFragmentDirections
 import net.gini.android.capture.GiniCaptureFragmentListener
 import net.gini.android.capture.camera.CameraFragmentListener
+import net.gini.android.capture.internal.util.CancelListener
+import net.gini.android.capture.internal.util.ContextHelper
 import net.gini.android.capture.network.model.GiniCaptureCompoundExtraction
 import net.gini.android.capture.network.model.GiniCaptureSpecificExtraction
-import net.gini.android.capture.internal.util.CancelListener
+import net.gini.android.capture.tracking.useranalytics.UserAnalytics
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsEvent
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsScreen
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsEventProperty
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsUserProperty
 
 class CaptureFlowFragment(private val openWithDocument: Document? = null) :
     Fragment(),
     GiniCaptureFragmentListener,
     DigitalInvoiceFragmentListener,
-    CancelListener
-{
+    SkontoFragmentListener,
+    CancelListener {
 
     private lateinit var navController: NavController
     private lateinit var captureFlowFragmentListener: CaptureFlowFragmentListener
@@ -43,13 +55,25 @@ class CaptureFlowFragment(private val openWithDocument: Document? = null) :
     private var willBeRestored = false
     private var didFinishWithResult = false
 
+    private val userAnalyticsEventTracker by lazy { UserAnalytics.getAnalyticsEventTracker() }
+
+    private fun setReturnReasonsEventProperty() {
+        userAnalyticsEventTracker.setUserProperty(
+            setOf(
+                UserAnalyticsUserProperty.ReturnReasonsEnabled(GiniBank.enableReturnReasons),
+                UserAnalyticsUserProperty.BankSdkVersionName(BuildConfig.VERSION_NAME),
+            )
+        )
+    }
+
     fun setListener(listener: CaptureFlowFragmentListener) {
         this.captureFlowFragmentListener = listener
     }
 
     override fun onGetLayoutInflater(savedInstanceState: Bundle?): LayoutInflater {
         val inflater = super.onGetLayoutInflater(savedInstanceState)
-        val contextThemeWrapper = ContextThemeWrapper(requireContext(), net.gini.android.capture.R.style.GiniCaptureTheme)
+        val contextThemeWrapper =
+            ContextThemeWrapper(requireContext(), net.gini.android.capture.R.style.GiniCaptureTheme)
         return inflater.cloneInContext(contextThemeWrapper)
     }
 
@@ -65,12 +89,15 @@ class CaptureFlowFragment(private val openWithDocument: Document? = null) :
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        setReturnReasonsEventProperty()
+        userAnalyticsEventTracker.trackEvent(UserAnalyticsEvent.SDK_OPENED)
         navController = (childFragmentManager.fragments[0]).findNavController()
     }
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        childFragmentManager.fragmentFactory = CaptureFlowFragmentFactory(this, openWithDocument, this, this)
+        childFragmentManager.fragmentFactory =
+            CaptureFlowFragmentFactory(this, openWithDocument, this, this, this)
         super.onCreate(savedInstanceState)
         if (GiniCapture.hasInstance() && !GiniCapture.getInstance().allowScreenshots) {
             requireActivity().window.disallowScreenshots()
@@ -85,7 +112,7 @@ class CaptureFlowFragment(private val openWithDocument: Document? = null) :
     override fun onDestroy() {
         super.onDestroy()
         if (!didFinishWithResult && !willBeRestored) {
-            captureFlowFragmentListener.onFinishedWithResult(CaptureResult.Cancel)
+            finishWithResult(CaptureResult.Cancel)
         }
     }
 
@@ -115,33 +142,74 @@ class CaptureFlowFragment(private val openWithDocument: Document? = null) :
     }
 
     override fun onFinishedWithResult(result: CaptureSDKResult) {
-        when(result) {
+        when (result) {
             is CaptureSDKResult.Success -> {
-                if (GiniBank.getCaptureConfiguration()?.returnAssistantEnabled == true) {
-                    try {
-                        LineItemsValidator.validate(result.compoundExtractions)
-                        navController.navigate(GiniCaptureFragmentDirections.toDigitalInvoiceFragment(
-                            DigitalInvoiceFragment.getExtractionsBundle(result.specificExtractions),
-                            DigitalInvoiceFragment.getCompoundExtractionsBundle(result.compoundExtractions),
-                            result.returnReasons.toTypedArray(),
-                            DigitalInvoiceFragment.getAmountsAreConsistentExtraction(result.specificExtractions)
-                        ))
-                    } catch (notUsed: DigitalInvoiceException) {
-                        didFinishWithResult = true
-                        captureFlowFragmentListener.onFinishedWithResult(interceptSuccessResult(result).toCaptureResult())
+                when {
+                    GiniBank.getCaptureConfiguration()?.returnAssistantEnabled == true -> {
+                        try {
+                            tryShowingReturnAssistant(result)
+                            return
+                        } catch (notUsed: DigitalInvoiceException) {
+                            tryShowingSkontoScreen(result)
+                            return
+                        }
+                    }
+
+                    GiniBank.getCaptureConfiguration()?.skontoEnabled == true -> {
+                        tryShowingSkontoScreen(result)
+                        return
+                    }
+
+                    else -> {
+                        finishWithResult(interceptSuccessResult(result).toCaptureResult())
                     }
-                } else {
-                    didFinishWithResult = true
-                    captureFlowFragmentListener.onFinishedWithResult(interceptSuccessResult(result).toCaptureResult())
                 }
             }
+
             else -> {
-                didFinishWithResult = true
-                captureFlowFragmentListener.onFinishedWithResult(result.toCaptureResult())
+                finishWithResult(result.toCaptureResult())
             }
         }
     }
 
+    private fun tryShowingReturnAssistant(result: CaptureSDKResult.Success) {
+        LineItemsValidator.validate(result.compoundExtractions)
+        navController.navigate(
+            GiniCaptureFragmentDirections.toDigitalInvoiceFragment(
+                DigitalInvoiceFragment.getExtractionsBundle(result.specificExtractions),
+                DigitalInvoiceFragment.getCompoundExtractionsBundle(result.compoundExtractions),
+                result.returnReasons.toTypedArray(),
+                DigitalInvoiceFragment.getAmountsAreConsistentExtraction(result.specificExtractions)
+            )
+        )
+    }
+
+    private fun tryShowingSkontoScreen(result: CaptureSDKResult.Success) {
+        if (GiniBank.getCaptureConfiguration()?.skontoEnabled == true) {
+            try {
+                val skontoData = SkontoDataExtractor.extractSkontoData(
+                    result.specificExtractions,
+                    result.compoundExtractions
+                )
+
+                navController.navigate(
+                    GiniCaptureFragmentDirections.toSkontoFragment(data = skontoData)
+                )
+            } catch (e: Exception) {
+                finishWithResult(interceptSuccessResult(result).toCaptureResult())
+            }
+        }
+    }
+
+    private fun finishWithResult(result: CaptureResult) {
+        if (!ContextHelper.isTablet(requireContext())) {
+            requireActivity().requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
+        }
+        didFinishWithResult = true
+        captureFlowFragmentListener.onFinishedWithResult(result)
+        trackSdkClosedEvent(UserAnalyticsScreen.Analysis)
+    }
+
     private fun interceptSuccessResult(result: CaptureSDKResult.Success): CaptureSDKResult {
         return if (result.specificExtractions.isEmpty() ||
             !pay5ExtractionsAvailable(result.specificExtractions) &&
@@ -171,19 +239,30 @@ class CaptureFlowFragment(private val openWithDocument: Document? = null) :
         specificExtractions: Map<String, GiniCaptureSpecificExtraction>,
         compoundExtractions: Map<String, GiniCaptureCompoundExtraction>
     ) {
-        didFinishWithResult = true
-        captureFlowFragmentListener.onFinishedWithResult(CaptureResult.Success(
+        finishWithResult(CaptureResult.Success(
+            specificExtractions,
+            compoundExtractions,
+            emptyList()
+        ))
+    }
+
+
+    override fun onPayInvoiceWithSkonto(
+        specificExtractions: Map<String, GiniCaptureSpecificExtraction>,
+        compoundExtractions: Map<String, GiniCaptureCompoundExtraction>
+    ) {
+        finishWithResult(CaptureResult.Success(
             specificExtractions,
             compoundExtractions,
             emptyList()
         ))
     }
 
+
     override fun onCancelFlow() {
         val popBackStack = navController.popBackStack()
         if (!popBackStack) {
-            didFinishWithResult = true
-            captureFlowFragmentListener.onFinishedWithResult(CaptureResult.Cancel)
+            finishWithResult(CaptureResult.Cancel)
         }
     }
 
@@ -192,6 +271,16 @@ class CaptureFlowFragment(private val openWithDocument: Document? = null) :
             return CaptureFlowFragment(openWithDocument)
         }
     }
+
+    private fun trackSdkClosedEvent(screen: UserAnalyticsScreen) = runCatching {
+        userAnalyticsEventTracker.trackEvent(
+            UserAnalyticsEvent.SDK_CLOSED,
+            setOf(
+                UserAnalyticsEventProperty.Screen(screen),
+                UserAnalyticsEventProperty.Status(UserAnalyticsEventProperty.Status.StatusType.Successful),
+            )
+        )
+    }
 }
 
 interface CaptureFlowFragmentListener {
@@ -207,22 +296,32 @@ interface CaptureFlowFragmentListener {
 
 class CaptureFlowFragmentFactory(
     private val giniCaptureFragmentListener: GiniCaptureFragmentListener,
-    private val openWithDocument: Document? = null,
+    private var openWithDocument: Document? = null,
     private val digitalInvoiceListener: DigitalInvoiceFragmentListener,
+    private val skontoListener: SkontoFragmentListener,
     private val cancelCallback: CancelListener
 ) : FragmentFactory() {
     override fun instantiate(classLoader: ClassLoader, className: String): Fragment {
         return when (className) {
-            GiniCaptureFragment::class.java.name -> GiniCaptureFragment(openWithDocument)
+            GiniCaptureFragment::class.java.name -> GiniCaptureFragment.createInstance(
+                openWithDocument
+            ) { openWithDocument = null }
                 .apply {
                     setListener(
                         giniCaptureFragmentListener
                     )
                 }
+
             DigitalInvoiceFragment::class.java.name -> DigitalInvoiceFragment().apply {
                 listener = digitalInvoiceListener
                 cancelListener = cancelCallback
             }
+
+            SkontoFragment::class.java.name -> SkontoFragment().apply {
+                skontoFragmentListener = skontoListener
+                cancelListener = cancelCallback
+            }
+
             else -> super.instantiate(classLoader, className)
         }
     }
diff --git a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/Configuration.kt b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/Configuration.kt
index 5c7e068888..1d921d7287 100644
--- a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/Configuration.kt
+++ b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/Configuration.kt
@@ -1,5 +1,6 @@
 package net.gini.android.bank.sdk.capture
 
+import net.gini.android.bank.sdk.capture.skonto.SkontoNavigationBarBottomAdapter
 import net.gini.android.capture.DocumentImportEnabledFileTypes
 import net.gini.android.capture.EntryPoint
 import net.gini.android.capture.GiniCapture
@@ -181,6 +182,11 @@ data class CaptureConfiguration(
      */
     val reviewNavigationBarBottomAdapter: ReviewNavigationBarBottomAdapter? = null,
 
+    /**
+     * Set an adapter implementation to show a custom bottom navigation bar on the Skonto screen.
+     */
+    val skontoNavigationBarBottomAdapter: SkontoNavigationBarBottomAdapter? = null,
+
     /**
      * Set an adapter implementation to show a custom bottom navigation bar on the help screen.
      */
@@ -200,8 +206,13 @@ data class CaptureConfiguration(
      *
      * IMPORTANT: If you disallow screenshots and use the [CaptureFlowFragment] for launching the SDK in your activity, please clear the [android.view.WindowManager.LayoutParams.FLAG_SECURE]
      * on your activity's window after the SDK has finished to allow users to take screenshots of your app again.
-    */
-    val allowScreenshots: Boolean = true
+     */
+    val allowScreenshots: Boolean = true,
+
+    /**
+     * Enable/disable the skonto feature.
+     */
+    val skontoEnabled: Boolean = true,
 )
 
 internal fun GiniCapture.Builder.applyConfiguration(configuration: CaptureConfiguration): GiniCapture.Builder {
@@ -231,15 +242,47 @@ internal fun GiniCapture.Builder.applyConfiguration(configuration: CaptureConfig
                 })
             }
             configuration.navigationBarTopAdapter?.let { setNavigationBarTopAdapter(it) }
-            configuration.onboardingAlignCornersIllustrationAdapter?.let { setOnboardingAlignCornersIllustrationAdapter(it) }
-            configuration.onboardingLightingIllustrationAdapter?.let { setOnboardingLightingIllustrationAdapter(it) }
-            configuration.onboardingMultiPageIllustrationAdapter?.let { setOnboardingMultiPageIllustrationAdapter(it) }
-            configuration.onboardingQRCodeIllustrationAdapter?.let { setOnboardingQRCodeIllustrationAdapter(it) }
+            configuration.onboardingAlignCornersIllustrationAdapter?.let {
+                setOnboardingAlignCornersIllustrationAdapter(
+                    it
+                )
+            }
+            configuration.onboardingLightingIllustrationAdapter?.let {
+                setOnboardingLightingIllustrationAdapter(
+                    it
+                )
+            }
+            configuration.onboardingMultiPageIllustrationAdapter?.let {
+                setOnboardingMultiPageIllustrationAdapter(
+                    it
+                )
+            }
+            configuration.onboardingQRCodeIllustrationAdapter?.let {
+                setOnboardingQRCodeIllustrationAdapter(
+                    it
+                )
+            }
             configuration.customLoadingIndicatorAdapter?.let { setLoadingIndicatorAdapter(it) }
-            configuration.onButtonLoadingIndicatorAdapter?.let { setOnButtonLoadingIndicatorAdapter(it) }
-            configuration.onboardingNavigationBarBottomAdapter?.let { setOnboardingNavigationBarBottomAdapter(it) }
-            configuration.cameraNavigationBarBottomAdapter?.let { setCameraNavigationBarBottomAdapter(it) }
-            configuration.reviewNavigationBarBottomAdapter?.let { setReviewBottomBarNavigationAdapter(it) }
+            configuration.onButtonLoadingIndicatorAdapter?.let {
+                setOnButtonLoadingIndicatorAdapter(
+                    it
+                )
+            }
+            configuration.onboardingNavigationBarBottomAdapter?.let {
+                setOnboardingNavigationBarBottomAdapter(
+                    it
+                )
+            }
+            configuration.cameraNavigationBarBottomAdapter?.let {
+                setCameraNavigationBarBottomAdapter(
+                    it
+                )
+            }
+            configuration.reviewNavigationBarBottomAdapter?.let {
+                setReviewBottomBarNavigationAdapter(
+                    it
+                )
+            }
             configuration.helpNavigationBarBottomAdapter?.let { setHelpNavigationBarBottomAdapter(it) }
         }
 }
diff --git a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/digitalinvoice/DigitalInvoiceBottomSheet.kt b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/digitalinvoice/DigitalInvoiceBottomSheet.kt
index f69f18904b..793bd41368 100644
--- a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/digitalinvoice/DigitalInvoiceBottomSheet.kt
+++ b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/digitalinvoice/DigitalInvoiceBottomSheet.kt
@@ -18,6 +18,7 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import net.gini.android.bank.sdk.R
+import net.gini.android.bank.sdk.analytics.getDifferences
 import net.gini.android.bank.sdk.capture.digitalinvoice.details.LineItemDetailsScreenContract
 import net.gini.android.bank.sdk.capture.digitalinvoice.details.LineItemDetailsScreenPresenter
 import net.gini.android.bank.sdk.capture.digitalinvoice.details.MIN_QUANTITY
@@ -31,6 +32,10 @@ import net.gini.android.bank.sdk.util.wrappedWithGiniCaptureTheme
 import net.gini.android.capture.AmountCurrency
 import net.gini.android.capture.GiniCapture
 import net.gini.android.capture.network.model.GiniCaptureReturnReason
+import net.gini.android.capture.tracking.useranalytics.UserAnalytics
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsEvent
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsEventProperty
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsScreen
 
 private const val ARGS_SELECTABLE_LINE_ITEM = "GBS_ARGS_SELECTABLE_LINE_ITEM"
 
@@ -41,6 +46,7 @@ internal class DigitalInvoiceBottomSheet : BottomSheetDialogFragment(), LineItem
 
     private lateinit var binding: GbsEditItemBottomSheetBinding
     private var selectableLineItem: SelectableLineItem? = null
+    private var originalSelectableLineItem: SelectableLineItem? = null
     private var quantity: Int = 1
     private val editorListener = TextView.OnEditorActionListener { v, actionId, event ->
         v.clearFocus()
@@ -49,11 +55,15 @@ internal class DigitalInvoiceBottomSheet : BottomSheetDialogFragment(), LineItem
     }
 
     private var selectedCurrency = "EUR"
+    private val screenName: UserAnalyticsScreen = UserAnalyticsScreen.EditReturnAssistant
+
+    private val userAnalyticsEventTracker by lazy { UserAnalytics.getAnalyticsEventTracker() }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         arguments?.let {
             selectableLineItem = BundleCompat.getParcelable(it, ARGS_SELECTABLE_LINE_ITEM, SelectableLineItem::class.java)
+            originalSelectableLineItem = selectableLineItem?.copy()
             activity?.let { activity ->
                 createPresenter(activity)
             }
@@ -122,6 +132,8 @@ internal class DigitalInvoiceBottomSheet : BottomSheetDialogFragment(), LineItem
         if (GiniCapture.hasInstance() && !GiniCapture.getInstance().allowScreenshots) {
             dialog?.window?.disallowScreenshots()
         }
+
+        trackScreenShownEvent()
     }
 
     /**
@@ -194,6 +206,7 @@ internal class DigitalInvoiceBottomSheet : BottomSheetDialogFragment(), LineItem
     private fun setupInputHandlers() {
         binding.gbsCloseBottomSheet.setOnClickListener {
             this.dismiss()
+            trackCloseTappedEvent()
         }
 
         binding.gbsAddQuantity.setOnClickListener {
@@ -362,6 +375,7 @@ internal class DigitalInvoiceBottomSheet : BottomSheetDialogFragment(), LineItem
     }
 
     override fun onSave(selectableLineItem: SelectableLineItem) {
+        trackSaveTappedEvent(selectableLineItem)
         setFragmentResult(REQUEST_KEY, Bundle().apply {
             putParcelable(RESULT_KEY, selectableLineItem)
         })
@@ -418,4 +432,38 @@ internal class DigitalInvoiceBottomSheet : BottomSheetDialogFragment(), LineItem
             return convertView
         }
     }
+
+    // region Analytics
+
+    private fun trackScreenShownEvent() {
+        userAnalyticsEventTracker.trackEvent(
+            UserAnalyticsEvent.SCREEN_SHOWN,
+            setOf(UserAnalyticsEventProperty.Screen(screenName))
+        )
+    }
+
+    private fun trackCloseTappedEvent() {
+        userAnalyticsEventTracker.trackEvent(
+            UserAnalyticsEvent.CLOSE_TAPPED,
+            setOf(UserAnalyticsEventProperty.Screen(screenName))
+        )
+    }
+
+    private fun trackSaveTappedEvent(selectableLineItem: SelectableLineItem) {
+        val originalLineItem = originalSelectableLineItem?.lineItem
+        val finalLineItem = selectableLineItem.lineItem
+        val differenceList =
+            originalLineItem?.getDifferences(finalLineItem) ?: emptySet()
+
+        userAnalyticsEventTracker.trackEvent(
+            UserAnalyticsEvent.SAVE_TAPPED,
+            setOf(
+                UserAnalyticsEventProperty.Screen(screenName),
+                UserAnalyticsEventProperty.ItemsChanged(differenceList)
+            )
+        )
+    }
+
+    // endregion
+
 }
diff --git a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/digitalinvoice/DigitalInvoiceFragment.kt b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/digitalinvoice/DigitalInvoiceFragment.kt
index fdda9dc5cb..1d70508cce 100644
--- a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/digitalinvoice/DigitalInvoiceFragment.kt
+++ b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/digitalinvoice/DigitalInvoiceFragment.kt
@@ -8,6 +8,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
+import androidx.activity.OnBackPressedCallback
+import androidx.activity.addCallback
 import androidx.core.os.BundleCompat
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
@@ -29,6 +31,10 @@ import net.gini.android.capture.internal.util.ActivityHelper.forcePortraitOrient
 import net.gini.android.capture.network.model.GiniCaptureCompoundExtraction
 import net.gini.android.capture.network.model.GiniCaptureReturnReason
 import net.gini.android.capture.network.model.GiniCaptureSpecificExtraction
+import net.gini.android.capture.tracking.useranalytics.UserAnalytics
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsEvent
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsEventProperty
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsScreen
 import net.gini.android.capture.internal.util.CancelListener
 import net.gini.android.capture.view.InjectedViewAdapterHolder
 import net.gini.android.capture.view.NavButtonType
@@ -51,10 +57,12 @@ private const val TAG_WHAT_IS_THIS_DIALOG = "TAG_WHAT_IS_THIS_DIALOG"
 /**
  * Internal use only.
  */
-open class DigitalInvoiceFragment : Fragment(), DigitalInvoiceScreenContract.View, LineItemsAdapterListener {
+open class DigitalInvoiceFragment : Fragment(), DigitalInvoiceScreenContract.View,
+    LineItemsAdapterListener {
 
     private var binding by autoCleared<GbsFragmentDigitalInvoiceBinding>()
     private var lineItemsAdapter by autoCleared<LineItemsAdapter>()
+    private val screenName: UserAnalyticsScreen = UserAnalyticsScreen.ReturnAssistant
 
     var listener: DigitalInvoiceFragmentListener? = null
         set(value) {
@@ -74,6 +82,8 @@ open class DigitalInvoiceFragment : Fragment(), DigitalInvoiceScreenContract.Vie
     private var returnReasons: List<GiniCaptureReturnReason> = emptyList()
     private var isInaccurateExtraction: Boolean = false
     private var footerDetails: DigitalInvoiceScreenContract.FooterDetails? = null
+    private val userAnalyticsEventTracker by lazy { UserAnalytics.getAnalyticsEventTracker() }
+    private var onBackPressedCallback: OnBackPressedCallback? = null
 
     companion object {
         internal fun getExtractionsBundle(extractions: Map<String, GiniCaptureSpecificExtraction>): Bundle =
@@ -131,7 +141,11 @@ open class DigitalInvoiceFragment : Fragment(), DigitalInvoiceScreenContract.Vie
                         .toMap()
             }
             returnReasons =
-                (BundleCompat.getParcelableArray(this, ARGS_RETURN_REASONS, GiniCaptureReturnReason::class.java)
+                (BundleCompat.getParcelableArray(
+                    this,
+                    ARGS_RETURN_REASONS,
+                    GiniCaptureReturnReason::class.java
+                )
                     ?.toList() as? List<GiniCaptureReturnReason>) ?: emptyList()
 
             isInaccurateExtraction = getBoolean(ARGS_INACCURATE_EXTRACTION, false)
@@ -189,6 +203,22 @@ open class DigitalInvoiceFragment : Fragment(), DigitalInvoiceScreenContract.Vie
         presenter?.onViewCreated()
     }
 
+    override fun onResume() {
+        super.onResume()
+        onBackPressedCallback?.isEnabled = false
+        onBackPressedCallback = activity?.onBackPressedDispatcher?.addCallback {
+            if (this@DigitalInvoiceFragment.isVisible) {
+                trackCloseTappedEvent()
+            }
+            isEnabled = false
+            cancelListener.onCancelFlow()
+        }
+    }
+
+    override fun onPause() {
+        super.onPause()
+        onBackPressedCallback?.isEnabled = false
+    }
 
     private fun initTopNavigationBar() {
         if (GiniCapture.hasInstance()) {
@@ -201,15 +231,17 @@ open class DigitalInvoiceFragment : Fragment(), DigitalInvoiceScreenContract.Vie
 
                 if (!GiniCapture.getInstance().isBottomNavigationBarEnabled) {
                     injectedViewAdapter.setMenuResource(R.menu.gbs_menu_digital_invoice)
-                    injectedViewAdapter.setOnMenuItemClickListener(IntervalToolbarMenuItemIntervalClickListener {
-                        if (it.itemId == R.id.help) {
-                            showHelp()
-                        }
-                        true
-                    })
+                    injectedViewAdapter.setOnMenuItemClickListener(
+                        IntervalToolbarMenuItemIntervalClickListener {
+                            if (it.itemId == R.id.help) {
+                                showHelp()
+                            }
+                            true
+                        })
                 }
 
                 injectedViewAdapter.setOnNavButtonClickListener {
+                    trackCloseTappedEvent()
                     cancelListener.onCancelFlow()
                 }
             }
@@ -217,6 +249,7 @@ open class DigitalInvoiceFragment : Fragment(), DigitalInvoiceScreenContract.Vie
     }
 
     private fun showHelp() {
+        trackHelpTappedEvent()
         findNavController().navigate(DigitalInvoiceFragmentDirections.toDigitalInvoiceHelpFragment())
     }
 
@@ -234,6 +267,8 @@ open class DigitalInvoiceFragment : Fragment(), DigitalInvoiceScreenContract.Vie
 
                     injectedViewAdapter.setOnProceedClickListener {
                         presenter?.pay()
+                        trackProceedTapped()
+                        trackSdkClosedEvent()
                     }
 
                     footerDetails?.let {
@@ -274,6 +309,8 @@ open class DigitalInvoiceFragment : Fragment(), DigitalInvoiceScreenContract.Vie
 
     override fun payButtonClicked() {
         presenter?.pay()
+        trackProceedTapped()
+        trackSdkClosedEvent()
     }
 
     /**
@@ -315,7 +352,11 @@ open class DigitalInvoiceFragment : Fragment(), DigitalInvoiceScreenContract.Vie
     }
 
     override fun onEditLineItem(selectableLineItem: SelectableLineItem) {
-        findNavController().navigate(DigitalInvoiceFragmentDirections.toDigitalInvoiceEditItemBottomSheetDialog(selectableLineItem))
+        findNavController().navigate(
+            DigitalInvoiceFragmentDirections.toDigitalInvoiceEditItemBottomSheetDialog(
+                selectableLineItem
+            )
+        )
     }
 
     override fun showOnboarding() {
@@ -428,7 +469,11 @@ open class DigitalInvoiceFragment : Fragment(), DigitalInvoiceScreenContract.Vie
                 DigitalInvoiceBottomSheet.REQUEST_KEY,
                 viewLifecycleOwner
             ) { _: String?, result: Bundle ->
-                BundleCompat.getParcelable(result, DigitalInvoiceBottomSheet.RESULT_KEY, SelectableLineItem::class.java)
+                BundleCompat.getParcelable(
+                    result,
+                    DigitalInvoiceBottomSheet.RESULT_KEY,
+                    SelectableLineItem::class.java
+                )
                     ?.let { selectableLineItem ->
                         presenter?.updateLineItem(selectableLineItem)
                     }
@@ -453,6 +498,7 @@ open class DigitalInvoiceFragment : Fragment(), DigitalInvoiceScreenContract.Vie
      */
     override fun onLineItemClicked(lineItem: SelectableLineItem) {
         presenter?.editLineItem(lineItem)
+        trackItemEditTappedTappedEvent()
     }
 
     /**
@@ -462,6 +508,7 @@ open class DigitalInvoiceFragment : Fragment(), DigitalInvoiceScreenContract.Vie
      */
     override fun onLineItemSelected(lineItem: SelectableLineItem) {
         presenter?.selectLineItem(lineItem)
+        trackItemSwitchTappedTappedEvent(lineItem.selected)
     }
 
     /**
@@ -471,5 +518,57 @@ open class DigitalInvoiceFragment : Fragment(), DigitalInvoiceScreenContract.Vie
      */
     override fun onLineItemDeselected(lineItem: SelectableLineItem) {
         presenter?.deselectLineItem(lineItem)
+        trackItemSwitchTappedTappedEvent(lineItem.selected)
+    }
+
+    // region Analytics
+
+    private fun trackCloseTappedEvent() = runCatching {
+        userAnalyticsEventTracker.trackEvent(
+            UserAnalyticsEvent.CLOSE_TAPPED,
+            setOf(UserAnalyticsEventProperty.Screen(screenName)),
+        )
+    }
+
+    private fun trackHelpTappedEvent() = runCatching {
+        userAnalyticsEventTracker.trackEvent(
+            UserAnalyticsEvent.HELP_TAPPED,
+            setOf(UserAnalyticsEventProperty.Screen(screenName)),
+        )
+    }
+
+    private fun trackItemSwitchTappedTappedEvent(selected: Boolean) = runCatching {
+        userAnalyticsEventTracker.trackEvent(
+            UserAnalyticsEvent.ITEM_SWITCH_TAPPED,
+            setOf(
+                UserAnalyticsEventProperty.Screen(screenName),
+                UserAnalyticsEventProperty.SwitchActive(selected)
+            )
+        )
+    }
+
+    private fun trackItemEditTappedTappedEvent() = runCatching {
+        userAnalyticsEventTracker.trackEvent(
+            UserAnalyticsEvent.EDIT_TAPPED,
+            setOf(UserAnalyticsEventProperty.Screen(screenName)),
+        )
+    }
+
+    private fun trackProceedTapped() = runCatching {
+        userAnalyticsEventTracker.trackEvent(
+            UserAnalyticsEvent.PROCEED_TAPPED,
+            setOf(UserAnalyticsEventProperty.Screen(screenName))
+        )
+    }
+
+    private fun trackSdkClosedEvent() = runCatching {
+        userAnalyticsEventTracker.trackEvent(
+            UserAnalyticsEvent.SDK_CLOSED, setOf(
+                UserAnalyticsEventProperty.Screen(screenName),
+                UserAnalyticsEventProperty.Status(UserAnalyticsEventProperty.Status.StatusType.Successful)
+            )
+        )
     }
 }
+// endregion
+
diff --git a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/digitalinvoice/DigitalInvoiceFragmentListener.kt b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/digitalinvoice/DigitalInvoiceFragmentListener.kt
index c533ebb92e..2b3ac4f483 100644
--- a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/digitalinvoice/DigitalInvoiceFragmentListener.kt
+++ b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/digitalinvoice/DigitalInvoiceFragmentListener.kt
@@ -2,7 +2,6 @@ package net.gini.android.bank.sdk.capture.digitalinvoice
 
 import net.gini.android.capture.network.model.GiniCaptureCompoundExtraction
 import net.gini.android.capture.network.model.GiniCaptureSpecificExtraction
-import net.gini.android.bank.sdk.capture.digitalinvoice.onboarding.DigitalInvoiceOnboardingFragment
 
 /**
  * Created by Alpar Szotyori on 05.12.2019.
@@ -25,6 +24,8 @@ interface DigitalInvoiceFragmentListener {
      * @param specificExtractions - extractions like the "amountToPay", "iban", etc.
      * @param compoundExtractions - extractions like the "lineItems"
      */
-    fun onPayInvoice(specificExtractions: Map<String, GiniCaptureSpecificExtraction>,
-                     compoundExtractions: Map<String, GiniCaptureCompoundExtraction>)
+    fun onPayInvoice(
+        specificExtractions: Map<String, GiniCaptureSpecificExtraction>,
+        compoundExtractions: Map<String, GiniCaptureCompoundExtraction>
+    )
 }
\ No newline at end of file
diff --git a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/digitalinvoice/DigitalInvoiceScreenPresenter.kt b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/digitalinvoice/DigitalInvoiceScreenPresenter.kt
index 1405aea718..f10d76c15e 100644
--- a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/digitalinvoice/DigitalInvoiceScreenPresenter.kt
+++ b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/digitalinvoice/DigitalInvoiceScreenPresenter.kt
@@ -14,6 +14,10 @@ import net.gini.android.capture.GiniCapture
 import net.gini.android.capture.network.model.GiniCaptureCompoundExtraction
 import net.gini.android.capture.network.model.GiniCaptureReturnReason
 import net.gini.android.capture.network.model.GiniCaptureSpecificExtraction
+import net.gini.android.capture.tracking.useranalytics.UserAnalytics
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsEvent
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsScreen
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsEventProperty
 import java.math.BigDecimal
 
 /**
@@ -48,6 +52,8 @@ internal class DigitalInvoiceScreenPresenter(
             !oncePerInstallEventStore.containsEvent(OncePerInstallEvent.SHOW_DIGITAL_INVOICE_ONBOARDING)
 
     private val digitalInvoice: DigitalInvoice
+    private val userAnalyticsEventTracker by lazy { UserAnalytics.getAnalyticsEventTracker() }
+    private val screenName: UserAnalyticsScreen = UserAnalyticsScreen.ReturnAssistant
 
     init {
         view.setPresenter(this)
@@ -138,6 +144,8 @@ internal class DigitalInvoiceScreenPresenter(
             simpleBusEventStore.saveEvent(BusEvent.DISMISS_ONBOARDING_FRAGMENT, false)
             onboardingDisplayed = true
             view.showOnboarding()
+        } else {
+            trackScreenShownEvent()
         }
     }
 
@@ -169,4 +177,11 @@ internal class DigitalInvoiceScreenPresenter(
             }
         }
     }
+
+    private fun trackScreenShownEvent() = runCatching {
+        userAnalyticsEventTracker.trackEvent(
+            UserAnalyticsEvent.SCREEN_SHOWN,
+            setOf(UserAnalyticsEventProperty.Screen(screenName))
+        )
+    }
 }
\ No newline at end of file
diff --git a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/digitalinvoice/LineItemsAdapter.kt b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/digitalinvoice/LineItemsAdapter.kt
index ce20b88171..d48c890559 100644
--- a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/digitalinvoice/LineItemsAdapter.kt
+++ b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/digitalinvoice/LineItemsAdapter.kt
@@ -15,6 +15,7 @@ import net.gini.android.bank.sdk.capture.digitalinvoice.ViewType.*
 import net.gini.android.bank.sdk.capture.digitalinvoice.ViewType.LineItem
 import net.gini.android.bank.sdk.databinding.GbsItemDigitalInvoiceAddonBinding
 import net.gini.android.bank.sdk.databinding.GbsItemDigitalInvoiceLineItemBinding
+import net.gini.android.capture.internal.ui.IntervalClickListener
 
 /**
  * Created by Alpar Szotyori on 11.12.2019.
@@ -188,11 +189,11 @@ internal sealed class ViewHolder<in T>(itemView: View, val viewType: ViewType) :
                     )
                 }
             }
-            itemView.setOnClickListener {
+            itemView.setOnClickListener(IntervalClickListener {
                 allData?.getOrNull(dataIndex ?: -1)?.let {
                     listener?.onLineItemClicked(it)
                 }
-            }
+            })
 
             binding.gbsEnableSwitch.setOnCheckedChangeListener { _, isChecked ->
                 allData?.getOrNull(dataIndex ?: -1)?.let {
diff --git a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/digitalinvoice/onboarding/DigitalInvoiceOnboardingFragment.kt b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/digitalinvoice/onboarding/DigitalInvoiceOnboardingFragment.kt
index 910a7e908f..bf89fbbc3e 100644
--- a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/digitalinvoice/onboarding/DigitalInvoiceOnboardingFragment.kt
+++ b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/digitalinvoice/onboarding/DigitalInvoiceOnboardingFragment.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.activity.OnBackPressedCallback
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.NavHostFragment
 import androidx.transition.TransitionInflater
@@ -16,6 +17,10 @@ import net.gini.android.bank.sdk.util.getLayoutInflaterWithGiniCaptureTheme
 import net.gini.android.capture.GiniCapture
 import net.gini.android.capture.internal.ui.IntervalClickListener
 import net.gini.android.capture.onboarding.view.OnboardingIllustrationAdapter
+import net.gini.android.capture.tracking.useranalytics.UserAnalytics
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsEvent
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsScreen
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsEventProperty
 import net.gini.android.capture.view.InjectedViewAdapterHolder
 
 /**
@@ -47,6 +52,10 @@ class DigitalInvoiceOnboardingFragment : Fragment(), DigitalOnboardingScreenCont
 
     private var presenter: DigitalOnboardingScreenContract.Presenter? = null
 
+    private val userAnalyticsEventTracker by lazy { UserAnalytics.getAnalyticsEventTracker() }
+
+    private val screenName = UserAnalyticsScreen.ReturnAssistantOnBoarding
+
     override fun onGetLayoutInflater(savedInstanceState: Bundle?): LayoutInflater {
         val inflater = super.onGetLayoutInflater(savedInstanceState)
         return this.getLayoutInflaterWithGiniCaptureTheme(inflater)
@@ -69,9 +78,9 @@ class DigitalInvoiceOnboardingFragment : Fragment(), DigitalOnboardingScreenCont
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         createPresenter(requireActivity())
-        enterTransition = TransitionInflater.from(requireContext()).inflateTransition(R.transition.fade)
+        enterTransition =
+            TransitionInflater.from(requireContext()).inflateTransition(R.transition.fade)
         exitTransition = enterTransition
-
     }
 
     private fun createPresenter(activity: Activity) =
@@ -126,6 +135,7 @@ class DigitalInvoiceOnboardingFragment : Fragment(), DigitalOnboardingScreenCont
         setInputHandlers()
         setupImageIllustrationAdapter()
         setupOnboardingBottomNavigationBar()
+        trackAnalyticsScreenShownEvent()
     }
 
 
@@ -149,6 +159,7 @@ class DigitalInvoiceOnboardingFragment : Fragment(), DigitalOnboardingScreenCont
                     injectedViewAdapter.setGetStartedButtonClickListener(
                         IntervalClickListener {
                             presenter?.dismisOnboarding(false)
+                            trackAnalyticsGetStartedTappedEvent()
                         }
                     )
                 }
@@ -158,6 +169,45 @@ class DigitalInvoiceOnboardingFragment : Fragment(), DigitalOnboardingScreenCont
     private fun setInputHandlers() {
         binding.doneButton.setOnClickListener {
             presenter?.dismisOnboarding(false)
+            trackAnalyticsGetStartedTappedEvent()
         }
+        handleOnBackPressed()
+    }
+
+    private fun handleOnBackPressed() {
+        requireActivity().onBackPressedDispatcher.addCallback(
+            viewLifecycleOwner,
+            object : OnBackPressedCallback(true) {
+                override fun handleOnBackPressed() {
+                    trackAnalyticsDismissedEvent()
+                    close()
+                    isEnabled = false
+                    remove()
+                }
+            })
+    }
+
+    private fun trackAnalyticsScreenShownEvent() {
+        userAnalyticsEventTracker.trackEvent(
+            UserAnalyticsEvent.SCREEN_SHOWN, setOf(
+                UserAnalyticsEventProperty.Screen(screenName)
+            )
+        )
+    }
+
+    private fun trackAnalyticsGetStartedTappedEvent() {
+        userAnalyticsEventTracker.trackEvent(
+            UserAnalyticsEvent.GET_STARTED_TAPPED, setOf(
+                UserAnalyticsEventProperty.Screen(screenName)
+            )
+        )
+    }
+
+    private fun trackAnalyticsDismissedEvent() {
+        userAnalyticsEventTracker.trackEvent(
+            UserAnalyticsEvent.DISMISSED, setOf(
+                UserAnalyticsEventProperty.Screen(screenName)
+            )
+        )
     }
 }
diff --git a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/SkontoDataExtractor.kt b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/SkontoDataExtractor.kt
new file mode 100644
index 0000000000..c0eb3d0558
--- /dev/null
+++ b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/SkontoDataExtractor.kt
@@ -0,0 +1,129 @@
+package net.gini.android.bank.sdk.capture.skonto
+
+import net.gini.android.bank.sdk.capture.skonto.model.SkontoData
+import net.gini.android.bank.sdk.capture.skonto.model.SkontoData.Amount
+import net.gini.android.bank.sdk.capture.skonto.model.SkontoData.SkontoPaymentMethod
+import net.gini.android.capture.network.model.GiniCaptureCompoundExtraction
+import net.gini.android.capture.network.model.GiniCaptureSpecificExtraction
+import java.math.BigDecimal
+import java.time.LocalDate
+
+
+internal class SkontoDataExtractor {
+
+
+    companion object {
+
+        private var _extractions: MutableMap<String, GiniCaptureSpecificExtraction> = extractions
+        val extractions
+            get() = _extractions
+
+        private var _compoundExtractions: MutableMap<String, GiniCaptureCompoundExtraction> =
+            compoundExtractions
+        val compoundExtractions
+            get() = _compoundExtractions
+
+
+        fun updateGiniExtractions(updatedData: SkontoFragmentContract.State.Ready) {
+            _extractions["amountToPay"]?.value = updatedData.totalAmount.amount.toString()
+
+            val skontoDiscountMaps = compoundExtractions["skontoDiscounts"]?.specificExtractionMaps
+            skontoDiscountMaps?.map { skontoDiscountData ->
+                skontoDiscountData.putDataByKeys(
+                    updatedData.skontoPercentage.toString(),
+                    "skontoPercentageDiscounted",
+                    "skontoPercentageDiscountedCalculated",
+                ) ?: throw NoSuchElementException("Data for `PercentageDiscounted` is missing")
+
+                skontoDiscountData.putDataByKeys(
+                    updatedData.skontoAmount.amount.toString(),
+                    "skontoAmountToPay",
+                    "skontoAmountToPayCalculated"
+                )
+
+                skontoDiscountData.putDataByKeys(
+                    updatedData.paymentInDays.toString(),
+                    "skontoRemainingDays",
+                    "skontoRemainingDaysCalculated"
+                )
+
+                skontoDiscountData.putDataByKeys(
+                    updatedData.discountDueDate.toString(),
+                    "skontoDueDate",
+                    "skontoDueDateCalculated"
+                )
+
+                skontoDiscountData.putDataByKeys(
+                    updatedData.skontoPercentage.toString(),
+                    "skontoAmountDiscounted",
+                    "skontoAmountDiscountedCalculated"
+                )
+            }
+        }
+
+        fun extractSkontoData(
+            extractions: Map<String, GiniCaptureSpecificExtraction>,
+            compoundExtractions: Map<String, GiniCaptureCompoundExtraction>,
+        ): SkontoData {
+
+            _extractions = extractions.toMutableMap()
+            _compoundExtractions = compoundExtractions.toMutableMap()
+
+            val totalAmountToPay = extractions["amountToPay"]
+                ?: throw NoSuchElementException("Field `extractions.amountToPay` is missing")
+
+            val skontoDiscountMaps = compoundExtractions["skontoDiscounts"]?.specificExtractionMaps
+                ?: throw NoSuchElementException("Field `compoundExtractions.skontoDiscounts` is missing")
+
+            return skontoDiscountMaps.map { skontoDiscountData ->
+                val skontoPercentageDiscounted = skontoDiscountData.extractDataByKeys(
+                    "skontoPercentageDiscounted",
+                    "skontoPercentageDiscountedCalculated",
+                ) ?: throw NoSuchElementException("Data for `PercentageDiscounted` is missing")
+
+                val skontoPaymentMethod =
+                    skontoDiscountData.extractDataByKeys("skontoPaymentMethod")
+
+
+                val skontoAmountToPay = skontoDiscountData.extractDataByKeys(
+                    "skontoAmountToPay",
+                    "skontoAmountToPayCalculated"
+                ) ?: throw NoSuchElementException("Skonto data for `AmountToPay` is missing")
+
+                val skontoRemainingDays = skontoDiscountData.extractDataByKeys(
+                    "skontoRemainingDays",
+                    "skontoRemainingDaysCalculated"
+                ) ?: throw NoSuchElementException("Skonto data for `RemainingDays` is missing")
+
+                val skontoDueDate = skontoDiscountData.extractDataByKeys(
+                    "skontoDueDate",
+                    "skontoDueDateCalculated"
+                ) ?: throw NoSuchElementException("Skonto data for `DueDate` is missing")
+
+                val skontoAmountDiscounted = skontoDiscountData.extractDataByKeys(
+                    "skontoAmountDiscounted",
+                    "skontoAmountDiscountedCalculated"
+                )
+
+                SkontoData(
+                    skontoPercentageDiscounted = BigDecimal(skontoPercentageDiscounted.value),
+                    skontoAmountToPay = Amount.parse(skontoAmountToPay.value),
+                    fullAmountToPay = Amount.parse(totalAmountToPay.value),
+                    skontoRemainingDays = skontoRemainingDays.value.toInt(),
+                    skontoDueDate = skontoDueDate.value.let(LocalDate::parse),
+                    skontoPaymentMethod = skontoPaymentMethod?.let { SkontoPaymentMethod.valueOf(it.value) }
+                )
+            }.first()
+        }
+    }
+}
+
+fun Map<String, GiniCaptureSpecificExtraction>.extractDataByKeys(vararg keys: String) =
+    keys.firstNotNullOfOrNull { this[it] }
+
+
+fun MutableMap<String, GiniCaptureSpecificExtraction>.putDataByKeys(
+    value: String,
+    vararg keys: String
+) =
+    keys.firstNotNullOfOrNull { this[it]?.value = value }
diff --git a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/SkontoFragment.kt b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/SkontoFragment.kt
new file mode 100644
index 0000000000..e41ebd9a65
--- /dev/null
+++ b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/SkontoFragment.kt
@@ -0,0 +1,956 @@
+@file:OptIn(ExperimentalMaterial3Api::class)
+
+package net.gini.android.bank.sdk.capture.skonto
+
+import android.content.res.Configuration.UI_MODE_NIGHT_YES
+import android.icu.util.Calendar
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import android.widget.FrameLayout
+import androidx.activity.compose.BackHandler
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.focusable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SelectableDates
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.graphics.vector.rememberVectorPainter
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.pluralStringResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.viewinterop.AndroidView
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.fragment.app.Fragment
+import androidx.navigation.findNavController
+import androidx.navigation.fragment.navArgs
+import net.gini.android.bank.sdk.GiniBank
+import net.gini.android.bank.sdk.R
+import net.gini.android.bank.sdk.capture.skonto.colors.SkontoScreenColors
+import net.gini.android.bank.sdk.capture.skonto.colors.section.SkontoFooterSectionColors
+import net.gini.android.bank.sdk.capture.skonto.colors.section.SkontoInfoDialogColors
+import net.gini.android.bank.sdk.capture.skonto.colors.section.SkontoInvoiceScanSectionColors
+import net.gini.android.bank.sdk.capture.skonto.colors.section.SkontoSectionColors
+import net.gini.android.bank.sdk.capture.skonto.colors.section.WithoutSkontoSectionColors
+import net.gini.android.bank.sdk.capture.skonto.model.SkontoData
+import net.gini.android.bank.sdk.capture.util.currencyFormatterWithoutSymbol
+import net.gini.android.bank.sdk.di.getGiniKoin
+import net.gini.android.bank.sdk.util.disallowScreenshots
+import net.gini.android.capture.GiniCapture
+import net.gini.android.capture.internal.util.ActivityHelper.forcePortraitOrientationOnPhones
+import net.gini.android.capture.internal.util.CancelListener
+import net.gini.android.capture.ui.components.button.filled.GiniButton
+import net.gini.android.capture.ui.components.picker.date.GiniDatePickerDialog
+import net.gini.android.capture.ui.components.switcher.GiniSwitch
+import net.gini.android.capture.ui.components.textinput.GiniTextInput
+import net.gini.android.capture.ui.components.textinput.amount.GiniAmountTextInput
+import net.gini.android.capture.ui.components.topbar.GiniTopBar
+import net.gini.android.capture.ui.components.topbar.GiniTopBarColors
+import net.gini.android.capture.ui.theme.GiniTheme
+import net.gini.android.capture.ui.theme.modifier.tabletMaxWidth
+import net.gini.android.capture.ui.theme.typography.bold
+import net.gini.android.capture.view.InjectedViewAdapterInstance
+import org.koin.core.parameter.parametersOf
+import java.math.BigDecimal
+import java.math.RoundingMode
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+
+class SkontoFragment : Fragment() {
+
+    private val args: SkontoFragmentArgs by navArgs<SkontoFragmentArgs>()
+
+    private val viewModel: SkontoFragmentViewModel by getGiniKoin().inject {
+        parametersOf(args.data)
+    }
+
+    lateinit var cancelListener: CancelListener
+
+    var skontoFragmentListener: SkontoFragmentListener? = null
+        set(value) {
+            field = value
+        }
+
+    private val isBottomNavigationBarEnabled =
+        GiniCapture.getInstance().isBottomNavigationBarEnabled
+
+    private val customBottomNavBarAdapter: InjectedViewAdapterInstance<SkontoNavigationBarBottomAdapter>? =
+        GiniBank.skontoNavigationBarBottomAdapterInstance
+    private var customBottomNavigationBarView: View? = null
+
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if (GiniCapture.hasInstance() && !GiniCapture.getInstance().allowScreenshots) {
+            requireActivity().window.disallowScreenshots()
+        }
+        forcePortraitOrientationOnPhones(activity)
+
+        if (resources.getBoolean(net.gini.android.capture.R.bool.gc_is_tablet)) {
+            requireActivity().window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING)
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+    ): View {
+        customBottomNavigationBarView =
+            container?.let { customBottomNavBarAdapter?.viewAdapter?.onCreateView(it) }
+
+        viewModel.setListener(skontoFragmentListener)
+
+        return ComposeView(requireContext()).apply {
+            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+            setContent {
+                GiniTheme {
+                    ScreenContent(
+                        viewModel = viewModel,
+                        isBottomNavigationBarEnabled = isBottomNavigationBarEnabled,
+                        customBottomNavBarAdapter = customBottomNavBarAdapter,
+                        navigateBack = {
+                            findNavController()
+                                .navigate(SkontoFragmentDirections.toCaptureFragment())
+                        }
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun ScreenContent(
+    navigateBack: () -> Unit,
+    viewModel: SkontoFragmentViewModel,
+    modifier: Modifier = Modifier,
+    screenColorScheme: SkontoScreenColors = SkontoScreenColors.colors(),
+    isBottomNavigationBarEnabled: Boolean,
+    customBottomNavBarAdapter: InjectedViewAdapterInstance<SkontoNavigationBarBottomAdapter>?,
+) {
+
+    BackHandler { navigateBack() }
+
+    val state by viewModel.stateFlow.collectAsState()
+    ScreenStateContent(
+        modifier = modifier,
+        state = state,
+        screenColorScheme = screenColorScheme,
+        onDiscountSectionActiveChange = viewModel::onSkontoActiveChanged,
+        onSkontoAmountChange = viewModel::onSkontoAmountFieldChanged,
+        onDueDateChanged = viewModel::onSkontoDueDateChanged,
+        onFullAmountChange = viewModel::onFullAmountFieldChanged,
+        isBottomNavigationBarEnabled = isBottomNavigationBarEnabled,
+        onBackClicked = navigateBack,
+        customBottomNavBarAdapter = customBottomNavBarAdapter,
+        onProceedClicked = { viewModel.onProceedClicked() },
+        onInfoBannerClicked = viewModel::onInfoBannerClicked,
+        onInfoDialogDismissed = viewModel::onInfoDialogDismissed
+    )
+}
+
+@Composable
+private fun ScreenStateContent(
+    state: SkontoFragmentContract.State,
+    onDiscountSectionActiveChange: (Boolean) -> Unit,
+    onSkontoAmountChange: (BigDecimal) -> Unit,
+    onFullAmountChange: (BigDecimal) -> Unit,
+    onDueDateChanged: (LocalDate) -> Unit,
+    onBackClicked: () -> Unit,
+    onProceedClicked: () -> Unit,
+    isBottomNavigationBarEnabled: Boolean,
+    customBottomNavBarAdapter: InjectedViewAdapterInstance<SkontoNavigationBarBottomAdapter>?,
+    onInfoBannerClicked: () -> Unit,
+    onInfoDialogDismissed: () -> Unit,
+    modifier: Modifier = Modifier,
+    screenColorScheme: SkontoScreenColors = SkontoScreenColors.colors()
+) {
+    when (state) {
+        is SkontoFragmentContract.State.Ready -> ScreenReadyState(
+            modifier = modifier,
+            state = state,
+            screenColorScheme = screenColorScheme,
+            onDiscountSectionActiveChange = onDiscountSectionActiveChange,
+            onDiscountAmountChange = onSkontoAmountChange,
+            onDueDateChanged = onDueDateChanged,
+            onFullAmountChange = onFullAmountChange,
+            onBackClicked = onBackClicked,
+            isBottomNavigationBarEnabled = isBottomNavigationBarEnabled,
+            customBottomNavBarAdapter = customBottomNavBarAdapter,
+            onProceedClicked = onProceedClicked,
+            onInfoBannerClicked = onInfoBannerClicked,
+            onInfoDialogDismissed = onInfoDialogDismissed,
+        )
+    }
+
+}
+
+@Composable
+private fun ScreenReadyState(
+    onBackClicked: () -> Unit,
+    onProceedClicked: () -> Unit,
+    state: SkontoFragmentContract.State.Ready,
+    onDiscountSectionActiveChange: (Boolean) -> Unit,
+    onDiscountAmountChange: (BigDecimal) -> Unit,
+    onDueDateChanged: (LocalDate) -> Unit,
+    onFullAmountChange: (BigDecimal) -> Unit,
+    isBottomNavigationBarEnabled: Boolean,
+    customBottomNavBarAdapter: InjectedViewAdapterInstance<SkontoNavigationBarBottomAdapter>?,
+    modifier: Modifier = Modifier,
+    screenColorScheme: SkontoScreenColors = SkontoScreenColors.colors(),
+    onInfoBannerClicked: () -> Unit,
+    onInfoDialogDismissed: () -> Unit,
+) {
+
+    val scrollState = rememberScrollState()
+    Scaffold(modifier = modifier,
+        containerColor = screenColorScheme.backgroundColor,
+        topBar = {
+            TopAppBar(
+                isBottomNavigationBarEnabled = isBottomNavigationBarEnabled,
+                colors = screenColorScheme.topAppBarColors,
+                onBackClicked = onBackClicked,
+            )
+        },
+        bottomBar = {
+            FooterSection(
+                colors = screenColorScheme.footerSectionColors,
+                discountValue = state.skontoPercentage,
+                totalAmount = state.totalAmount,
+                isBottomNavigationBarEnabled = isBottomNavigationBarEnabled,
+                onBackClicked = onBackClicked,
+                customBottomNavBarAdapter = customBottomNavBarAdapter,
+                onProceedClicked = onProceedClicked,
+                isSkontoSectionActive = state.isSkontoSectionActive,
+                savedAmount = state.savedAmount
+            )
+        }) {
+        Column(
+            modifier = Modifier
+                .padding(it)
+                .verticalScroll(scrollState),
+            horizontalAlignment = Alignment.CenterHorizontally,
+        ) {
+            Column(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalAlignment = Alignment.CenterHorizontally
+            ) {
+                SkontoSection(
+                    modifier = Modifier
+                        .padding(vertical = 16.dp)
+                        .tabletMaxWidth(),
+                    colors = screenColorScheme.skontoSectionColors,
+                    amount = state.skontoAmount,
+                    dueDate = state.discountDueDate,
+                    infoPaymentInDays = state.paymentInDays,
+                    infoDiscountValue = state.skontoPercentage,
+                    onActiveChange = onDiscountSectionActiveChange,
+                    isActive = state.isSkontoSectionActive,
+                    onSkontoAmountChange = onDiscountAmountChange,
+                    onDueDateChanged = onDueDateChanged,
+                    edgeCase = state.skontoEdgeCase,
+                    onInfoBannerClicked = onInfoBannerClicked,
+                )
+                WithoutSkontoSection(
+                    modifier = Modifier.tabletMaxWidth(),
+                    colors = screenColorScheme.withoutSkontoSectionColors,
+                    isActive = !state.isSkontoSectionActive,
+                    amount = state.fullAmount,
+                    onFullAmountChange = onFullAmountChange,
+                )
+            }
+        }
+
+        if (state.edgeCaseInfoDialogVisible) {
+            val text = when (state.skontoEdgeCase) {
+                SkontoFragmentContract.SkontoEdgeCase.PayByCashOnly ->
+                    stringResource(id = R.string.gbs_skonto_section_info_dialog_pay_cash_message)
+
+                SkontoFragmentContract.SkontoEdgeCase.SkontoExpired ->
+                    stringResource(
+                        id = R.string.gbs_skonto_section_info_dialog_date_expired_message,
+                        state.skontoPercentage.toFloat().formatAsDiscountPercentage()
+                    )
+
+                SkontoFragmentContract.SkontoEdgeCase.SkontoLastDay ->
+                    stringResource(
+                        id = R.string.gbs_skonto_section_info_dialog_pay_today_message,
+                    )
+
+                null -> ""
+            }
+            InfoDialog(
+                text = text,
+                colors = screenColorScheme.infoDialogColors,
+                onDismissRequest = onInfoDialogDismissed
+            )
+        }
+    }
+}
+
+@Composable
+private fun TopAppBar(
+    onBackClicked: () -> Unit,
+    modifier: Modifier = Modifier,
+    isBottomNavigationBarEnabled: Boolean,
+    colors: GiniTopBarColors,
+) {
+    GiniTopBar(
+        modifier = modifier,
+        colors = colors,
+        title = stringResource(id = R.string.gbs_skonto_screen_title),
+        navigationIcon = {
+            AnimatedVisibility(visible = !isBottomNavigationBarEnabled) {
+                NavigationActionBack(onClick = onBackClicked)
+            }
+        })
+}
+
+@Composable
+private fun NavigationActionBack(
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    IconButton(
+        modifier = modifier,
+        onClick = onClick
+    ) {
+        Icon(
+            painter = rememberVectorPainter(image = Icons.AutoMirrored.Default.ArrowBack),
+            contentDescription = null,
+        )
+    }
+}
+
+@Composable
+private fun YourInvoiceScanSection(
+    modifier: Modifier = Modifier,
+    colorScheme: SkontoInvoiceScanSectionColors,
+) {
+    Card(
+        modifier = modifier.fillMaxWidth(),
+        shape = RectangleShape,
+        colors = CardDefaults.cardColors(containerColor = colorScheme.cardBackgroundColor)
+    ) {
+        Row(
+            modifier = Modifier.padding(16.dp), verticalAlignment = Alignment.CenterVertically
+        ) {
+            Box(
+                contentAlignment = Alignment.Center,
+                modifier = Modifier
+                    .padding(8.dp)
+                    .background(colorScheme.iconBackgroundColor, shape = RoundedCornerShape(4.dp))
+            ) {
+                Icon(
+                    modifier = Modifier
+                        .size(40.dp)
+                        .padding(8.dp),
+                    painter = painterResource(id = R.drawable.gbs_icon_document),
+                    contentDescription = null,
+                    tint = colorScheme.iconTint,
+                )
+            }
+
+            Column(
+                modifier = Modifier
+                    .padding(horizontal = 16.dp)
+                    .fillMaxWidth()
+                    .weight(0.1f)
+            ) {
+                Text(
+                    text = stringResource(id = R.string.gbs_skonto_section_invoice_preview_title),
+                    style = GiniTheme.typography.subtitle1,
+                    color = colorScheme.titleTextColor
+                )
+                Text(
+                    text = stringResource(id = R.string.gbs_skonto_invoice_section_preview_subtitle),
+                    style = GiniTheme.typography.body2,
+                    color = colorScheme.subtitleTextColor
+                )
+            }
+
+            Icon(
+                painter = rememberVectorPainter(image = Icons.AutoMirrored.Default.KeyboardArrowRight),
+                contentDescription = null,
+                tint = colorScheme.arrowTint.copy(alpha = 0.3f)
+            )
+        }
+
+    }
+}
+
+@Composable
+private fun SkontoSection(
+    colors: SkontoSectionColors,
+    amount: SkontoData.Amount,
+    dueDate: LocalDate,
+    infoPaymentInDays: Int,
+    infoDiscountValue: BigDecimal,
+    onActiveChange: (Boolean) -> Unit,
+    onSkontoAmountChange: (BigDecimal) -> Unit,
+    onDueDateChanged: (LocalDate) -> Unit,
+    onInfoBannerClicked: () -> Unit,
+    edgeCase: SkontoFragmentContract.SkontoEdgeCase?,
+    modifier: Modifier = Modifier,
+    isActive: Boolean,
+) {
+    val dateFormatter = DateTimeFormatter.ofPattern("dd.MM.yyyy")
+
+    var isDatePickerVisible by remember { mutableStateOf(false) }
+    Card(
+        modifier = modifier,
+        shape = RectangleShape,
+        colors = CardDefaults.cardColors(containerColor = colors.cardBackgroundColor)
+    ) {
+        Column(
+            modifier = Modifier.padding(16.dp)
+        ) {
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.Start,
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                Text(
+                    text = stringResource(id = R.string.gbs_skonto_section_discount_title),
+                    style = GiniTheme.typography.subtitle1,
+                    color = colors.titleTextColor,
+                )
+                Box(modifier = modifier.weight(0.1f)) {
+                    androidx.compose.animation.AnimatedVisibility(visible = isActive) {
+                        Text(
+                            text = stringResource(id = R.string.gbs_skonto_section_discount_hint_label_enabled),
+                            style = GiniTheme.typography.subtitle2,
+                            color = colors.enabledHintTextColor,
+                        )
+                    }
+                }
+                GiniSwitch(
+                    checked = isActive,
+                    onCheckedChange = onActiveChange,
+                )
+            }
+
+            val animatedDiscountAmount by animateFloatAsState(
+                targetValue = infoDiscountValue.toFloat(),
+                label = "discountAmount"
+            )
+
+            val remainingDaysText =
+                if (infoPaymentInDays != 0) {
+                    pluralStringResource(
+                        id = R.plurals.days,
+                        count = infoPaymentInDays,
+                        infoPaymentInDays.toString()
+                    )
+                } else {
+                    stringResource(id = R.string.days_zero)
+                }
+
+            val infoBannerText = when (edgeCase) {
+                SkontoFragmentContract.SkontoEdgeCase.PayByCashOnly ->
+                    stringResource(
+                        id = R.string.gbs_skonto_section_discount_info_banner_pay_cash_message,
+                        animatedDiscountAmount.formatAsDiscountPercentage(),
+                        remainingDaysText
+                    )
+
+                SkontoFragmentContract.SkontoEdgeCase.SkontoExpired ->
+                    stringResource(
+                        id = R.string.gbs_skonto_section_discount_info_banner_date_expired_message,
+                        animatedDiscountAmount.formatAsDiscountPercentage()
+                    )
+
+                SkontoFragmentContract.SkontoEdgeCase.SkontoLastDay ->
+                    stringResource(
+                        id = R.string.gbs_skonto_section_discount_info_banner_pay_today_message,
+                        animatedDiscountAmount.formatAsDiscountPercentage()
+                    )
+
+                else -> stringResource(
+                    id = R.string.gbs_skonto_section_discount_info_banner_normal_message,
+                    remainingDaysText,
+                    animatedDiscountAmount.formatAsDiscountPercentage()
+                )
+            }
+
+            InfoBanner(
+                text = infoBannerText,
+                modifier = Modifier.fillMaxWidth(),
+                colors = when (edgeCase) {
+                    SkontoFragmentContract.SkontoEdgeCase.SkontoLastDay,
+                    SkontoFragmentContract.SkontoEdgeCase.PayByCashOnly -> colors.warningInfoBannerColors
+
+                    SkontoFragmentContract.SkontoEdgeCase.SkontoExpired -> colors.errorInfoBannerColors
+                    else -> colors.successInfoBannerColors
+                },
+                onClicked = onInfoBannerClicked,
+                clickable = edgeCase != null,
+            )
+            GiniAmountTextInput(
+                amount = amount.amount,
+                currencyCode = amount.currencyCode,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(top = 16.dp),
+                enabled = isActive,
+                colors = colors.amountFieldColors,
+                onValueChange = { onSkontoAmountChange(it) },
+                label = stringResource(id = R.string.gbs_skonto_section_discount_field_amount_hint),
+                trailingContent = {
+                    AnimatedVisibility(visible = isActive) {
+                        Text(
+                            text = amount.currencyCode,
+                            style = GiniTheme.typography.subtitle1,
+                        )
+                    }
+                },
+            )
+
+            val dueDateOnClickSource = remember { MutableInteractionSource() }
+            val pressed by dueDateOnClickSource.collectIsPressedAsState()
+
+            LaunchedEffect(key1 = pressed) {
+                if (pressed) {
+                    isDatePickerVisible = true
+                }
+            }
+
+            GiniTextInput(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(top = 16.dp)
+                    .focusable(false),
+                enabled = isActive,
+                interactionSource = dueDateOnClickSource,
+                readOnly = true,
+                colors = colors.dueDateTextFieldColor,
+                onValueChange = { /* Ignored */ },
+                text = dueDate.format(dateFormatter),
+                label = stringResource(id = R.string.gbs_skonto_section_discount_field_due_date_hint),
+                trailingContent = {
+                    androidx.compose.animation.AnimatedVisibility(visible = isActive) {
+                        Icon(
+                            painter = painterResource(id = R.drawable.gbs_icon_calendar),
+                            contentDescription = null,
+                        )
+                    }
+                },
+            )
+        }
+    }
+
+    if (isDatePickerVisible) {
+        GiniDatePickerDialog(
+            onDismissRequest = { isDatePickerVisible = false },
+            onSaved = {
+                isDatePickerVisible = false
+                onDueDateChanged(it)
+            },
+            date = dueDate,
+            selectableDates = getSkontoSelectableDates()
+        )
+    }
+}
+
+private fun getSkontoSelectableDates() = object : SelectableDates {
+
+    val minDateCalendar = Calendar.getInstance().apply {
+        set(Calendar.MILLISECONDS_IN_DAY, 0)
+    }
+
+    val maxDateCalendar = Calendar.getInstance().apply {
+        add(Calendar.MONTH, 6)
+    }
+
+    val minTime = minDateCalendar.timeInMillis
+    val maxTime = maxDateCalendar.timeInMillis
+
+    override fun isSelectableDate(utcTimeMillis: Long): Boolean {
+        return (minTime..maxTime).contains(utcTimeMillis)
+    }
+
+    override fun isSelectableYear(year: Int): Boolean {
+        return (minDateCalendar.get(Calendar.YEAR)..maxDateCalendar.get(Calendar.YEAR))
+            .contains(year)
+    }
+}
+
+@Composable
+private fun InfoBanner(
+    colors: SkontoSectionColors.InfoBannerColors,
+    text: String,
+    clickable: Boolean,
+    onClicked: () -> Unit,
+    modifier: Modifier = Modifier,
+    icon: Painter = painterResource(id = R.drawable.gbs_icon_important_info),
+) {
+    Row(
+        modifier = modifier
+            .background(
+                color = colors.backgroundColor, RoundedCornerShape(8.dp)
+            )
+            .clickable(onClick = onClicked, enabled = clickable),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Icon(
+            modifier = Modifier.padding(8.dp),
+            painter = icon,
+            contentDescription = null,
+            tint = colors.iconTint,
+        )
+
+        Text(
+            modifier = Modifier.padding(vertical = 8.dp),
+            text = text,
+            style = GiniTheme.typography.subtitle2,
+            color = colors.textColor,
+        )
+    }
+}
+
+@Composable
+private fun InfoDialog(
+    text: String,
+    colors: SkontoInfoDialogColors,
+    onDismissRequest: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Dialog(
+        properties = DialogProperties(),
+        onDismissRequest = onDismissRequest
+    ) {
+        Card(
+            modifier = modifier.fillMaxWidth(),
+            shape = RoundedCornerShape(28.dp),
+            colors = CardDefaults.cardColors(
+                containerColor = colors.cardBackgroundColor
+            )
+        ) {
+            Text(
+                modifier = Modifier.padding(top = 24.dp, start = 16.dp, end = 16.dp),
+                text = text,
+                style = GiniTheme.typography.caption1
+            )
+            Button(
+                modifier = Modifier
+                    .padding(16.dp)
+                    .align(Alignment.End),
+                onClick = onDismissRequest,
+                shape = RoundedCornerShape(4.dp),
+                colors = ButtonDefaults.textButtonColors(
+                    contentColor = colors.buttonTextColor,
+                ),
+            ) {
+                Text(
+                    modifier = Modifier,
+                    text = stringResource(id = R.string.gbs_skonto_section_info_dialog_ok_button_text),
+                    style = GiniTheme.typography.button
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun WithoutSkontoSection(
+    colors: WithoutSkontoSectionColors,
+    amount: SkontoData.Amount,
+    modifier: Modifier = Modifier,
+    onFullAmountChange: (BigDecimal) -> Unit,
+    isActive: Boolean,
+) {
+    Card(
+        modifier = modifier,
+        shape = RectangleShape,
+        colors = CardDefaults.cardColors(containerColor = colors.cardBackgroundColor)
+    ) {
+        Column(
+            modifier = Modifier.padding(16.dp)
+        ) {
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.Start,
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                Text(
+                    text = stringResource(id = R.string.gbs_skonto_section_without_discount_title),
+                    style = GiniTheme.typography.subtitle1,
+                    color = colors.titleTextColor,
+                )
+                AnimatedVisibility(visible = isActive) {
+                    Text(
+                        text = stringResource(id = R.string.gbs_skonto_section_discount_hint_label_enabled),
+                        modifier = Modifier.weight(0.1f),
+                        style = GiniTheme.typography.subtitle2,
+                        color = colors.enabledHintTextColor,
+                    )
+                }
+            }
+            GiniAmountTextInput(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(top = 16.dp),
+                enabled = isActive,
+                colors = colors.amountFieldColors,
+                amount = amount.amount,
+                currencyCode = amount.currencyCode,
+                onValueChange = onFullAmountChange,
+                label = stringResource(id = R.string.gbs_skonto_section_without_discount_field_amount_hint),
+                trailingContent = {
+                    AnimatedVisibility(visible = isActive) {
+                        Text(
+                            text = amount.currencyCode,
+                            style = GiniTheme.typography.subtitle1,
+                        )
+                    }
+                },
+            )
+        }
+    }
+}
+
+@Composable
+private fun FooterSection(
+    totalAmount: SkontoData.Amount,
+    savedAmount: SkontoData.Amount,
+    discountValue: BigDecimal,
+    colors: SkontoFooterSectionColors,
+    isBottomNavigationBarEnabled: Boolean,
+    isSkontoSectionActive: Boolean,
+    onBackClicked: () -> Unit,
+    onProceedClicked: () -> Unit,
+    modifier: Modifier = Modifier,
+    customBottomNavBarAdapter: InjectedViewAdapterInstance<SkontoNavigationBarBottomAdapter>?,
+) {
+    val animatedTotalAmount by animateFloatAsState(
+        targetValue = totalAmount.amount.toFloat(), label = "totalAmount"
+    )
+    val animatedSavedAmount by animateFloatAsState(
+        targetValue = savedAmount.amount.toFloat(), label = "savedAmount"
+    )
+    val animatedDiscountAmount by animateFloatAsState(
+        targetValue = discountValue.toFloat(), label = "discountAmount"
+    )
+    val totalPriceText =
+        "${
+            currencyFormatterWithoutSymbol().format(animatedTotalAmount).trim()
+        } ${totalAmount.currencyCode}"
+
+    val savedAmountText =
+        stringResource(
+            id = R.string.gbs_skonto_section_footer_label_save,
+            "${
+                currencyFormatterWithoutSymbol().format(animatedSavedAmount).trim()
+            } ${savedAmount.currencyCode}"
+        )
+
+    val discountLabelText = stringResource(
+        id = R.string.gbs_skonto_section_footer_label_discount,
+        animatedDiscountAmount.formatAsDiscountPercentage()
+    )
+
+    if (customBottomNavBarAdapter != null) {
+        val ctx = LocalContext.current
+        AndroidView(factory = {
+            customBottomNavBarAdapter.viewAdapter.onCreateView(FrameLayout(ctx))
+        }, update = {
+            with(customBottomNavBarAdapter.viewAdapter) {
+                setOnProceedClickListener(onProceedClicked)
+                setOnBackClickListener(onBackClicked)
+                onTotalAmountUpdated(totalPriceText)
+                onSkontoPercentageBadgeUpdated(discountLabelText)
+                onSkontoPercentageBadgeVisibilityUpdate(isSkontoSectionActive)
+                onSkontoSavingsAmountUpdated(savedAmountText)
+                onSkontoSavingsAmountVisibilityUpdated(isSkontoSectionActive)
+            }
+        })
+    } else {
+        Card(
+            modifier = modifier.fillMaxWidth(),
+            shape = RectangleShape,
+            colors = CardDefaults.cardColors(containerColor = colors.cardBackgroundColor),
+        ) {
+            Column(
+                modifier = Modifier
+                    .tabletMaxWidth()
+                    .align(Alignment.CenterHorizontally),
+                horizontalAlignment = Alignment.CenterHorizontally
+            ) {
+                Column(
+                    modifier = Modifier
+                        .padding(start = 20.dp, end = 20.dp, top = 20.dp)
+                ) {
+                    Row {
+                        Text(
+                            modifier = Modifier.weight(0.1f),
+                            text = stringResource(id = R.string.gbs_skonto_section_footer_title),
+                            style = GiniTheme.typography.body1,
+                            color = colors.titleTextColor,
+                        )
+                        AnimatedVisibility(
+                            visible = isSkontoSectionActive
+                        ) {
+                            Box(
+                                modifier = Modifier
+                                    .height(IntrinsicSize.Min)
+                                    .padding(horizontal = 4.dp)
+                                    .background(
+                                        colors.discountLabelColorScheme.backgroundColor,
+                                        RoundedCornerShape(4.dp)
+                                    ),
+                            ) {
+                                Text(
+                                    modifier = Modifier.padding(vertical = 4.dp, horizontal = 8.dp),
+                                    text = discountLabelText,
+                                    style = GiniTheme.typography.caption1,
+                                    color = colors.discountLabelColorScheme.textColor,
+                                )
+                            }
+                        }
+                    }
+                    Row(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(top = 4.dp),
+                        horizontalArrangement = Arrangement.Start,
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        Text(
+                            text = totalPriceText,
+                            style = GiniTheme.typography.headline5.bold(),
+                            color = colors.amountTextColor,
+                        )
+                    }
+                    AnimatedVisibility(
+                        visible = isSkontoSectionActive
+                    ) {
+                        Text(
+                            text = savedAmountText,
+                            style = GiniTheme.typography.caption1,
+                            color = colors.savedAmountTextColor,
+                        )
+                    }
+                }
+                val buttonPaddingStart = if (isBottomNavigationBarEnabled) 0.dp else 20.dp
+                val buttonPaddingEnd = if (isBottomNavigationBarEnabled) 48.dp else 24.dp
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.SpaceEvenly
+                ) {
+                    AnimatedVisibility(visible = isBottomNavigationBarEnabled) {
+                        NavigationActionBack(
+                            modifier = Modifier.padding(horizontal = 4.dp),
+                            onClick = onBackClicked
+                        )
+                    }
+                    GiniButton(
+                        modifier = Modifier
+                            .weight(0.1f)
+                            .padding(start = buttonPaddingStart, end = buttonPaddingEnd),
+                        text = stringResource(id = R.string.gbs_skonto_section_footer_continue_button_text),
+                        onClick = onProceedClicked,
+                        giniButtonColors = colors.continueButtonColors
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+@Preview
+private fun ScreenReadyStatePreviewLight() {
+    ScreenReadyStatePreview()
+}
+
+@Composable
+@Preview(uiMode = UI_MODE_NIGHT_YES)
+private fun ScreenReadyStatePreviewDark() {
+    ScreenReadyStatePreview()
+}
+
+@Composable
+private fun ScreenReadyStatePreview() {
+    GiniTheme {
+        var state by remember { mutableStateOf(previewState) }
+
+        ScreenReadyState(
+            state = state,
+            onDiscountSectionActiveChange = {
+                state = state.copy(isSkontoSectionActive = !state.isSkontoSectionActive)
+            },
+            onDiscountAmountChange = {},
+            onDueDateChanged = {},
+            onFullAmountChange = {},
+            onBackClicked = {},
+            isBottomNavigationBarEnabled = true,
+            onProceedClicked = {},
+            customBottomNavBarAdapter = null,
+            onInfoDialogDismissed = {},
+            onInfoBannerClicked = {},
+        )
+    }
+}
+
+private fun Float.formatAsDiscountPercentage(): String {
+    val value = BigDecimal(this.toString()).setScale(2, RoundingMode.HALF_UP)
+    return "${value.toString().trimEnd('0').trimEnd('.')} %"
+}
+
+private val previewState = SkontoFragmentContract.State.Ready(
+    isSkontoSectionActive = true,
+    paymentInDays = 14,
+    skontoPercentage = BigDecimal("3"),
+    skontoAmount = SkontoData.Amount(BigDecimal("97"), "EUR"),
+    discountDueDate = LocalDate.now(),
+    fullAmount = SkontoData.Amount(BigDecimal("100"), "EUR"),
+    totalAmount = SkontoData.Amount(BigDecimal("97"), "EUR"),
+    paymentMethod = SkontoData.SkontoPaymentMethod.PayPal,
+    skontoEdgeCase = SkontoFragmentContract.SkontoEdgeCase.PayByCashOnly,
+    edgeCaseInfoDialogVisible = false,
+    savedAmount = SkontoData.Amount(BigDecimal("3"), "EUR")
+)
\ No newline at end of file
diff --git a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/SkontoFragmentContract.kt b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/SkontoFragmentContract.kt
new file mode 100644
index 0000000000..a11620e306
--- /dev/null
+++ b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/SkontoFragmentContract.kt
@@ -0,0 +1,30 @@
+package net.gini.android.bank.sdk.capture.skonto
+
+import net.gini.android.bank.sdk.capture.skonto.model.SkontoData
+import java.math.BigDecimal
+import java.time.LocalDate
+
+internal object SkontoFragmentContract {
+
+    sealed class State {
+        data class Ready(
+            val isSkontoSectionActive: Boolean,
+            val paymentInDays: Int,
+            val skontoPercentage: BigDecimal,
+            val skontoAmount: SkontoData.Amount,
+            val discountDueDate: LocalDate,
+            val fullAmount: SkontoData.Amount,
+            val totalAmount: SkontoData.Amount,
+            val savedAmount: SkontoData.Amount,
+            val paymentMethod: SkontoData.SkontoPaymentMethod,
+            val skontoEdgeCase: SkontoEdgeCase?,
+            val edgeCaseInfoDialogVisible: Boolean,
+        ) : State()
+    }
+
+    sealed class SkontoEdgeCase {
+        object SkontoLastDay : SkontoEdgeCase()
+        object PayByCashOnly : SkontoEdgeCase()
+        object SkontoExpired : SkontoEdgeCase()
+    }
+}
\ No newline at end of file
diff --git a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/SkontoFragmentListener.kt b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/SkontoFragmentListener.kt
new file mode 100644
index 0000000000..f5384049bc
--- /dev/null
+++ b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/SkontoFragmentListener.kt
@@ -0,0 +1,24 @@
+package net.gini.android.bank.sdk.capture.skonto
+
+import net.gini.android.capture.network.model.GiniCaptureCompoundExtraction
+import net.gini.android.capture.network.model.GiniCaptureSpecificExtraction
+
+/**
+ * Interface used by the [SkontoFragment] to dispatch events to the hosting Activity.
+ */
+interface SkontoFragmentListener {
+
+    /**
+     * Called when the user presses the proceed button.
+     *
+     * The extractions were updated to contain the user's modifications:
+     *  - "amountToPay" was updated to contain the new amount to pay (with or without skonto)
+     *
+     * @param specificExtractions - extractions like the "amountToPay", "iban", etc.
+     * @param compoundExtractions - extractions like the "skontoAmountToPay", "skontoDueDate", etc.
+     */
+    fun onPayInvoiceWithSkonto(
+        specificExtractions: Map<String, GiniCaptureSpecificExtraction>,
+        compoundExtractions: Map<String, GiniCaptureCompoundExtraction>
+    )
+}
\ No newline at end of file
diff --git a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/SkontoFragmentViewModel.kt b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/SkontoFragmentViewModel.kt
new file mode 100644
index 0000000000..606bb2b7b1
--- /dev/null
+++ b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/SkontoFragmentViewModel.kt
@@ -0,0 +1,208 @@
+package net.gini.android.bank.sdk.capture.skonto
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.launch
+import net.gini.android.bank.sdk.capture.skonto.model.SkontoData
+import java.math.BigDecimal
+import java.math.RoundingMode
+import java.time.LocalDate
+import java.time.temporal.ChronoUnit
+import kotlin.math.absoluteValue
+
+internal class SkontoFragmentViewModel(
+    private val data: SkontoData,
+) : ViewModel() {
+
+    val stateFlow: MutableStateFlow<SkontoFragmentContract.State> =
+        MutableStateFlow(createInitalState(data))
+
+    private var listener: SkontoFragmentListener? = null
+
+    fun setListener(listener: SkontoFragmentListener?) {
+        this.listener = listener
+    }
+
+    fun onProceedClicked() {
+        val currentState = stateFlow.value as? SkontoFragmentContract.State.Ready ?: return
+        SkontoDataExtractor.updateGiniExtractions(currentState)
+        listener?.onPayInvoiceWithSkonto(
+            SkontoDataExtractor.extractions,
+            SkontoDataExtractor.compoundExtractions
+        )
+    }
+
+    private fun createInitalState(
+        data: SkontoData,
+    ): SkontoFragmentContract.State.Ready {
+
+
+        val discount = data.skontoPercentageDiscounted
+
+        val paymentMethod = data.skontoPaymentMethod ?: SkontoData.SkontoPaymentMethod.Unspecified
+        val edgeCase = extractSkontoEdgeCase(data.skontoDueDate, paymentMethod)
+
+        val isSkontoSectionActive = edgeCase != SkontoFragmentContract.SkontoEdgeCase.PayByCashOnly
+                && edgeCase != SkontoFragmentContract.SkontoEdgeCase.SkontoExpired
+
+        val totalAmount =
+            if (isSkontoSectionActive) data.skontoAmountToPay else data.fullAmountToPay
+
+        val savedAmountValue =
+            calculateSavedAmount(data.skontoAmountToPay.amount, data.fullAmountToPay.amount)
+        val savedAmount = SkontoData.Amount(savedAmountValue, data.fullAmountToPay.currencyCode)
+
+        return SkontoFragmentContract.State.Ready(
+            isSkontoSectionActive = isSkontoSectionActive,
+            paymentInDays = data.skontoRemainingDays,
+            skontoPercentage = discount,
+            skontoAmount = data.skontoAmountToPay,
+            discountDueDate = data.skontoDueDate,
+            fullAmount = data.fullAmountToPay,
+            totalAmount = totalAmount,
+            paymentMethod = paymentMethod,
+            skontoEdgeCase = edgeCase,
+            edgeCaseInfoDialogVisible = edgeCase != null,
+            savedAmount = savedAmount
+        )
+    }
+
+    fun onSkontoActiveChanged(newValue: Boolean) = viewModelScope.launch {
+        val currentState = stateFlow.value as? SkontoFragmentContract.State.Ready ?: return@launch
+        val totalAmount = if (newValue) currentState.skontoAmount else currentState.fullAmount
+        val discount =
+            calculateDiscount(currentState.skontoAmount.amount, currentState.fullAmount.amount)
+
+        stateFlow.emit(
+            currentState.copy(
+                isSkontoSectionActive = newValue,
+                totalAmount = totalAmount,
+                skontoPercentage = discount
+            )
+        )
+    }
+
+    fun onSkontoAmountFieldChanged(newValue: BigDecimal) = viewModelScope.launch {
+        val currentState = stateFlow.value as? SkontoFragmentContract.State.Ready ?: return@launch
+
+        if (newValue > currentState.fullAmount.amount) {
+            stateFlow.emit(
+                currentState.copy(skontoAmount = currentState.skontoAmount)
+            )
+            return@launch
+        }
+
+        val discount = calculateDiscount(newValue, currentState.fullAmount.amount)
+        val totalAmount = if (currentState.isSkontoSectionActive)
+            newValue
+        else
+            currentState.fullAmount.amount
+
+        val newSkontoAmount = currentState.skontoAmount.copy(amount = newValue)
+        val newTotalAmount = currentState.totalAmount.copy(amount = totalAmount)
+
+        val savedAmountValue =
+            calculateSavedAmount(newSkontoAmount.amount, currentState.fullAmount.amount)
+        val savedAmount = SkontoData.Amount(savedAmountValue, currentState.fullAmount.currencyCode)
+
+        stateFlow.emit(
+            currentState.copy(
+                skontoAmount = newSkontoAmount,
+                skontoPercentage = discount,
+                totalAmount = newTotalAmount,
+                savedAmount = savedAmount,
+            )
+        )
+    }
+
+    fun onSkontoDueDateChanged(newDate: LocalDate) = viewModelScope.launch {
+        val currentState = stateFlow.value as? SkontoFragmentContract.State.Ready ?: return@launch
+        val newPayInDays = ChronoUnit.DAYS.between(newDate, LocalDate.now()).absoluteValue.toInt()
+        stateFlow.emit(
+            currentState.copy(
+                discountDueDate = newDate,
+                paymentInDays = newPayInDays,
+                skontoEdgeCase = extractSkontoEdgeCase(
+                    dueDate = newDate,
+                    paymentMethod = currentState.paymentMethod
+                )
+            )
+        )
+    }
+
+    fun onFullAmountFieldChanged(newValue: BigDecimal) = viewModelScope.launch {
+        val currentState = stateFlow.value as? SkontoFragmentContract.State.Ready ?: return@launch
+        val totalAmount =
+            if (currentState.isSkontoSectionActive) currentState.skontoAmount.amount else newValue
+
+        val discount = currentState.skontoPercentage
+
+        val skontoAmount = newValue.minus(
+            newValue.multiply( // full_amount - (full_amount * (discount / 100))
+                discount.divide(BigDecimal("100"), 2, RoundingMode.HALF_UP)
+            ).setScale(2, RoundingMode.HALF_UP)
+        )
+
+        val savedAmountValue = calculateSavedAmount(skontoAmount, newValue)
+        val savedAmount = SkontoData.Amount(savedAmountValue, currentState.fullAmount.currencyCode)
+
+        stateFlow.emit(
+            currentState.copy(
+                skontoAmount = currentState.skontoAmount.copy(amount = skontoAmount),
+                fullAmount = currentState.fullAmount.copy(amount = newValue),
+                totalAmount = currentState.totalAmount.copy(amount = totalAmount),
+                savedAmount = savedAmount,
+            )
+        )
+    }
+
+    fun onInfoBannerClicked() = viewModelScope.launch {
+        val currentState = stateFlow.value as? SkontoFragmentContract.State.Ready ?: return@launch
+        stateFlow.emit(
+            currentState.copy(
+                edgeCaseInfoDialogVisible = true,
+            )
+        )
+    }
+
+    fun onInfoDialogDismissed() = viewModelScope.launch {
+        val currentState = stateFlow.value as? SkontoFragmentContract.State.Ready ?: return@launch
+        stateFlow.emit(
+            currentState.copy(
+                edgeCaseInfoDialogVisible = false,
+            )
+        )
+    }
+
+    private fun calculateDiscount(skontoAmount: BigDecimal, fullAmount: BigDecimal): BigDecimal {
+        if (fullAmount == BigDecimal.ZERO) return BigDecimal("100")
+        return BigDecimal.ONE
+            .minus(skontoAmount.divide(fullAmount, 4, RoundingMode.HALF_UP))
+            .multiply(BigDecimal("100"))
+            .coerceAtLeast(BigDecimal.ZERO)
+    }
+
+    private fun calculateSavedAmount(skontoAmount: BigDecimal, fullAmount: BigDecimal) =
+        fullAmount.minus(skontoAmount).coerceAtLeast(BigDecimal.ZERO)
+
+    private fun extractSkontoEdgeCase(
+        dueDate: LocalDate,
+        paymentMethod: SkontoData.SkontoPaymentMethod,
+    ): SkontoFragmentContract.SkontoEdgeCase? {
+        val today = LocalDate.now()
+        return when {
+            dueDate.isBefore(today) ->
+                SkontoFragmentContract.SkontoEdgeCase.SkontoExpired
+
+
+            paymentMethod == SkontoData.SkontoPaymentMethod.Cash ->
+                SkontoFragmentContract.SkontoEdgeCase.PayByCashOnly
+
+            dueDate == today ->
+                SkontoFragmentContract.SkontoEdgeCase.SkontoLastDay
+
+            else -> null
+        }
+    }
+}
\ No newline at end of file
diff --git a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/SkontoNavigationBarBottomAdapter.kt b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/SkontoNavigationBarBottomAdapter.kt
new file mode 100644
index 0000000000..d10b27510c
--- /dev/null
+++ b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/SkontoNavigationBarBottomAdapter.kt
@@ -0,0 +1,66 @@
+package net.gini.android.bank.sdk.capture.skonto
+
+import net.gini.android.capture.view.InjectedViewAdapter
+
+interface SkontoNavigationBarBottomAdapter : InjectedViewAdapter {
+
+    /**
+     * Set the click listener for the proceed button.
+     *
+     * @param listener the click listener for the button
+     */
+    fun setOnProceedClickListener(onClick: () -> Unit)
+
+    /**
+     * Set the click listener for the back button.
+     *
+     * @param onClick the click function for the back button
+     */
+    fun setOnBackClickListener(onClick: () -> Unit)
+
+    /**
+     * Set the click listener for the help button.
+     *
+     * @param onClick the click function for the help button
+     */
+    fun setOnHelpClickListener(onClick: () -> Unit)
+
+    /**
+     * Called when the total amount with currency code updated
+     *
+     * @param amount price string with currency symbol.
+     * Example value: `"100.00 EUR"`
+     */
+    fun onTotalAmountUpdated(amount: String)
+
+    /**
+     * Called when Skonto percentage badge text updated.
+     *
+     * @param text formatted text.
+     * Example value: "3% Skonto discount"
+     */
+    fun onSkontoPercentageBadgeUpdated(text: String)
+
+    /**
+     * Called when visibility of Skonto badge should be changed.
+     *
+     * @param isVisible visibility flag
+     */
+    fun onSkontoPercentageBadgeVisibilityUpdate(isVisible: Boolean)
+
+    /**
+     * Called when Skonto savings amount text updated.
+     *
+     * @param text formatted text.
+     * Example value: `"Save 100.00 EUR"`
+     */
+    fun onSkontoSavingsAmountUpdated(text: String)
+
+    /**
+     * Called when Skonto savings amount visibility updated.
+     *
+     * @param isVisible visibility flag
+     */
+    fun onSkontoSavingsAmountVisibilityUpdated(isVisible: Boolean)
+
+}
\ No newline at end of file
diff --git a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/SkontoScreenModule.kt b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/SkontoScreenModule.kt
new file mode 100644
index 0000000000..8ae2621cdb
--- /dev/null
+++ b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/SkontoScreenModule.kt
@@ -0,0 +1,11 @@
+package net.gini.android.bank.sdk.capture.skonto
+
+import net.gini.android.bank.sdk.capture.skonto.model.SkontoData
+import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.dsl.module
+
+val skontoScreenModule = module {
+    viewModel { (data: SkontoData) ->
+        SkontoFragmentViewModel(data)
+    }
+}
\ No newline at end of file
diff --git a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/colors/SkontoScreenColors.kt b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/colors/SkontoScreenColors.kt
new file mode 100644
index 0000000000..b0e44b5def
--- /dev/null
+++ b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/colors/SkontoScreenColors.kt
@@ -0,0 +1,49 @@
+package net.gini.android.bank.sdk.capture.skonto.colors
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.graphics.Color
+import net.gini.android.bank.sdk.capture.skonto.colors.section.SkontoFooterSectionColors
+import net.gini.android.bank.sdk.capture.skonto.colors.section.SkontoInfoDialogColors
+import net.gini.android.bank.sdk.capture.skonto.colors.section.SkontoInvoiceScanSectionColors
+import net.gini.android.bank.sdk.capture.skonto.colors.section.SkontoSectionColors
+import net.gini.android.bank.sdk.capture.skonto.colors.section.WithoutSkontoSectionColors
+import net.gini.android.capture.ui.components.picker.date.GiniDatePickerDialogColors
+import net.gini.android.capture.ui.components.topbar.GiniTopBarColors
+import net.gini.android.capture.ui.theme.GiniTheme
+
+@Immutable
+data class SkontoScreenColors(
+    val backgroundColor: Color,
+    val topAppBarColors: GiniTopBarColors,
+    val invoiceScanSectionColors: SkontoInvoiceScanSectionColors,
+    val skontoSectionColors: SkontoSectionColors,
+    val withoutSkontoSectionColors: WithoutSkontoSectionColors,
+    val footerSectionColors: SkontoFooterSectionColors,
+    val datePickerColor: GiniDatePickerDialogColors,
+    val infoDialogColors: SkontoInfoDialogColors,
+) {
+
+    companion object {
+        @Composable
+        fun colors(
+            backgroundColor: Color = GiniTheme.colorScheme.background.primary,
+            topAppBarColors: GiniTopBarColors = GiniTopBarColors.colors(),
+            skontoInvoiceScanSectionColors: SkontoInvoiceScanSectionColors = SkontoInvoiceScanSectionColors.colors(),
+            discountSectionColors: SkontoSectionColors = SkontoSectionColors.colors(),
+            withoutSkontoSectionColors: WithoutSkontoSectionColors = WithoutSkontoSectionColors.colors(),
+            skontoFooterSectionColors: SkontoFooterSectionColors = SkontoFooterSectionColors.colors(),
+            datePickerColor: GiniDatePickerDialogColors = GiniDatePickerDialogColors.colors(),
+            infoDialogColors: SkontoInfoDialogColors = SkontoInfoDialogColors.colors(),
+        ) = SkontoScreenColors(
+            backgroundColor = backgroundColor,
+            topAppBarColors = topAppBarColors,
+            invoiceScanSectionColors = skontoInvoiceScanSectionColors,
+            skontoSectionColors = discountSectionColors,
+            withoutSkontoSectionColors = withoutSkontoSectionColors,
+            footerSectionColors = skontoFooterSectionColors,
+            datePickerColor = datePickerColor,
+            infoDialogColors = infoDialogColors,
+        )
+    }
+}
diff --git a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/colors/section/SkontoFooterSectionColors.kt b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/colors/section/SkontoFooterSectionColors.kt
new file mode 100644
index 0000000000..12eec0d2f0
--- /dev/null
+++ b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/colors/section/SkontoFooterSectionColors.kt
@@ -0,0 +1,56 @@
+package net.gini.android.bank.sdk.capture.skonto.colors.section
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.graphics.Color
+import net.gini.android.capture.ui.components.button.filled.GiniButtonColors
+import net.gini.android.capture.ui.theme.GiniTheme
+
+@Immutable
+data class SkontoFooterSectionColors(
+    val cardBackgroundColor: Color,
+    val titleTextColor: Color,
+    val amountTextColor: Color,
+    val savedAmountTextColor: Color,
+    val discountLabelColorScheme: DiscountLabelColorScheme,
+    val continueButtonColors: GiniButtonColors,
+) {
+
+    companion object {
+
+        @Composable
+        fun colors(
+            cardBackgroundColor: Color = GiniTheme.colorScheme.card.container,
+            titleTextColor: Color = GiniTheme.colorScheme.text.primary,
+            amountTextColor: Color = GiniTheme.colorScheme.text.primary,
+            savedAmountTextColor: Color = GiniTheme.colorScheme.text.success,
+            discountLabelColorScheme: DiscountLabelColorScheme = DiscountLabelColorScheme.colors(),
+            continueButtonColors: GiniButtonColors = GiniButtonColors.colors(),
+        ) = SkontoFooterSectionColors(
+            cardBackgroundColor = cardBackgroundColor,
+            titleTextColor = titleTextColor,
+            amountTextColor = amountTextColor,
+            discountLabelColorScheme = discountLabelColorScheme,
+            continueButtonColors = continueButtonColors,
+            savedAmountTextColor = savedAmountTextColor,
+        )
+    }
+
+    @Immutable
+    data class DiscountLabelColorScheme(
+        val backgroundColor: Color,
+        val textColor: Color,
+    ) {
+        companion object {
+
+            @Composable
+            fun colors(
+                backgroundColor: Color = GiniTheme.colorScheme.badge.container,
+                textColor: Color = GiniTheme.colorScheme.badge.content,
+            ) = DiscountLabelColorScheme(
+                backgroundColor = backgroundColor,
+                textColor = textColor,
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/colors/section/SkontoInfoDialogColors.kt b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/colors/section/SkontoInfoDialogColors.kt
new file mode 100644
index 0000000000..4b5a0cf6be
--- /dev/null
+++ b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/colors/section/SkontoInfoDialogColors.kt
@@ -0,0 +1,29 @@
+package net.gini.android.bank.sdk.capture.skonto.colors.section
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.graphics.Color
+import net.gini.android.capture.ui.theme.GiniTheme
+
+@Immutable
+data class SkontoInfoDialogColors(
+    val cardBackgroundColor: Color,
+    val textColor: Color,
+    val buttonTextColor: Color,
+) {
+
+    companion object {
+
+        @Composable
+        fun colors(
+            cardBackgroundColor: Color = GiniTheme.colorScheme.dialogs.container,
+            textColor: Color = GiniTheme.colorScheme.dialogs.text,
+            buttonTextColor: Color = GiniTheme.colorScheme.dialogs.labelText,
+        ) = SkontoInfoDialogColors(
+            cardBackgroundColor = cardBackgroundColor,
+            textColor = textColor,
+            buttonTextColor = buttonTextColor,
+        )
+    }
+
+}
\ No newline at end of file
diff --git a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/colors/section/SkontoInvoiceScanSectionColors.kt b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/colors/section/SkontoInvoiceScanSectionColors.kt
new file mode 100644
index 0000000000..5ac48d32fa
--- /dev/null
+++ b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/colors/section/SkontoInvoiceScanSectionColors.kt
@@ -0,0 +1,36 @@
+package net.gini.android.bank.sdk.capture.skonto.colors.section
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.graphics.Color
+import net.gini.android.capture.ui.theme.GiniTheme
+
+@Immutable
+data class SkontoInvoiceScanSectionColors(
+    val cardBackgroundColor: Color,
+    val titleTextColor: Color,
+    val subtitleTextColor: Color,
+    val iconBackgroundColor: Color,
+    val iconTint: Color,
+    val arrowTint: Color,
+) {
+    companion object {
+
+        @Composable
+        fun colors(
+            cardBackgroundColor: Color = GiniTheme.colorScheme.card.container,
+            titleTextColor: Color = GiniTheme.colorScheme.text.primary,
+            subtitleTextColor: Color = GiniTheme.colorScheme.text.secondary,
+            iconBackgroundColor: Color = GiniTheme.colorScheme.placeholder.background,
+            iconTint: Color = GiniTheme.colorScheme.placeholder.tint,
+            arrowTint: Color = GiniTheme.colorScheme.icons.secondary,
+        ) = SkontoInvoiceScanSectionColors(
+            cardBackgroundColor = cardBackgroundColor,
+            titleTextColor = titleTextColor,
+            subtitleTextColor = subtitleTextColor,
+            iconBackgroundColor = iconBackgroundColor,
+            iconTint = iconTint,
+            arrowTint = arrowTint,
+        )
+    }
+}
\ No newline at end of file
diff --git a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/colors/section/SkontoSectionColors.kt b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/colors/section/SkontoSectionColors.kt
new file mode 100644
index 0000000000..9462fae50d
--- /dev/null
+++ b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/colors/section/SkontoSectionColors.kt
@@ -0,0 +1,91 @@
+package net.gini.android.bank.sdk.capture.skonto.colors.section
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.graphics.Color
+import net.gini.android.capture.ui.components.switcher.GiniSwitchColors
+import net.gini.android.capture.ui.components.textinput.GiniTextInputColors
+import net.gini.android.capture.ui.theme.GiniTheme
+
+@Immutable
+data class SkontoSectionColors(
+    val titleTextColor: Color,
+    val switchColors: GiniSwitchColors,
+    val cardBackgroundColor: Color,
+    val enabledHintTextColor: Color,
+    val successInfoBannerColors: InfoBannerColors,
+    val warningInfoBannerColors: InfoBannerColors,
+    val errorInfoBannerColors: InfoBannerColors,
+    val amountFieldColors: GiniTextInputColors,
+    val dueDateTextFieldColor: GiniTextInputColors,
+) {
+
+    companion object {
+
+        @Composable
+        fun colors(
+            titleTextColor: Color = GiniTheme.colorScheme.text.primary,
+            switchColors: GiniSwitchColors = GiniSwitchColors.colors(),
+            cardBackgroundColor: Color = GiniTheme.colorScheme.card.container,
+            enabledHintTextColor: Color = GiniTheme.colorScheme.text.success,
+            successInfoBannerColors: InfoBannerColors = InfoBannerColors.success(),
+            warningInfoBannerColors: InfoBannerColors = InfoBannerColors.warning(),
+            errorInfoBannerColors: InfoBannerColors = InfoBannerColors.error(),
+            amountFieldColors: GiniTextInputColors = GiniTextInputColors.colors(),
+            dueDateTextFieldColor: GiniTextInputColors = GiniTextInputColors.colors(),
+        ) = SkontoSectionColors(
+            titleTextColor = titleTextColor,
+            switchColors = switchColors,
+            cardBackgroundColor = cardBackgroundColor,
+            enabledHintTextColor = enabledHintTextColor,
+            successInfoBannerColors = successInfoBannerColors,
+            warningInfoBannerColors = warningInfoBannerColors,
+            errorInfoBannerColors = errorInfoBannerColors,
+            amountFieldColors = amountFieldColors,
+            dueDateTextFieldColor = dueDateTextFieldColor
+        )
+    }
+
+    @Immutable
+    data class InfoBannerColors(
+        val backgroundColor: Color,
+        val textColor: Color,
+        val iconTint: Color,
+    ) {
+        companion object {
+
+            @Composable
+            fun success(
+                backgroundColor: Color = GiniTheme.colorScheme.card.containerSuccess,
+                textColor: Color = GiniTheme.colorScheme.card.contentSuccess,
+                iconTint: Color = GiniTheme.colorScheme.card.contentSuccess,
+            ) = InfoBannerColors(
+                backgroundColor = backgroundColor,
+                textColor = textColor,
+                iconTint = iconTint,
+            )
+
+            @Composable
+            fun warning(
+                backgroundColor: Color = GiniTheme.colorScheme.card.containerWarning,
+                textColor: Color = GiniTheme.colorScheme.card.contentWarning,
+                iconTint: Color = GiniTheme.colorScheme.card.contentWarning,
+            ) = InfoBannerColors(
+                backgroundColor = backgroundColor,
+                textColor = textColor,
+                iconTint = iconTint,
+            )
+
+            @Composable
+            fun error(
+                backgroundColor: Color = GiniTheme.colorScheme.card.containerError,
+                textColor: Color = GiniTheme.colorScheme.card.contentError,
+                iconTint: Color = GiniTheme.colorScheme.card.contentError,
+            ) = InfoBannerColors(
+                backgroundColor = backgroundColor,
+                textColor = textColor,
+                iconTint = iconTint,
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/colors/section/WithoutSkontoSectionColors.kt b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/colors/section/WithoutSkontoSectionColors.kt
new file mode 100644
index 0000000000..b8204970f1
--- /dev/null
+++ b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/colors/section/WithoutSkontoSectionColors.kt
@@ -0,0 +1,31 @@
+package net.gini.android.bank.sdk.capture.skonto.colors.section
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.graphics.Color
+import net.gini.android.capture.ui.components.textinput.GiniTextInputColors
+import net.gini.android.capture.ui.theme.GiniTheme
+
+@Immutable
+data class WithoutSkontoSectionColors(
+    val titleTextColor: Color,
+    val cardBackgroundColor: Color,
+    val amountFieldColors: GiniTextInputColors,
+    val enabledHintTextColor: Color,
+) {
+    companion object {
+
+        @Composable
+        fun colors(
+            titleTextColor: Color = GiniTheme.colorScheme.text.primary,
+            cardBackgroundColor: Color = GiniTheme.colorScheme.card.container,
+            amountFieldColors: GiniTextInputColors = GiniTextInputColors.colors(),
+            enabledHintTextColor: Color = GiniTheme.colorScheme.text.success,
+        ) = WithoutSkontoSectionColors(
+            titleTextColor = titleTextColor,
+            cardBackgroundColor = cardBackgroundColor,
+            amountFieldColors = amountFieldColors,
+            enabledHintTextColor = enabledHintTextColor,
+        )
+    }
+}
\ No newline at end of file
diff --git a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/model/SkontoData.kt b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/model/SkontoData.kt
new file mode 100644
index 0000000000..79cebf63da
--- /dev/null
+++ b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/model/SkontoData.kt
@@ -0,0 +1,51 @@
+package net.gini.android.bank.sdk.capture.skonto.model
+
+import java.io.Serializable
+import java.math.BigDecimal
+import java.time.LocalDate
+
+data class SkontoData(
+    val skontoPercentageDiscounted: BigDecimal,
+    val skontoPaymentMethod: SkontoPaymentMethod?,
+    val skontoAmountToPay: Amount,
+    val fullAmountToPay: Amount,
+    val skontoRemainingDays: Int,
+    val skontoDueDate: LocalDate,
+) : Serializable {
+
+    enum class SkontoPaymentMethod : Serializable {
+        Unspecified, Cash, PayPal
+    }
+
+    data class Amount(val amount: BigDecimal, val currencyCode: String) : Serializable {
+
+        companion object {
+
+            /**
+             * Creates [Amount] from string in format `value:currency_code` or throws an Exception
+             */
+            @Throws(IllegalArgumentException::class)
+            fun parse(amountStr: String): Amount {
+                val amountParts = amountStr.split(":").also {
+                    if (it.size != 2) {
+                        throw IllegalArgumentException(
+                            "Invalid amount format for value: $amountStr. " +
+                                    "Should be `value:currency_code`"
+                        )
+                    }
+                }
+
+                val amount = runCatching { BigDecimal(amountParts.first()) }.getOrElse {
+                    throw IllegalArgumentException(
+                        "Invalid amount format for value: $amountStr. " +
+                                "Can't convert `${amountParts.first()} to BigDecimal`"
+                    )
+                }
+
+                val currencyCode = amountParts.last()
+
+                return Amount(amount, currencyCode)
+            }
+        }
+    }
+}
diff --git a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/di/IsolatedKoinContext.kt b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/di/IsolatedKoinContext.kt
new file mode 100644
index 0000000000..58c43815b6
--- /dev/null
+++ b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/di/IsolatedKoinContext.kt
@@ -0,0 +1,15 @@
+package net.gini.android.bank.sdk.di
+
+import net.gini.android.bank.sdk.capture.skonto.skontoScreenModule
+import org.koin.dsl.koinApplication
+
+object IsolatedKoinContext {
+
+    private val koinApp = koinApplication {
+        modules(skontoScreenModule)
+    }
+
+    val koin = koinApp.koin
+}
+
+fun getGiniKoin() = IsolatedKoinContext.koin
\ No newline at end of file
diff --git a/bank-sdk/sdk/src/main/res/drawable-hdpi/gbs_digital_invoice_list_image.png b/bank-sdk/sdk/src/main/res/drawable-hdpi/gbs_digital_invoice_list_image.png
deleted file mode 100644
index d49f3d0d3f..0000000000
Binary files a/bank-sdk/sdk/src/main/res/drawable-hdpi/gbs_digital_invoice_list_image.png and /dev/null differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-hdpi/gbs_digital_invoice_list_image.webp b/bank-sdk/sdk/src/main/res/drawable-hdpi/gbs_digital_invoice_list_image.webp
new file mode 100644
index 0000000000..172c9f8148
Binary files /dev/null and b/bank-sdk/sdk/src/main/res/drawable-hdpi/gbs_digital_invoice_list_image.webp differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-hdpi/gbs_menu_question_circle_info.png b/bank-sdk/sdk/src/main/res/drawable-hdpi/gbs_menu_question_circle_info.png
deleted file mode 100644
index 8f5a01cacf..0000000000
Binary files a/bank-sdk/sdk/src/main/res/drawable-hdpi/gbs_menu_question_circle_info.png and /dev/null differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-hdpi/gbs_menu_question_circle_info.webp b/bank-sdk/sdk/src/main/res/drawable-hdpi/gbs_menu_question_circle_info.webp
new file mode 100644
index 0000000000..6da0c21cd4
Binary files /dev/null and b/bank-sdk/sdk/src/main/res/drawable-hdpi/gbs_menu_question_circle_info.webp differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-mdpi/gbs_digital_invoice_list_image.png b/bank-sdk/sdk/src/main/res/drawable-mdpi/gbs_digital_invoice_list_image.png
deleted file mode 100644
index 59e6528eb1..0000000000
Binary files a/bank-sdk/sdk/src/main/res/drawable-mdpi/gbs_digital_invoice_list_image.png and /dev/null differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-mdpi/gbs_digital_invoice_list_image.webp b/bank-sdk/sdk/src/main/res/drawable-mdpi/gbs_digital_invoice_list_image.webp
new file mode 100644
index 0000000000..9189b82770
Binary files /dev/null and b/bank-sdk/sdk/src/main/res/drawable-mdpi/gbs_digital_invoice_list_image.webp differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-mdpi/gbs_menu_question_circle_info.png b/bank-sdk/sdk/src/main/res/drawable-mdpi/gbs_menu_question_circle_info.png
deleted file mode 100644
index 613b68c2d0..0000000000
Binary files a/bank-sdk/sdk/src/main/res/drawable-mdpi/gbs_menu_question_circle_info.png and /dev/null differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-mdpi/gbs_menu_question_circle_info.webp b/bank-sdk/sdk/src/main/res/drawable-mdpi/gbs_menu_question_circle_info.webp
new file mode 100644
index 0000000000..e6aa1b7a47
Binary files /dev/null and b/bank-sdk/sdk/src/main/res/drawable-mdpi/gbs_menu_question_circle_info.webp differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-night-hdpi/gbs_digital_invoice_list_image.png b/bank-sdk/sdk/src/main/res/drawable-night-hdpi/gbs_digital_invoice_list_image.png
deleted file mode 100644
index caafabdf32..0000000000
Binary files a/bank-sdk/sdk/src/main/res/drawable-night-hdpi/gbs_digital_invoice_list_image.png and /dev/null differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-night-hdpi/gbs_digital_invoice_list_image.webp b/bank-sdk/sdk/src/main/res/drawable-night-hdpi/gbs_digital_invoice_list_image.webp
new file mode 100644
index 0000000000..6c757cca96
Binary files /dev/null and b/bank-sdk/sdk/src/main/res/drawable-night-hdpi/gbs_digital_invoice_list_image.webp differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-night-mdpi/gbs_digital_invoice_list_image.png b/bank-sdk/sdk/src/main/res/drawable-night-mdpi/gbs_digital_invoice_list_image.png
deleted file mode 100644
index 20f99dd5a2..0000000000
Binary files a/bank-sdk/sdk/src/main/res/drawable-night-mdpi/gbs_digital_invoice_list_image.png and /dev/null differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-night-mdpi/gbs_digital_invoice_list_image.webp b/bank-sdk/sdk/src/main/res/drawable-night-mdpi/gbs_digital_invoice_list_image.webp
new file mode 100644
index 0000000000..31bc58493e
Binary files /dev/null and b/bank-sdk/sdk/src/main/res/drawable-night-mdpi/gbs_digital_invoice_list_image.webp differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-night-xhdpi/gbs_digital_invoice_list_image.png b/bank-sdk/sdk/src/main/res/drawable-night-xhdpi/gbs_digital_invoice_list_image.png
deleted file mode 100644
index 0d22e39dd7..0000000000
Binary files a/bank-sdk/sdk/src/main/res/drawable-night-xhdpi/gbs_digital_invoice_list_image.png and /dev/null differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-night-xhdpi/gbs_digital_invoice_list_image.webp b/bank-sdk/sdk/src/main/res/drawable-night-xhdpi/gbs_digital_invoice_list_image.webp
new file mode 100644
index 0000000000..5c9ab412cb
Binary files /dev/null and b/bank-sdk/sdk/src/main/res/drawable-night-xhdpi/gbs_digital_invoice_list_image.webp differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-night-xxhdpi/gbs_digital_invoice_list_image.png b/bank-sdk/sdk/src/main/res/drawable-night-xxhdpi/gbs_digital_invoice_list_image.png
deleted file mode 100644
index 62738b1b64..0000000000
Binary files a/bank-sdk/sdk/src/main/res/drawable-night-xxhdpi/gbs_digital_invoice_list_image.png and /dev/null differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-night-xxhdpi/gbs_digital_invoice_list_image.webp b/bank-sdk/sdk/src/main/res/drawable-night-xxhdpi/gbs_digital_invoice_list_image.webp
new file mode 100644
index 0000000000..d6d06b418a
Binary files /dev/null and b/bank-sdk/sdk/src/main/res/drawable-night-xxhdpi/gbs_digital_invoice_list_image.webp differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gbs_digital_invoice_list_image.png b/bank-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gbs_digital_invoice_list_image.png
deleted file mode 100644
index b56140b53e..0000000000
Binary files a/bank-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gbs_digital_invoice_list_image.png and /dev/null differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gbs_digital_invoice_list_image.webp b/bank-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gbs_digital_invoice_list_image.webp
new file mode 100644
index 0000000000..72ff33dda2
Binary files /dev/null and b/bank-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gbs_digital_invoice_list_image.webp differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-xhdpi/gbs_digital_invoice_list_image.png b/bank-sdk/sdk/src/main/res/drawable-xhdpi/gbs_digital_invoice_list_image.png
deleted file mode 100644
index 729780c38a..0000000000
Binary files a/bank-sdk/sdk/src/main/res/drawable-xhdpi/gbs_digital_invoice_list_image.png and /dev/null differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-xhdpi/gbs_digital_invoice_list_image.webp b/bank-sdk/sdk/src/main/res/drawable-xhdpi/gbs_digital_invoice_list_image.webp
new file mode 100644
index 0000000000..2fcf54dd58
Binary files /dev/null and b/bank-sdk/sdk/src/main/res/drawable-xhdpi/gbs_digital_invoice_list_image.webp differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-xhdpi/gbs_menu_question_circle_info.png b/bank-sdk/sdk/src/main/res/drawable-xhdpi/gbs_menu_question_circle_info.png
deleted file mode 100644
index 1bf6a0bd0d..0000000000
Binary files a/bank-sdk/sdk/src/main/res/drawable-xhdpi/gbs_menu_question_circle_info.png and /dev/null differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-xhdpi/gbs_menu_question_circle_info.webp b/bank-sdk/sdk/src/main/res/drawable-xhdpi/gbs_menu_question_circle_info.webp
new file mode 100644
index 0000000000..9043445c13
Binary files /dev/null and b/bank-sdk/sdk/src/main/res/drawable-xhdpi/gbs_menu_question_circle_info.webp differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-xxhdpi/gbs_digital_invoice_list_image.png b/bank-sdk/sdk/src/main/res/drawable-xxhdpi/gbs_digital_invoice_list_image.png
deleted file mode 100644
index afb863b21b..0000000000
Binary files a/bank-sdk/sdk/src/main/res/drawable-xxhdpi/gbs_digital_invoice_list_image.png and /dev/null differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-xxhdpi/gbs_digital_invoice_list_image.webp b/bank-sdk/sdk/src/main/res/drawable-xxhdpi/gbs_digital_invoice_list_image.webp
new file mode 100644
index 0000000000..68f43e2206
Binary files /dev/null and b/bank-sdk/sdk/src/main/res/drawable-xxhdpi/gbs_digital_invoice_list_image.webp differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-xxhdpi/gbs_menu_question_circle_info.png b/bank-sdk/sdk/src/main/res/drawable-xxhdpi/gbs_menu_question_circle_info.png
deleted file mode 100644
index 2697c07e13..0000000000
Binary files a/bank-sdk/sdk/src/main/res/drawable-xxhdpi/gbs_menu_question_circle_info.png and /dev/null differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-xxhdpi/gbs_menu_question_circle_info.webp b/bank-sdk/sdk/src/main/res/drawable-xxhdpi/gbs_menu_question_circle_info.webp
new file mode 100644
index 0000000000..71c05c655e
Binary files /dev/null and b/bank-sdk/sdk/src/main/res/drawable-xxhdpi/gbs_menu_question_circle_info.webp differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-xxxhdpi/gbs_digital_invoice_list_image.png b/bank-sdk/sdk/src/main/res/drawable-xxxhdpi/gbs_digital_invoice_list_image.png
deleted file mode 100644
index 8d2243cf3f..0000000000
Binary files a/bank-sdk/sdk/src/main/res/drawable-xxxhdpi/gbs_digital_invoice_list_image.png and /dev/null differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-xxxhdpi/gbs_digital_invoice_list_image.webp b/bank-sdk/sdk/src/main/res/drawable-xxxhdpi/gbs_digital_invoice_list_image.webp
new file mode 100644
index 0000000000..90da580358
Binary files /dev/null and b/bank-sdk/sdk/src/main/res/drawable-xxxhdpi/gbs_digital_invoice_list_image.webp differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-xxxhdpi/gbs_menu_question_circle_info.png b/bank-sdk/sdk/src/main/res/drawable-xxxhdpi/gbs_menu_question_circle_info.png
deleted file mode 100644
index 33c8a4d107..0000000000
Binary files a/bank-sdk/sdk/src/main/res/drawable-xxxhdpi/gbs_menu_question_circle_info.png and /dev/null differ
diff --git a/bank-sdk/sdk/src/main/res/drawable-xxxhdpi/gbs_menu_question_circle_info.webp b/bank-sdk/sdk/src/main/res/drawable-xxxhdpi/gbs_menu_question_circle_info.webp
new file mode 100644
index 0000000000..be0aa40984
Binary files /dev/null and b/bank-sdk/sdk/src/main/res/drawable-xxxhdpi/gbs_menu_question_circle_info.webp differ
diff --git a/bank-sdk/sdk/src/main/res/drawable/gbs_icon_calendar.xml b/bank-sdk/sdk/src/main/res/drawable/gbs_icon_calendar.xml
new file mode 100644
index 0000000000..060d1a2bd9
--- /dev/null
+++ b/bank-sdk/sdk/src/main/res/drawable/gbs_icon_calendar.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19,4H18V2H16V4H8V2H6V4H5C3.89,4 3,4.9 3,6V20C3,21.1 3.89,22 5,22H19C20.1,22 21,21.1 21,20V6C21,4.9 20.1,4 19,4ZM19,20H5V9H19V20ZM6.5,13C6.5,11.62 7.62,10.5 9,10.5C10.38,10.5 11.5,11.62 11.5,13C11.5,14.38 10.38,15.5 9,15.5C7.62,15.5 6.5,14.38 6.5,13Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/bank-sdk/sdk/src/main/res/drawable/gbs_icon_document.xml b/bank-sdk/sdk/src/main/res/drawable/gbs_icon_document.xml
new file mode 100644
index 0000000000..3d13ba7c1c
--- /dev/null
+++ b/bank-sdk/sdk/src/main/res/drawable/gbs_icon_document.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="22dp"
+    android:viewportWidth="20"
+    android:viewportHeight="22">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M0,4V2C0,1.45 0.196,0.979 0.587,0.587C0.979,0.196 1.45,0 2,0H4C4.283,0 4.521,0.096 4.713,0.287C4.904,0.479 5,0.717 5,1C5,1.283 4.904,1.521 4.713,1.712C4.521,1.904 4.283,2 4,2H2V4C2,4.283 1.904,4.521 1.712,4.713C1.521,4.904 1.283,5 1,5C0.717,5 0.479,4.904 0.287,4.713C0.096,4.521 0,4.283 0,4ZM18,4V2H16C15.717,2 15.479,1.904 15.288,1.712C15.096,1.521 15,1.283 15,1C15,0.717 15.096,0.479 15.288,0.287C15.479,0.096 15.717,0 16,0H18C18.55,0 19.021,0.196 19.413,0.587C19.804,0.979 20,1.45 20,2V4C20,4.283 19.904,4.521 19.712,4.713C19.521,4.904 19.283,5 19,5C18.717,5 18.479,4.904 18.288,4.713C18.096,4.521 18,4.283 18,4ZM0,20V18C0,17.717 0.096,17.479 0.287,17.288C0.479,17.096 0.717,17 1,17C1.283,17 1.521,17.096 1.712,17.288C1.904,17.479 2,17.717 2,18V20H4C4.283,20 4.521,20.096 4.713,20.288C4.904,20.479 5,20.717 5,21C5,21.283 4.904,21.521 4.713,21.712C4.521,21.904 4.283,22 4,22H2C1.45,22 0.979,21.804 0.587,21.413C0.196,21.021 0,20.55 0,20ZM18,22H16C15.717,22 15.479,21.904 15.288,21.712C15.096,21.521 15,21.283 15,21C15,20.717 15.096,20.479 15.288,20.288C15.479,20.096 15.717,20 16,20H18V18C18,17.717 18.096,17.479 18.288,17.288C18.479,17.096 18.717,17 19,17C19.283,17 19.521,17.096 19.712,17.288C19.904,17.479 20,17.717 20,18V20C20,20.55 19.804,21.021 19.413,21.413C19.021,21.804 18.55,22 18,22ZM5,19C4.45,19 3.979,18.804 3.588,18.413C3.196,18.021 3,17.55 3,17V5C3,4.45 3.196,3.979 3.588,3.588C3.979,3.196 4.45,3 5,3H15C15.55,3 16.021,3.196 16.413,3.588C16.804,3.979 17,4.45 17,5V17C17,17.55 16.804,18.021 16.413,18.413C16.021,18.804 15.55,19 15,19H5ZM8,9H12C12.283,9 12.521,8.904 12.712,8.712C12.904,8.521 13,8.283 13,8C13,7.717 12.904,7.479 12.712,7.287C12.521,7.096 12.283,7 12,7H8C7.717,7 7.479,7.096 7.287,7.287C7.096,7.479 7,7.717 7,8C7,8.283 7.096,8.521 7.287,8.712C7.479,8.904 7.717,9 8,9ZM8,12H12C12.283,12 12.521,11.904 12.712,11.712C12.904,11.521 13,11.283 13,11C13,10.717 12.904,10.479 12.712,10.288C12.521,10.096 12.283,10 12,10H8C7.717,10 7.479,10.096 7.287,10.288C7.096,10.479 7,10.717 7,11C7,11.283 7.096,11.521 7.287,11.712C7.479,11.904 7.717,12 8,12ZM8,15H12C12.283,15 12.521,14.904 12.712,14.712C12.904,14.521 13,14.283 13,14C13,13.717 12.904,13.479 12.712,13.288C12.521,13.096 12.283,13 12,13H8C7.717,13 7.479,13.096 7.287,13.288C7.096,13.479 7,13.717 7,14C7,14.283 7.096,14.521 7.287,14.712C7.479,14.904 7.717,15 8,15Z" />
+</vector>
diff --git a/bank-sdk/sdk/src/main/res/drawable/gbs_icon_important_info.xml b/bank-sdk/sdk/src/main/res/drawable/gbs_icon_important_info.xml
new file mode 100644
index 0000000000..e4c8e3f703
--- /dev/null
+++ b/bank-sdk/sdk/src/main/res/drawable/gbs_icon_important_info.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="18"
+    android:viewportHeight="18">
+  <path
+      android:pathData="M9,12.75C9.212,12.75 9.391,12.678 9.534,12.534C9.678,12.391 9.75,12.212 9.75,12C9.75,11.788 9.678,11.609 9.534,11.466C9.391,11.322 9.212,11.25 9,11.25C8.788,11.25 8.609,11.322 8.466,11.466C8.322,11.609 8.25,11.788 8.25,12C8.25,12.212 8.322,12.391 8.466,12.534C8.609,12.678 8.788,12.75 9,12.75ZM9,9.75C9.212,9.75 9.391,9.678 9.534,9.534C9.678,9.391 9.75,9.212 9.75,9V6C9.75,5.787 9.678,5.609 9.534,5.466C9.391,5.322 9.212,5.25 9,5.25C8.788,5.25 8.609,5.322 8.466,5.466C8.322,5.609 8.25,5.787 8.25,6V9C8.25,9.212 8.322,9.391 8.466,9.534C8.609,9.678 8.788,9.75 9,9.75ZM9,16.5C7.963,16.5 6.988,16.303 6.075,15.909C5.162,15.516 4.369,14.981 3.694,14.306C3.019,13.631 2.484,12.837 2.091,11.925C1.697,11.012 1.5,10.038 1.5,9C1.5,7.963 1.697,6.988 2.091,6.075C2.484,5.162 3.019,4.369 3.694,3.694C4.369,3.019 5.162,2.484 6.075,2.091C6.988,1.697 7.963,1.5 9,1.5C10.038,1.5 11.012,1.697 11.925,2.091C12.837,2.484 13.631,3.019 14.306,3.694C14.981,4.369 15.516,5.162 15.909,6.075C16.303,6.988 16.5,7.963 16.5,9C16.5,10.038 16.303,11.012 15.909,11.925C15.516,12.837 14.981,13.631 14.306,14.306C13.631,14.981 12.837,15.516 11.925,15.909C11.012,16.303 10.038,16.5 9,16.5ZM9,15C10.675,15 12.094,14.419 13.256,13.256C14.419,12.094 15,10.675 15,9C15,7.325 14.419,5.906 13.256,4.744C12.094,3.581 10.675,3 9,3C7.325,3 5.906,3.581 4.744,4.744C3.581,5.906 3,7.325 3,9C3,10.675 3.581,12.094 4.744,13.256C5.906,14.419 7.325,15 9,15Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/bank-sdk/sdk/src/main/res/navigation/gbs_nav_graph.xml b/bank-sdk/sdk/src/main/res/navigation/gbs_nav_graph.xml
index 11b046dc29..070dfa13aa 100644
--- a/bank-sdk/sdk/src/main/res/navigation/gbs_nav_graph.xml
+++ b/bank-sdk/sdk/src/main/res/navigation/gbs_nav_graph.xml
@@ -5,6 +5,7 @@
     android:id="@+id/capture_flow_nav_graph"
     app:startDestination="@id/gbs_destination_capture_fragment">
 
+
     <fragment
         android:id="@+id/gbs_destination_capture_fragment"
         android:name="net.gini.android.capture.GiniCaptureFragment"
@@ -13,12 +14,12 @@
         <action
             android:id="@+id/to_digital_invoice_fragment"
             app:destination="@id/gbs_destination_digital_invoice_fragment"
-            app:popUpTo="@id/gbs_destination_capture_fragment"
-            app:popUpToInclusive="true"
             app:enterAnim="@anim/gc_nav_enter_anim"
             app:exitAnim="@anim/gc_nav_exit_anim"
             app:popEnterAnim="@anim/gc_nav_pop_enter_anim"
-            app:popExitAnim="@anim/gc_nav_pop_exit_anim">
+            app:popExitAnim="@anim/gc_nav_pop_exit_anim"
+            app:popUpTo="@id/gbs_destination_capture_fragment"
+            app:popUpToInclusive="true">
             <argument
                 android:name="GBS_ARGS_EXTRACTIONS"
                 app:argType="android.os.Bundle" />
@@ -32,6 +33,16 @@
                 android:name="GBS_ARGS_INACCURATE_EXTRACTION"
                 app:argType="boolean" />
         </action>
+
+        <action
+            android:id="@+id/to_skonto_fragment"
+            app:destination="@id/gbs_destination_skonto_fragment"
+            app:enterAnim="@anim/gc_nav_enter_anim"
+            app:exitAnim="@anim/gc_nav_exit_anim"
+            app:popEnterAnim="@anim/gc_nav_pop_enter_anim"
+            app:popExitAnim="@anim/gc_nav_pop_exit_anim"
+            app:popUpTo="@id/gbs_destination_capture_fragment"
+            app:popUpToInclusive="false" />
     </fragment>
 
     <fragment
@@ -45,14 +56,14 @@
             app:enterAnim="@anim/gc_nav_enter_anim"
             app:exitAnim="@anim/gc_nav_exit_anim"
             app:popEnterAnim="@anim/gc_nav_pop_enter_anim"
-            app:popExitAnim="@anim/gc_nav_pop_exit_anim"/>
+            app:popExitAnim="@anim/gc_nav_pop_exit_anim" />
         <action
             android:id="@+id/to_digital_invoice_help_fragment"
             app:destination="@id/gbs_destination_digital_invoice_help_fragment"
             app:enterAnim="@anim/gc_nav_enter_anim"
             app:exitAnim="@anim/gc_nav_exit_anim"
             app:popEnterAnim="@anim/gc_nav_pop_enter_anim"
-            app:popExitAnim="@anim/gc_nav_pop_exit_anim"/>
+            app:popExitAnim="@anim/gc_nav_pop_exit_anim" />
         <action
             android:id="@+id/to_digital_invoice_edit_item_bottom_sheet_dialog"
             app:destination="@id/gbs_destination_digital_invoice_edit_item_bottom_sheet_dialog"
@@ -76,12 +87,31 @@
         android:id="@+id/gbs_destination_digital_invoice_help_fragment"
         android:name="net.gini.android.bank.sdk.capture.digitalinvoice.help.DigitalInvoiceHelpFragment"
         android:label="gbs_fragment_digital_invoice_help"
-        tools:layout="@layout/gbs_fragment_digital_invoice_help"/>
+        tools:layout="@layout/gbs_fragment_digital_invoice_help" />
 
     <dialog
         android:id="@+id/gbs_destination_digital_invoice_edit_item_bottom_sheet_dialog"
         android:name="net.gini.android.bank.sdk.capture.digitalinvoice.DigitalInvoiceBottomSheet"
         android:label="gbs_fragment_digital_invoice"
-        tools:layout="@layout/gbs_edit_item_bottom_sheet"/>
+        tools:layout="@layout/gbs_edit_item_bottom_sheet" />
+
+    <fragment
+        android:id="@+id/gbs_destination_skonto_fragment"
+        android:name="net.gini.android.bank.sdk.capture.skonto.SkontoFragment"
+        android:label="SkontoFragment">
+
+        <argument
+            android:name="data"
+            app:argType="net.gini.android.bank.sdk.capture.skonto.model.SkontoData" />
+        <action
+            android:id="@+id/to_capture_fragment"
+            app:destination="@id/gbs_destination_capture_fragment"
+            app:enterAnim="@anim/gc_nav_enter_anim"
+            app:exitAnim="@anim/gc_nav_exit_anim"
+            app:popEnterAnim="@anim/gc_nav_pop_enter_anim"
+            app:popExitAnim="@anim/gc_nav_pop_exit_anim"
+            app:popUpTo="@id/gbs_destination_capture_fragment"
+            app:popUpToInclusive="true" />
+    </fragment>
 
 </navigation>
\ No newline at end of file
diff --git a/bank-sdk/sdk/src/main/res/values-en/plurals.xml b/bank-sdk/sdk/src/main/res/values-en/plurals.xml
new file mode 100644
index 0000000000..ae2240bf63
--- /dev/null
+++ b/bank-sdk/sdk/src/main/res/values-en/plurals.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="days_zero">today</string>
+    <plurals name="days">
+        <item quantity="zero">@string/days_zero</item>
+        <item quantity="one">%1$s day</item>
+        <item quantity="other">%1$s days</item>
+    </plurals>
+</resources>
diff --git a/bank-sdk/sdk/src/main/res/values-en/strings.xml b/bank-sdk/sdk/src/main/res/values-en/strings.xml
index 2179b3a6ea..b6e1d8d0ff 100644
--- a/bank-sdk/sdk/src/main/res/values-en/strings.xml
+++ b/bank-sdk/sdk/src/main/res/values-en/strings.xml
@@ -40,4 +40,38 @@
     <string name="gbs_help_online_shops_title">Which online shops are supported?</string>
     <string name="gbs_help_online_shops_text">We are currently focused on the most popular online merchants in the market. More retailers will be added in the future.</string>
     <string name="gbs_articles">Articles</string>
+    <!-- region Skonto -->
+    <string name="gbs_skonto_screen_title">Discount</string>
+    <!--   region Section Invoice Scan -->
+    <string name="gbs_skonto_section_invoice_preview_title">Invoice</string>
+    <string name="gbs_skonto_invoice_section_preview_subtitle">Tap to view</string>
+    <!--   endregion  -->
+    <!--   region Section Discount -->
+    <string name="gbs_skonto_section_discount_title">With discount</string>
+    <string name="gbs_skonto_section_discount_hint_label_enabled">  •  Active</string>
+    <string name="gbs_skonto_section_discount_info_banner_normal_message">Pay in %1$s: %2$s discount</string>
+    <string name="gbs_skonto_section_discount_info_banner_pay_today_message">Pay today: %1$s discount</string>
+    <string name="gbs_skonto_section_discount_info_banner_pay_cash_message">A %1$s discount is possible for cash payment within %2$s</string>
+    <string name="gbs_skonto_section_discount_info_banner_date_expired_message">The %1$s discount has expired</string>
+    <string name="gbs_skonto_section_discount_field_amount_hint">Final amount</string>
+    <string name="gbs_skonto_section_discount_field_due_date_hint">Expiry date</string>
+    <!--   endregion -->
+    <!--   region Section Without Discount -->
+    <string name="gbs_skonto_section_without_discount_title">Without discount</string>
+    <string name="gbs_skonto_section_without_discount_hint_label_enabled">  •  Active</string>
+    <string name="gbs_skonto_section_without_discount_field_amount_hint">Full amount</string>
+    <!--   endregion -->
+    <!--   region Footer -->
+    <string name="gbs_skonto_section_footer_title">Total</string>
+    <string name="gbs_skonto_section_footer_label_discount">%1$s discount</string>
+    <string name="gbs_skonto_section_footer_label_save">Save %1$s</string>
+    <string name="gbs_skonto_section_footer_continue_button_text">Proceed</string>
+    <!--   endregion -->
+    <!--   region InfoDialog -->
+    <string name="gbs_skonto_section_info_dialog_pay_today_message">A discount is indicated on this invoice, it will expire after today.</string>
+    <string name="gbs_skonto_section_info_dialog_pay_cash_message">A discount is indicated on this invoice, but it can only be used for cash deposit through a bank terminal.</string>
+    <string name="gbs_skonto_section_info_dialog_date_expired_message">You could have paid this invoice with a %1$s cash discount, but the discount period has already expired.</string>
+    <string name="gbs_skonto_section_info_dialog_ok_button_text">Got it</string>
+    <!--   endregion -->
+    <!-- endregion -->
 </resources>
diff --git a/bank-sdk/sdk/src/main/res/values/plurals.xml b/bank-sdk/sdk/src/main/res/values/plurals.xml
new file mode 100644
index 0000000000..a78ce34a99
--- /dev/null
+++ b/bank-sdk/sdk/src/main/res/values/plurals.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="days_zero">heute</string>
+    <plurals name="days">
+        <item quantity="zero">@string/days_zero</item>
+        <item quantity="one">%1$s Tag</item>
+        <item quantity="other">%1$s Tagen</item>
+    </plurals>
+</resources>
diff --git a/bank-sdk/sdk/src/main/res/values/strings.xml b/bank-sdk/sdk/src/main/res/values/strings.xml
index c4eb1e2cd4..afe0cec8e3 100644
--- a/bank-sdk/sdk/src/main/res/values/strings.xml
+++ b/bank-sdk/sdk/src/main/res/values/strings.xml
@@ -40,4 +40,38 @@
     <string name="gbs_help_online_shops_title">Welche Onlineshops werden unterstützt?</string>
     <string name="gbs_help_online_shops_text">Wir konzentrieren uns derzeit auf die beliebtesten Online-Händler auf dem Markt. Weitere Einzelhändler werden in Zukunft hinzukommen.</string>
     <string name="gbs_articles">Artikel</string>
+    <!-- region Skonto -->
+    <string name="gbs_skonto_screen_title">Skonto</string>
+    <!--   region Section Invoice Scan -->
+    <string name="gbs_skonto_section_invoice_preview_title">Rechnung</string>
+    <string name="gbs_skonto_invoice_section_preview_subtitle">Tippen Sie hier zur Ansicht</string>
+    <!--   endregion  -->
+    <!--   region Section Discount -->
+    <string name="gbs_skonto_section_discount_title">Mit Skonto</string>
+    <string name="gbs_skonto_section_discount_hint_label_enabled">  •  Aktiviert</string>
+    <string name="gbs_skonto_section_discount_info_banner_normal_message">Zahlung in %1$s: %2$s Skonto</string>
+    <string name="gbs_skonto_section_discount_info_banner_pay_today_message">Zahlung heute: %1$s Skonto</string>
+    <string name="gbs_skonto_section_discount_info_banner_pay_cash_message">%1$s Skonto sind bei Barzahlung innerhalb von %2$s möglich</string>
+    <string name="gbs_skonto_section_discount_info_banner_date_expired_message">Die %1$s Skonto sind abgelaufen</string>
+    <string name="gbs_skonto_section_discount_field_amount_hint">Betrag nach Abzug</string>
+    <string name="gbs_skonto_section_discount_field_due_date_hint">Ablaufdatum Skonto</string>
+    <!--   endregion -->
+    <!--   region Section Without Discount -->
+    <string name="gbs_skonto_section_without_discount_title">Ohne Skonto</string>
+    <string name="gbs_skonto_section_without_discount_hint_label_enabled">  •  Aktiviert</string>
+    <string name="gbs_skonto_section_without_discount_field_amount_hint">Betrag ohne Abzug</string>
+    <!--   endregion -->
+    <!--   region Footer -->
+    <string name="gbs_skonto_section_footer_title">Gesamtpreis</string>
+    <string name="gbs_skonto_section_footer_label_discount">%1$s Skonto</string>
+    <string name="gbs_skonto_section_footer_label_save">%1$s sparen</string>
+    <string name="gbs_skonto_section_footer_continue_button_text">Zahlung fortsetzen</string>
+    <!--   endregion -->
+    <!--   region InfoDialog -->
+    <string name="gbs_skonto_section_info_dialog_pay_today_message">In dieser Rechnung ist ein Skonto enthalten – die Frist läuft heute ab.</string>
+    <string name="gbs_skonto_section_info_dialog_pay_cash_message">Von dieser Rechnung können Sie einen Skontobetrag abziehen, wenn Sie die Rechnung an einem Bankterminal mit Bareinzahlung bezahlen.</string>
+    <string name="gbs_skonto_section_info_dialog_date_expired_message">Diese Rechnung hätten Sie mit %1$s Skonto bezahlen können, die Skontofrist ist jedoch bereits abgelaufen.</string>
+    <string name="gbs_skonto_section_info_dialog_ok_button_text">Verstanden</string>
+    <!--   endregion -->
+    <!-- endregion -->
 </resources>
diff --git a/bank-sdk/sdk/src/test/java/net/gini/android/bank/sdk/util/ResolvePaymentInputExtensionsTest.kt b/bank-sdk/sdk/src/test/java/net/gini/android/bank/sdk/util/ResolvePaymentTextFieldExtensionsTest.kt
similarity index 97%
rename from bank-sdk/sdk/src/test/java/net/gini/android/bank/sdk/util/ResolvePaymentInputExtensionsTest.kt
rename to bank-sdk/sdk/src/test/java/net/gini/android/bank/sdk/util/ResolvePaymentTextFieldExtensionsTest.kt
index 53f6b283dd..171cb05866 100644
--- a/bank-sdk/sdk/src/test/java/net/gini/android/bank/sdk/util/ResolvePaymentInputExtensionsTest.kt
+++ b/bank-sdk/sdk/src/test/java/net/gini/android/bank/sdk/util/ResolvePaymentTextFieldExtensionsTest.kt
@@ -11,7 +11,7 @@ import org.junit.Test
  * Copyright (c) 2022 Gini GmbH.
  */
 
-class ResolvePaymentInputExtensionsTest {
+class ResolvePaymentTextFieldExtensionsTest {
 
     @Test
     fun `parses amount according to amount entity spec`() {
diff --git a/buildSrc/src/main/kotlin/net/gini/gradle/CodeAnalysisPlugin.kt b/buildSrc/src/main/kotlin/net/gini/gradle/CodeAnalysisPlugin.kt
index 63ec7ede41..19e631388e 100644
--- a/buildSrc/src/main/kotlin/net/gini/gradle/CodeAnalysisPlugin.kt
+++ b/buildSrc/src/main/kotlin/net/gini/gradle/CodeAnalysisPlugin.kt
@@ -22,7 +22,7 @@ import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
  *
  * Copyright (c) 2021 Gini GmbH.
  */
-class CodeAnalysisPlugin: Plugin<Project> {
+class CodeAnalysisPlugin : Plugin<Project> {
 
     override fun apply(target: Project) {
         configureCheckstyle(target)
@@ -87,8 +87,21 @@ class CodeAnalysisPlugin: Plugin<Project> {
     private fun configureDetekt(target: Project) {
         target.plugins.apply("io.gitlab.arturbosch.detekt")
 
+        val disabledModules = listOf(
+            ":core-api-library:library",
+            ":core-api-library:shared-tests",
+            ":health-api-library:library",
+            ":bank-api-library:library",
+            ":health-sdk:sdk",
+            ":health-sdk:example-app",
+            //":capture-sdk:sdk",                   <-- Detekt enabled here
+            ":capture-sdk:default-network",
+            //":bank-sdk:sdk",                      <-- Detekt enabled here
+            //":bank-sdk:example-app",              <-- Detekt enabled here
+        )
+
         target.extensions.getByType<DetektExtension>().apply {
-            isIgnoreFailures = true
+            isIgnoreFailures = disabledModules.contains(target.path)
             source = target.files("src/main/java")
         }
     }
diff --git a/capture-sdk/default-network/build.gradle.kts b/capture-sdk/default-network/build.gradle.kts
index 1cf57ee0e7..98b43ac86c 100644
--- a/capture-sdk/default-network/build.gradle.kts
+++ b/capture-sdk/default-network/build.gradle.kts
@@ -25,7 +25,8 @@ android {
     }
     defaultConfig {
         minSdk = libs.versions.android.minSdk.get().toInt()
-        targetSdk = libs.versions.android.targetSdk.get().toInt()
+        testOptions.targetSdk = libs.versions.android.targetSdk.get().toInt()
+        lint.targetSdk = libs.versions.android.targetSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
@@ -119,7 +120,7 @@ tasks.register<CreatePropertiesTask>("injectTestProperties") {
 
     doFirst {
         propertiesMap.clear()
-        propertiesMap.putAll(readLocalPropertiesToMap(project,
+        propertiesMap.putAll(readLocalPropertiesToMapSilent(project,
             listOf("testClientId", "testClientSecret", "testApiUri", "testUserCenterUri")))
     }
 
diff --git a/capture-sdk/default-network/gradle.properties b/capture-sdk/default-network/gradle.properties
index 7c47d13da2..26a140c728 100644
--- a/capture-sdk/default-network/gradle.properties
+++ b/capture-sdk/default-network/gradle.properties
@@ -1,7 +1,7 @@
 # Maven coordinates
 # groupId is in the root gradle.properties
 artifactId=gini-capture-sdk-default-network
-version=3.10.3
+version=3.11.0
 # Version code is visible only in the generated BuildConfig file
 versionCode=0
 
diff --git a/capture-sdk/default-network/src/main/java/net/gini/android/capture/network/GiniCaptureDefaultNetworkService.kt b/capture-sdk/default-network/src/main/java/net/gini/android/capture/network/GiniCaptureDefaultNetworkService.kt
index fb43667cc4..b0493c9e6b 100644
--- a/capture-sdk/default-network/src/main/java/net/gini/android/capture/network/GiniCaptureDefaultNetworkService.kt
+++ b/capture-sdk/default-network/src/main/java/net/gini/android/capture/network/GiniCaptureDefaultNetworkService.kt
@@ -9,9 +9,12 @@ import kotlinx.coroutines.cancelChildren
 import kotlinx.coroutines.launch
 import net.gini.android.bank.api.GiniBankAPI
 import net.gini.android.bank.api.GiniBankAPIBuilder
+import net.gini.android.bank.api.models.*
 import net.gini.android.capture.Document
 import net.gini.android.capture.GiniCapture
 import net.gini.android.capture.document.GiniCaptureMultiPageDocument
+import net.gini.android.capture.internal.network.AmplitudeRoot
+import net.gini.android.capture.internal.network.Configuration
 import net.gini.android.capture.logging.ErrorLog
 import net.gini.android.capture.network.GiniCaptureDefaultNetworkService.Companion.builder
 import net.gini.android.capture.network.logging.formattedErrorMessage
@@ -25,9 +28,11 @@ import net.gini.android.core.api.authorization.SessionManager
 import okhttp3.Cache
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
+import java.util.UUID
 import java.util.concurrent.TimeUnit
 import javax.net.ssl.TrustManager
 import kotlin.coroutines.CoroutineContext
+import net.gini.android.bank.api.models.Configuration as BankConfiguration
 
 /**
  * Created by Alpár Szotyori on 30.09.22.
@@ -59,7 +64,8 @@ class GiniCaptureDefaultNetworkService(
 ) : GiniCaptureNetworkService {
 
     private val coroutineScope = CoroutineScope(coroutineContext)
-    private val giniApiDocuments: MutableMap<String, net.gini.android.core.api.models.Document> = mutableMapOf()
+    private val giniApiDocuments: MutableMap<String, net.gini.android.core.api.models.Document> =
+        mutableMapOf()
 
     /**
      * Contains the document which was created when the user uploaded an image or a pdf for
@@ -76,6 +82,111 @@ class GiniCaptureDefaultNetworkService(
     var analyzedGiniApiDocument: net.gini.android.core.api.models.Document? = null
         private set
 
+
+    override fun sendEvents(
+        amplitudeRoot: AmplitudeRoot,
+        callback: GiniCaptureNetworkCallback<Void, Error>
+    ): CancellationToken? =
+        launchCancellable {
+            when (val configurationResource =
+                giniBankApi.documentManager.sendEvents(
+                    mapAmplitudeRootModelToAmplitudeRoot(
+                        amplitudeRoot
+                    )
+                )) {
+                is Resource.Success -> {
+                    LOG.debug(
+                        "Send events success"
+                    )
+                    callback.success(null)
+                }
+
+                is Resource.Error -> {
+                    LOG.debug(
+                        "Send events failed"
+                    )
+                    val error = Error(configurationResource.formattedErrorMessage)
+                    LOG.error(
+                        "Send events failed for {}",
+                        error.message
+                    )
+                    callback.failure(error)
+                }
+
+                is Resource.Cancelled -> {
+                    LOG.debug("Send events cancelled")
+                    callback.cancelled()
+                }
+            }
+        }
+
+    private fun mapAmplitudeRootModelToAmplitudeRoot(amplitudeRoot: AmplitudeRoot) =
+        AmplitudeRoot(
+            apiKey = amplitudeRoot.apiKey,
+            events = amplitudeRoot.events.map { event ->
+                AmplitudeEvent(
+                    userId = event.userId,
+                    deviceId = event.deviceId,
+                    eventType = event.eventType,
+                    sessionId = event.sessionId,
+                    eventId = event.eventId,
+                    time = event.time,
+                    platform = event.platform,
+                    osVersion = event.osVersion,
+                    deviceManufacturer = event.deviceManufacturer,
+                    deviceBrand = event.deviceBrand,
+                    deviceModel = event.deviceModel,
+                    versionName = event.versionName,
+                    osName = event.osName,
+                    carrier = event.carrier,
+                    language = event.language,
+                    eventProperties = event.eventProperties,
+                    userProperties = event.userProperties,
+                )
+            }
+        )
+
+
+    override fun getConfiguration(callback: GiniCaptureNetworkCallback<Configuration, Error>): CancellationToken? =
+        launchCancellable {
+            when (val configurationResource = giniBankApi.documentManager.getConfigurations()) {
+                is Resource.Success -> {
+                    LOG.debug(
+                        "Get configuration success"
+                    )
+                    callback.success(mapBankConfigurationToConfiguration(configurationResource.data))
+                }
+
+                is Resource.Error -> {
+                    LOG.debug(
+                        "Get configuration error for {}: {}"
+                    )
+                    val error = Error(configurationResource.formattedErrorMessage)
+                    LOG.error(
+                        "Document deletion failed for api id {}",
+                        error.message
+                    )
+                    callback.failure(error)
+                }
+
+                is Resource.Cancelled -> {
+                    LOG.debug("Get configuration cancelled for")
+                    callback.cancelled()
+                }
+            }
+        }
+
+    private fun mapBankConfigurationToConfiguration(configuration: BankConfiguration) =
+        Configuration(
+            UUID.randomUUID(),
+            configuration.clientID,
+            configuration.isUserJourneyAnalyticsEnabled,
+            configuration.isSkontoEnabled,
+            configuration.isReturnAssistantEnabled,
+            configuration.mixpanelToken ?: "",
+            configuration.amplitudeApiKey ?: "",
+        )
+
     override fun upload(
         document: Document,
         callback: GiniCaptureNetworkCallback<Result, Error>
@@ -119,16 +230,20 @@ class GiniCaptureDefaultNetworkService(
                 giniApiDocuments[apiDocument.id] = apiDocument
                 callback.success(Result(apiDocument.id))
             }
+
             is Resource.Error -> {
 
-                val error = Error(partialDocumentResource.responseStatusCode,
-                    partialDocumentResource.responseHeaders, partialDocumentResource.exception)
+                val error = Error(
+                    partialDocumentResource.responseStatusCode,
+                    partialDocumentResource.responseHeaders, partialDocumentResource.exception
+                )
                 LOG.error(
                     "Document upload failed for {}: {}", document.id,
                     error.message
                 )
                 callback.failure(error)
             }
+
             is Resource.Cancelled -> {
                 LOG.debug(
                     "Document upload cancelled for {}",
@@ -151,12 +266,14 @@ class GiniCaptureDefaultNetworkService(
         callback: GiniCaptureNetworkCallback<Result, Error>
     ): CancellationToken = launchCancellable {
         LOG.debug("Delete document with api id {}", giniApiDocumentId)
-        val deleteResource = giniBankApi.documentManager.deletePartialDocumentAndParents(giniApiDocumentId)
+        val deleteResource =
+            giniBankApi.documentManager.deletePartialDocumentAndParents(giniApiDocumentId)
         when (deleteResource) {
             is Resource.Success -> {
                 LOG.debug("Document deletion success for api id {}", giniApiDocumentId)
                 callback.success(Result(giniApiDocumentId))
             }
+
             is Resource.Error -> {
                 val error = Error(deleteResource.formattedErrorMessage)
                 LOG.error(
@@ -165,6 +282,7 @@ class GiniCaptureDefaultNetworkService(
                 )
                 callback.failure(error)
             }
+
             is Resource.Cancelled -> {
                 LOG.debug("Document deletion cancelled for api id {}", giniApiDocumentId)
                 callback.cancelled()
@@ -199,9 +317,10 @@ class GiniCaptureDefaultNetworkService(
                 .mapSuccess { compositeDocumentResource ->
                     val compositeDocument = compositeDocumentResource.data
                     giniApiDocuments[compositeDocument.id] = compositeDocument
-                    giniBankApi.documentManager.getAllExtractionsWithPolling(compositeDocument).mapSuccess {
-                        Resource.Success(compositeDocument to it.data)
-                    }
+                    giniBankApi.documentManager.getAllExtractionsWithPolling(compositeDocument)
+                        .mapSuccess {
+                            Resource.Success(compositeDocument to it.data)
+                        }
                 }
         when (compositeDocumentAndExtractionsResource) {
             is Resource.Cancelled -> {
@@ -210,6 +329,7 @@ class GiniCaptureDefaultNetworkService(
                     giniApiDocumentIdRotationMap
                 )
             }
+
             is Resource.Error -> {
                 val error = Error(compositeDocumentAndExtractionsResource.formattedErrorMessage)
                 LOG.error(
@@ -218,22 +338,33 @@ class GiniCaptureDefaultNetworkService(
                 )
                 callback.failure(error)
             }
+
             is Resource.Success -> {
                 val compositeDocument = compositeDocumentAndExtractionsResource.data.first
                 val allExtractions = compositeDocumentAndExtractionsResource.data.second
 
                 analyzedGiniApiDocument = compositeDocument
 
-                val extractions = SpecificExtractionMapper.mapToGiniCapture(allExtractions.specificExtractions)
-                val compoundExtractions = CompoundExtractionsMapper.mapToGiniCapture(allExtractions.compoundExtractions)
-                val returnReasons = ReturnReasonsMapper.mapToGiniCapture(allExtractions.returnReasons)
+                val extractions =
+                    SpecificExtractionMapper.mapToGiniCapture(allExtractions.specificExtractions)
+                val compoundExtractions =
+                    CompoundExtractionsMapper.mapToGiniCapture(allExtractions.compoundExtractions)
+                val returnReasons =
+                    ReturnReasonsMapper.mapToGiniCapture(allExtractions.returnReasons)
 
                 LOG.debug(
                     "Document analysis success for documents {}: extractions = {}; compoundExtractions = {}; returnReasons = {}",
                     giniApiDocumentIdRotationMap, extractions, compoundExtractions, returnReasons
                 )
 
-                callback.success(AnalysisResult(compositeDocument.id, extractions, compoundExtractions, returnReasons))
+                callback.success(
+                    AnalysisResult(
+                        compositeDocument.id,
+                        extractions,
+                        compoundExtractions,
+                        returnReasons
+                    )
+                )
             }
         }
     }
@@ -249,7 +380,10 @@ class GiniCaptureDefaultNetworkService(
             // We require the Gini Bank API lib's net.gini.android.core.api.models.Document for sending the feedback
             if (document != null) {
                 val feedbackResource = if (compoundExtractions.isEmpty()) {
-                    documentManager.sendFeedbackForExtractions(document, SpecificExtractionMapper.mapToApiSdk(extractions))
+                    documentManager.sendFeedbackForExtractions(
+                        document,
+                        SpecificExtractionMapper.mapToApiSdk(extractions)
+                    )
                 } else {
                     documentManager.sendFeedbackForExtractions(
                         document,
@@ -265,9 +399,14 @@ class GiniCaptureDefaultNetworkService(
                         )
                         callback.success(null)
                     }
+
                     is Resource.Error -> {
                         val error = Error(feedbackResource.formattedErrorMessage)
-                        LOG.error("Send feedback failed for api document {}: {}", document.id, error.message)
+                        LOG.error(
+                            "Send feedback failed for api document {}: {}",
+                            document.id,
+                            error.message
+                        )
                         handleErrorLog(
                             ErrorLog(
                                 description = "Failed to send feedback for document ${document.id}",
@@ -276,8 +415,9 @@ class GiniCaptureDefaultNetworkService(
                         )
                         callback.failure(error)
                     }
+
                     is Resource.Cancelled -> {
-                       LOG.debug(
+                        LOG.debug(
                             "Send feedback cancelled for api document {}",
                             document.id
                         )
@@ -432,10 +572,10 @@ class GiniCaptureDefaultNetworkService(
         }
 
         /**
-         * Set the cache implementation to use with Volley. If no cache is set, the default Volley
-         * cache will be used.
+         * Set the cache implementation to use with OkHttp caching. If no cache is set, no caching
+         * will be used.
          *
-         * @param cache a cache instance (specified by the com.android.volley.Cache interface)
+         * @param cache a cache instance (specified by the [okhttp3.Cache])
          *
          * @return the [Builder] instance
          */
@@ -547,7 +687,8 @@ class GiniCaptureDefaultNetworkService(
     }
 
     companion object {
-        private val LOG: Logger = LoggerFactory.getLogger(GiniCaptureDefaultNetworkService::class.java)
+        private val LOG: Logger =
+            LoggerFactory.getLogger(GiniCaptureDefaultNetworkService::class.java)
 
         /**
          * Creates a new [GiniCaptureDefaultNetworkService.Builder] to configure and create a new
diff --git a/capture-sdk/sdk/build.gradle.kts b/capture-sdk/sdk/build.gradle.kts
index e05a32e130..b7e5be420e 100644
--- a/capture-sdk/sdk/build.gradle.kts
+++ b/capture-sdk/sdk/build.gradle.kts
@@ -21,10 +21,12 @@ android {
     // after upgrading to AGP 8, we need this to have the defaultConfig block
     buildFeatures {
         buildConfig = true
+        compose = true
     }
     defaultConfig {
         minSdk = libs.versions.android.minSdk.get().toInt()
-        targetSdk = libs.versions.android.targetSdk.get().toInt()
+        testOptions.targetSdk = libs.versions.android.targetSdk.get().toInt()
+        lint.targetSdk = libs.versions.android.targetSdk.get().toInt()
 
         // Use the test runner with JUnit4 support
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -51,13 +53,23 @@ android {
         viewBinding = true
     }
 
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.4.6"
+    }
+
+
     buildTypes {
+        val credentials = readLocalPropertiesToMapSilent(project, listOf("mixpanelApiKey", "amplitudeApiKey"))
         debug {
             isTestCoverageEnabled = true
+            resValue("string", "mixpanel_api_key", credentials["mixpanelApiKey"] ?: "")
+            resValue("string", "amplitude_api_key", credentials["amplitudeApiKey"] ?: "")
         }
         release {
             isMinifyEnabled = false
             proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+            resValue("string", "mixpanel_api_key", credentials["mixpanelApiKey"] ?: "")
+            resValue("string", "amplitude_api_key", credentials["amplitudeApiKey"] ?: "")
         }
     }
 
@@ -134,6 +146,12 @@ dependencies {
     implementation(libs.navigation.fragment.ktx)
     implementation(libs.navigation.ui.ktx)
 
+    implementation(platform(libs.compose.bom))
+    implementation(libs.compose.material3)
+    implementation(libs.compose.tools.uiToolingPreview)
+    implementation(libs.accompanist.themeAdapter)
+    debugImplementation(libs.compose.tools.uiTooling)
+
     testImplementation(libs.junit)
     testImplementation(libs.truth)
     testImplementation(libs.mockito.core)
@@ -148,6 +166,7 @@ dependencies {
     testImplementation(libs.jUnitParams)
     testImplementation(libs.kotlinx.coroutines.test)
     testImplementation (libs.json.testing)
+    testImplementation(libs.mockk)
 
     debugImplementation(libs.androidx.test.core.ktx)
     debugImplementation(libs.androidx.fragment.testing)
diff --git a/capture-sdk/sdk/detekt-baseline.xml b/capture-sdk/sdk/detekt-baseline.xml
new file mode 100644
index 0000000000..9662696b26
--- /dev/null
+++ b/capture-sdk/sdk/detekt-baseline.xml
@@ -0,0 +1,311 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<SmellBaseline>
+  <ManuallySuppressedIssues/>
+  <CurrentIssues>
+    <ID>CyclomaticComplexMethod:DefaultPages.kt$DefaultPages.Companion$@JvmStatic fun asArrayList(isMultiPageEnabled: Boolean, isQRCodeScanningEnabled: Boolean): ArrayList&lt;OnboardingPage></ID>
+    <ID>CyclomaticComplexMethod:ErrorType.kt$ErrorType.Companion$@JvmStatic fun typeFromError(error: Error): ErrorType</ID>
+    <ID>CyclomaticComplexMethod:TypographyToTextStyleBridge.kt$@Composable fun textStyleFromTextAppearance( @StyleRes id: Int, density: Density = Density(LocalContext.current), setTextColors: Boolean = true ): TextStyle</ID>
+    <ID>CyclomaticComplexMethod:TypographyToTextStyleBridge.kt$internal fun TypedArray.getFontFamilyOrNull(index: Int): FontFamilyWithWeight?</ID>
+    <ID>EmptyCatchBlock:DeviceInfo.kt$DeviceInfo.CachedInfo${ }</ID>
+    <ID>EmptyDefaultConstructor:CameraXController.kt$CameraLifecycle$()</ID>
+    <ID>EmptyElseBlock:IntervalClickListener.kt$IntervalClickListener$if (view == null) return</ID>
+    <ID>EmptyFunctionBlock:CameraXController.kt$CameraXController.&lt;no name provided>${}</ID>
+    <ID>EmptyFunctionBlock:CustomLoadingIndicatorAdapter.kt$DefaultLoadingIndicatorAdapter${}</ID>
+    <ID>EmptyFunctionBlock:OnButtonLoadingIndicatorAdapter.kt$DefaultOnButtonLoadingIndicatorAdapter${}</ID>
+    <ID>EmptyFunctionBlock:OnboardingIllustrationAdapter.kt$ImageOnboardingIllustrationAdapter${}</ID>
+    <ID>EmptyFunctionBlock:PreviewPagesAdapter.kt$PreviewPagesAdapter.&lt;no name provided>${ }</ID>
+    <ID>ForbiddenComment:TypographyToTextStyleBridge.kt$// FIXME: Normally we'd use TextUnit.Unspecified,</ID>
+    <ID>ForbiddenComment:TypographyToTextStyleBridge.kt$// TODO: Compose does not expose a FontFamily for all strings yet</ID>
+    <ID>FunctionNaming:GiniAmountTextInput.kt$@Composable fun GiniAmountTextInput( amount: BigDecimal, currencyCode: String, label: String, modifier: Modifier = Modifier, onValueChange: (BigDecimal) -> Unit, trailingContent: @Composable () -> Unit = {}, enabled: Boolean = true, isError: Boolean = false, decimalFormatter: DecimalFormatter = DecimalFormatter(), colors: GiniTextInputColors = GiniTextInputColors.colors(), )</ID>
+    <ID>FunctionNaming:GiniAmountTextInput.kt$@Composable private fun GiniTextInputPreview()</ID>
+    <ID>FunctionNaming:GiniAmountTextInput.kt$@Preview( showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES ) @Composable private fun GiniTextInputPreviewDark()</ID>
+    <ID>FunctionNaming:GiniAmountTextInput.kt$@Preview(showBackground = true) @Composable private fun GiniTextInputPreviewLight()</ID>
+    <ID>FunctionNaming:GiniButton.kt$@Composable fun GiniButton( onClick: () -> Unit, modifier: Modifier = Modifier, giniButtonColors: GiniButtonColors = GiniButtonColors.colors(), content: @Composable () -> Unit, )</ID>
+    <ID>FunctionNaming:GiniButton.kt$@Composable fun GiniButton( text: String, onClick: () -> Unit, modifier: Modifier = Modifier, giniButtonColors: GiniButtonColors = GiniButtonColors(), )</ID>
+    <ID>FunctionNaming:GiniButton.kt$@Preview @Composable private fun GiniContentButtonPreview()</ID>
+    <ID>FunctionNaming:GiniButton.kt$@Preview @Composable private fun GiniTextButtonPreview()</ID>
+    <ID>FunctionNaming:GiniDatePickerDialog.kt$@Composable fun GiniDatePickerDialog( onDismissRequest: () -> Unit, onSaved: (LocalDate) -> Unit, modifier: Modifier = Modifier, date: LocalDate = LocalDate.now(), selectableDates: SelectableDates = DatePickerDefaults.AllDates, colors: GiniDatePickerDialogColors = GiniDatePickerDialogColors.colors() )</ID>
+    <ID>FunctionNaming:GiniDatePickerDialog.kt$@Composable private fun DatePickerDialogPreview()</ID>
+    <ID>FunctionNaming:GiniDatePickerDialog.kt$@Preview @Composable private fun DatePickerDialogPreviewLight()</ID>
+    <ID>FunctionNaming:GiniDatePickerDialog.kt$@Preview(uiMode = UI_MODE_NIGHT_YES) @Composable private fun DatePickerDialogPreviewDark()</ID>
+    <ID>FunctionNaming:GiniSwitch.kt$@Composable fun GiniSwitch( modifier: Modifier = Modifier, checked: Boolean, onCheckedChange: (Boolean) -> Unit, giniSwitchColors: GiniSwitchColors = GiniSwitchColors.colors(), )</ID>
+    <ID>FunctionNaming:GiniSwitch.kt$@Preview(showBackground = true) @Composable private fun GiniSwitchPreview()</ID>
+    <ID>FunctionNaming:GiniTextInput.kt$@Composable fun GiniTextInput( text: String, label: @Composable () -> Unit, onValueChange: (String) -> Unit, modifier: Modifier = Modifier, trailingContent: @Composable () -> Unit = {}, enabled: Boolean = true, isError: Boolean = false, readOnly: Boolean = false, keyboardOptions: KeyboardOptions = KeyboardOptions.Default, colors: GiniTextInputColors = GiniTextInputColors.colors(), visualTransformation: VisualTransformation = VisualTransformation.None, interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, )</ID>
+    <ID>FunctionNaming:GiniTextInput.kt$@Composable fun GiniTextInput( text: String, label: String, modifier: Modifier = Modifier, onValueChange: (String) -> Unit, trailingContent: @Composable () -> Unit = {}, enabled: Boolean = true, isError: Boolean = false, readOnly: Boolean = false, keyboardOptions: KeyboardOptions = KeyboardOptions.Default, colors: GiniTextInputColors = GiniTextInputColors.colors(), visualTransformation: VisualTransformation = VisualTransformation.None, interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, )</ID>
+    <ID>FunctionNaming:GiniTextInput.kt$@Composable private fun GiniTextInputPreview()</ID>
+    <ID>FunctionNaming:GiniTextInput.kt$@Preview( showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES ) @Composable private fun GiniTextInputPreviewDark()</ID>
+    <ID>FunctionNaming:GiniTextInput.kt$@Preview(showBackground = true) @Composable private fun GiniTextInputPreviewLight()</ID>
+    <ID>FunctionNaming:GiniTheme.kt$@Composable fun GiniTheme( content: @Composable () -> Unit )</ID>
+    <ID>FunctionNaming:GiniTopBar.kt$@Composable fun GiniTopBar( title: @Composable () -> Unit, navigationIcon: @Composable () -> Unit, actions: @Composable RowScope.() -> Unit, modifier: Modifier = Modifier, colors: GiniTopBarColors = GiniTopBarColors.colors(), )</ID>
+    <ID>FunctionNaming:GiniTopBar.kt$@Composable fun GiniTopBar( title: String, modifier: Modifier = Modifier, navigationIcon: @Composable () -> Unit = {}, actions: @Composable RowScope.() -> Unit = {}, colors: GiniTopBarColors = GiniTopBarColors.colors(), )</ID>
+    <ID>FunctionNaming:GiniTopBar.kt$@Composable private fun GiniTopBarPreview()</ID>
+    <ID>FunctionNaming:GiniTopBar.kt$@Preview @Composable private fun GiniTopBarPreviewLight()</ID>
+    <ID>FunctionNaming:GiniTopBar.kt$@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES) @Composable private fun GiniTopBarPreviewDark()</ID>
+    <ID>LongMethod:CameraXController.kt$CameraXController$override fun open(): CompletableFuture&lt;Void></ID>
+    <ID>LongMethod:GiniColorPalette.kt$internal fun giniDarkColorScheme( giniColorPrimitives: GiniColorPrimitives = GiniColorPrimitives() )</ID>
+    <ID>LongMethod:GiniColorPalette.kt$internal fun giniLightColorScheme( giniColorPrimitives: GiniColorPrimitives = GiniColorPrimitives() )</ID>
+    <ID>LongMethod:GiniDatePickerDialog.kt$@Composable fun GiniDatePickerDialog( onDismissRequest: () -> Unit, onSaved: (LocalDate) -> Unit, modifier: Modifier = Modifier, date: LocalDate = LocalDate.now(), selectableDates: SelectableDates = DatePickerDefaults.AllDates, colors: GiniDatePickerDialogColors = GiniDatePickerDialogColors.colors() )</ID>
+    <ID>LongMethod:TypographyToTextStyleBridge.kt$@Composable fun textStyleFromTextAppearance( @StyleRes id: Int, density: Density = Density(LocalContext.current), setTextColors: Boolean = true ): TextStyle</ID>
+    <ID>LongParameterList:GiniAmountTextInput.kt$( amount: BigDecimal, currencyCode: String, label: String, modifier: Modifier = Modifier, onValueChange: (BigDecimal) -> Unit, trailingContent: @Composable () -> Unit = {}, enabled: Boolean = true, isError: Boolean = false, decimalFormatter: DecimalFormatter = DecimalFormatter(), colors: GiniTextInputColors = GiniTextInputColors.colors(), )</ID>
+    <ID>LongParameterList:GiniDatePickerDialog.kt$( onDismissRequest: () -> Unit, onSaved: (LocalDate) -> Unit, modifier: Modifier = Modifier, date: LocalDate = LocalDate.now(), selectableDates: SelectableDates = DatePickerDefaults.AllDates, colors: GiniDatePickerDialogColors = GiniDatePickerDialogColors.colors() )</ID>
+    <ID>LongParameterList:GiniDatePickerDialogColors.kt$GiniDatePickerDialogColors.Companion$( dateSelected: Color = GiniTheme.colorScheme.datePicker.date.containerFocused, borderDate: Color = GiniTheme.colorScheme.datePicker.date.containerOutlined, textHeadline: Color = GiniTheme.colorScheme.datePicker.text.primary, textSupporting: Color = GiniTheme.colorScheme.datePicker.text.secondary, textButtons: Color = GiniTheme.colorScheme.datePicker.text.accent, textDateToday: Color = GiniTheme.colorScheme.datePicker.text.primary, textDateSelected: Color = GiniTheme.colorScheme.datePicker.date.contentFocused, textDateEnabled: Color = GiniTheme.colorScheme.datePicker.text.primary, textDateDisabled: Color = GiniTheme.colorScheme.datePicker.text.secondary, divider: Color = GiniTheme.colorScheme.datePicker.divider, )</ID>
+    <ID>LongParameterList:GiniTextInput.kt$( text: String, label: @Composable () -> Unit, onValueChange: (String) -> Unit, modifier: Modifier = Modifier, trailingContent: @Composable () -> Unit = {}, enabled: Boolean = true, isError: Boolean = false, readOnly: Boolean = false, keyboardOptions: KeyboardOptions = KeyboardOptions.Default, colors: GiniTextInputColors = GiniTextInputColors.colors(), visualTransformation: VisualTransformation = VisualTransformation.None, interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, )</ID>
+    <ID>LongParameterList:GiniTextInput.kt$( text: String, label: String, modifier: Modifier = Modifier, onValueChange: (String) -> Unit, trailingContent: @Composable () -> Unit = {}, enabled: Boolean = true, isError: Boolean = false, readOnly: Boolean = false, keyboardOptions: KeyboardOptions = KeyboardOptions.Default, colors: GiniTextInputColors = GiniTextInputColors.colors(), visualTransformation: VisualTransformation = VisualTransformation.None, interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, )</ID>
+    <ID>LongParameterList:GiniTextInputColors.kt$GiniTextInputColors.Companion$( containerFocused: Color = GiniTheme.colorScheme.textField.container, containerUnfocused: Color = GiniTheme.colorScheme.textField.container, containerDisabled: Color = GiniTheme.colorScheme.textField.container, textFocused: Color = GiniTheme.colorScheme.textField.text.focused, textUnfocused: Color = GiniTheme.colorScheme.textField.text.unfocused, textDisabled: Color = GiniTheme.colorScheme.textField.text.disabled, textError: Color = GiniTheme.colorScheme.textField.text.focused, indicatorFocused: Color = GiniTheme.colorScheme.textField.indicator.focused, indicatorUnfocused: Color = GiniTheme.colorScheme.textField.indicator.unfocused, indicatorDisabled: Color = GiniTheme.colorScheme.textField.indicator.disabled, indicatorError: Color = GiniTheme.colorScheme.textField.indicator.error, trailingContentFocused: Color = GiniTheme.colorScheme.textField.content.trailing, trailingContentUnfocused: Color = GiniTheme.colorScheme.textField.content.trailing, trailingContentDisabled: Color = GiniTheme.colorScheme.textField.content.trailing, trailingContentError: Color = GiniTheme.colorScheme.textField.content.trailing, labelError: Color = GiniTheme.colorScheme.textField.label.error, labelUnfocused: Color = GiniTheme.colorScheme.textField.label.unfocused, labelFocused: Color = GiniTheme.colorScheme.textField.label.focused, labelDisabled: Color = GiniTheme.colorScheme.textField.label.disabled, )</ID>
+    <ID>LongParameterList:IBANRecognizer.kt$IBANRecognizer$( byteArray: ByteArray, width: Int, height: Int, rotationDegrees: Int, doneCallback: (List&lt;String>) -> Unit, cancelledCallback: () -> Unit )</ID>
+    <ID>LongParameterList:IBANRecognizer.kt$IBANRecognizer$( image: Image, width: Int, height: Int, rotationDegrees: Int, doneCallback: (List&lt;String>) -> Unit, cancelledCallback: () -> Unit )</ID>
+    <ID>LongParameterList:QRCodePopup.kt$QRCodePopup$( private val fragmentImplCallback: FragmentImplCallback, private val popupView: View, private val supportedBackgroundView: View? = null, private val loadingIndicatorContainer: InjectedViewContainer&lt;CustomLoadingIndicatorAdapter>?, private val hideDelayMs: Long, private val supported: Boolean, private var onClicked: ((T?) -> Unit)? = {}, private val onHide: (() -> Unit)? = null )</ID>
+    <ID>LongParameterList:TextRecognizer.kt$TextRecognizer$( byteArray: ByteArray, width: Int, height: Int, rotationDegrees: Int, doneCallback: (RecognizedText?) -> Unit, cancelledCallback: () -> Unit)</ID>
+    <ID>LongParameterList:TextRecognizer.kt$TextRecognizer$(image: Image, width: Int, height: Int, rotationDegrees: Int, doneCallback: (RecognizedText?) -> Unit, cancelledCallback: () -> Unit)</ID>
+    <ID>MagicNumber:AmplitudeUserAnalyticsEventTracker.kt$AmplitudeUserAnalyticsEventTracker$5000</ID>
+    <ID>MagicNumber:CameraXController.kt$CameraXController$2372</ID>
+    <ID>MagicNumber:CameraXController.kt$CameraXController$4216</ID>
+    <ID>MagicNumber:CropToCameraFrameTextRecognizer.kt$CropToCameraFrameTextRecognizer$270</ID>
+    <ID>MagicNumber:CropToCameraFrameTextRecognizer.kt$CropToCameraFrameTextRecognizer$360</ID>
+    <ID>MagicNumber:CropToCameraFrameTextRecognizer.kt$CropToCameraFrameTextRecognizer$90</ID>
+    <ID>MagicNumber:DecimalFormatter.kt$DecimalFormatter$100</ID>
+    <ID>MagicNumber:DecimalFormatter.kt$DecimalFormatter$7</ID>
+    <ID>MagicNumber:DecimalInputVisualTransformation.kt$DecimalInputVisualTransformation.CustomOffsetMapping$3</ID>
+    <ID>MagicNumber:DecimalInputVisualTransformation.kt$DecimalInputVisualTransformation.CustomOffsetMapping$4</ID>
+    <ID>MagicNumber:DecimalInputVisualTransformation.kt$DecimalInputVisualTransformation.CustomOffsetMapping$5</ID>
+    <ID>MagicNumber:DecimalInputVisualTransformation.kt$DecimalInputVisualTransformation.CustomOffsetMapping$6</ID>
+    <ID>MagicNumber:DecimalInputVisualTransformation.kt$DecimalInputVisualTransformation.CustomOffsetMapping$7</ID>
+    <ID>MagicNumber:DecimalInputVisualTransformation.kt$DecimalInputVisualTransformation.CustomOffsetMapping$8</ID>
+    <ID>MagicNumber:DecimalInputVisualTransformation.kt$DecimalInputVisualTransformation.CustomOffsetMapping$9</ID>
+    <ID>MagicNumber:ErrorType.kt$ErrorType.Companion$400</ID>
+    <ID>MagicNumber:ErrorType.kt$ErrorType.Companion$401</ID>
+    <ID>MagicNumber:ErrorType.kt$ErrorType.Companion$402</ID>
+    <ID>MagicNumber:ErrorType.kt$ErrorType.Companion$498</ID>
+    <ID>MagicNumber:ErrorType.kt$ErrorType.Companion$500</ID>
+    <ID>MagicNumber:ErrorType.kt$ErrorType.Companion$503</ID>
+    <ID>MagicNumber:Extensions.kt$100</ID>
+    <ID>MagicNumber:FileImportHelpFragment.kt$FileImportHelpFragment$5</ID>
+    <ID>MagicNumber:FileImportHelpFragment.kt$FileImportHelpFragment$500</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFF000000</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFF048016</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFF09B523</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFF0A84FF</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFF121212</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFF313131</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFF3193FD</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFF32D74B</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFF4A4A4A</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFF626262</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFF62ACFB</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFF7A7A7A</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFF830801</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFF93C4F9</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFFA17503</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFFBFBFBF</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFFC4DDF7</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFFCCCCCC</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFFD0ECD4</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFFD9190E</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFFD9A00E</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFFD9D9D9</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFFDEEEE1</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFFE5E5E5</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFFECD0D0</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFFECE4D0</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFFEEDEDE</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFFEEEADE</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFFF2F2F2</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFFFF453A</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFFFFC73A</ID>
+    <ID>MagicNumber:GiniColorPrimirives.kt$GiniColorPrimitives$0xFFFFFFFF</ID>
+    <ID>MagicNumber:GiniDatePickerDialog.kt$0.95f</ID>
+    <ID>MagicNumber:GiniDatePickerDialog.kt$12</ID>
+    <ID>MagicNumber:GiniSwitch.kt$0.7f</ID>
+    <ID>MagicNumber:IBANKnowledge.kt$IBANKnowledge$15</ID>
+    <ID>MagicNumber:IBANKnowledge.kt$IBANKnowledge$16</ID>
+    <ID>MagicNumber:IBANKnowledge.kt$IBANKnowledge$18</ID>
+    <ID>MagicNumber:IBANKnowledge.kt$IBANKnowledge$19</ID>
+    <ID>MagicNumber:IBANKnowledge.kt$IBANKnowledge$20</ID>
+    <ID>MagicNumber:IBANKnowledge.kt$IBANKnowledge$21</ID>
+    <ID>MagicNumber:IBANKnowledge.kt$IBANKnowledge$22</ID>
+    <ID>MagicNumber:IBANKnowledge.kt$IBANKnowledge$23</ID>
+    <ID>MagicNumber:IBANKnowledge.kt$IBANKnowledge$24</ID>
+    <ID>MagicNumber:IBANKnowledge.kt$IBANKnowledge$25</ID>
+    <ID>MagicNumber:IBANKnowledge.kt$IBANKnowledge$26</ID>
+    <ID>MagicNumber:IBANKnowledge.kt$IBANKnowledge$27</ID>
+    <ID>MagicNumber:IBANKnowledge.kt$IBANKnowledge$28</ID>
+    <ID>MagicNumber:IBANKnowledge.kt$IBANKnowledge$29</ID>
+    <ID>MagicNumber:IBANKnowledge.kt$IBANKnowledge$30</ID>
+    <ID>MagicNumber:IBANKnowledge.kt$IBANKnowledge$31</ID>
+    <ID>MagicNumber:IBANRecognizerFilter.kt$IBANRecognizerFilter$4</ID>
+    <ID>MagicNumber:IBANValidator.kt$IBANValidator$10</ID>
+    <ID>MagicNumber:IBANValidator.kt$IBANValidator$35</ID>
+    <ID>MagicNumber:IBANValidator.kt$IBANValidator$4</ID>
+    <ID>MagicNumber:IBANValidator.kt$IBANValidator$55</ID>
+    <ID>MagicNumber:IntervalClickListenerHelper.kt$IntervalClickListenerHelper$500L</ID>
+    <ID>MagicNumber:QRCodePopup.kt$QRCodePopup$1000</ID>
+    <ID>MagicNumber:TypographyToTextStyleBridge.kt$149</ID>
+    <ID>MagicNumber:TypographyToTextStyleBridge.kt$150</ID>
+    <ID>MagicNumber:TypographyToTextStyleBridge.kt$22</ID>
+    <ID>MagicNumber:TypographyToTextStyleBridge.kt$23</ID>
+    <ID>MagicNumber:TypographyToTextStyleBridge.kt$249</ID>
+    <ID>MagicNumber:TypographyToTextStyleBridge.kt$250</ID>
+    <ID>MagicNumber:TypographyToTextStyleBridge.kt$349</ID>
+    <ID>MagicNumber:TypographyToTextStyleBridge.kt$350</ID>
+    <ID>MagicNumber:TypographyToTextStyleBridge.kt$449</ID>
+    <ID>MagicNumber:TypographyToTextStyleBridge.kt$450</ID>
+    <ID>MagicNumber:TypographyToTextStyleBridge.kt$549</ID>
+    <ID>MagicNumber:TypographyToTextStyleBridge.kt$550</ID>
+    <ID>MagicNumber:TypographyToTextStyleBridge.kt$649</ID>
+    <ID>MagicNumber:TypographyToTextStyleBridge.kt$650</ID>
+    <ID>MagicNumber:TypographyToTextStyleBridge.kt$749</ID>
+    <ID>MagicNumber:TypographyToTextStyleBridge.kt$750</ID>
+    <ID>MagicNumber:TypographyToTextStyleBridge.kt$849</ID>
+    <ID>MagicNumber:TypographyToTextStyleBridge.kt$850</ID>
+    <ID>MagicNumber:TypographyToTextStyleBridge.kt$999</ID>
+    <ID>MagicNumber:Width.kt$600</ID>
+    <ID>MagicNumber:Width.kt$840</ID>
+    <ID>MatchingDeclarationName:GiniColorPalette.kt$GiniColorScheme</ID>
+    <ID>MatchingDeclarationName:GiniColorPrimirives.kt$GiniColorPrimitives</ID>
+    <ID>MaxLineLength:BundleHelper.kt$classLoader: ClassLoader? = null</ID>
+    <ID>MaxLineLength:BundleHelper.kt$fun</ID>
+    <ID>MaxLineLength:CropToCameraFrameTextRecognizer.kt$CropToCameraFrameTextRecognizer$actualTextRecognizer</ID>
+    <ID>MaxLineLength:DefaultPages.kt$DefaultPages.Companion$if</ID>
+    <ID>MaxLineLength:DefaultPages.kt$DefaultPages.Companion$onboardingPage.illustrationAdapter = GiniCapture.getInstance().onboardingAlignCornersIllustrationAdapter</ID>
+    <ID>MaxLineLength:DefaultPages.kt$DefaultPages.Companion$onboardingPage.illustrationAdapter = GiniCapture.getInstance().onboardingLightingIllustrationAdapter</ID>
+    <ID>MaxLineLength:DefaultPages.kt$DefaultPages.Companion$onboardingPage.illustrationAdapter = GiniCapture.getInstance().onboardingMultiPageIllustrationAdapter</ID>
+    <ID>MaxLineLength:ErrorFragmentImpl.kt$ErrorFragmentImpl$view.findViewById&lt;InjectedViewContainer&lt;NavigationBarTopAdapter>>(R.id.gc_injected_navigation_bar_container_top)</ID>
+    <ID>MaxLineLength:FailureException.kt$FailureException.Companion$*</ID>
+    <ID>MaxLineLength:FailureException.kt$FailureException.Companion$throwable is CompletionException &amp;&amp; throwable.cause is FailureException -> throwable.cause as FailureException</ID>
+    <ID>MaxLineLength:FileImportHelpFragment.kt$FileImportHelpFragment$params.setMargins(resources.getDimension(R.dimen.gc_large).toInt(), 0, resources.getDimension(R.dimen.gc_large).toInt(), bottomPadding)</ID>
+    <ID>MaxLineLength:FileImportHelpFragment.kt$FileImportHelpFragment$snackbar</ID>
+    <ID>MaxLineLength:GiniCaptureFragment.kt$GiniCaptureFragment$// To be the first to handle back button pressed events we need to set this fragment as the primary navigation fragment</ID>
+    <ID>MaxLineLength:GiniCaptureFragment.kt$GiniCaptureFragment$UserAnalyticsEventSuperProperty.EntryPoint(UserAnalyticsEventSuperProperty.EntryPoint.EntryPointType.OPEN_WITH)</ID>
+    <ID>MaxLineLength:HelpFragment.kt$HelpFragment$HelpItem.SupportedFormats -> findNavController().navigate(HelpFragmentDirections.toSupportedFormatsHelpFragment())</ID>
+    <ID>MaxLineLength:HelpNavigationBarBottomAdapter.kt$DefaultHelpNavigationBarBottomAdapter$val viewBinding = GcHelpNavigationBarBottomBinding.inflate(LayoutInflater.from(container.context), container, false)</ID>
+    <ID>MaxLineLength:IBANKnowledge.kt$IBANKnowledge$*</ID>
+    <ID>MaxLineLength:IBANRecognizerImpl.kt$IBANRecognizerImpl$*</ID>
+    <ID>MaxLineLength:IBANValidator.kt$IBANValidator.IBANError$EMPTY</ID>
+    <ID>MaxLineLength:InjectedViewAdapter.kt$InjectedViewAdapterInstance$*</ID>
+    <ID>MaxLineLength:InjectedViewContainer.kt$InjectedViewAdapterConfigurator$*</ID>
+    <ID>MaxLineLength:InjectedViewContainer.kt$InjectedViewContainer.&lt;no name provided>$"{}: Injected view adapter for instance {} is in another container and was not destroyed"</ID>
+    <ID>MaxLineLength:IntervalToolbarMenuItemIntervalClickListener.kt$IntervalToolbarMenuItemIntervalClickListener$class</ID>
+    <ID>MaxLineLength:TypographyToTextStyleBridge.kt$fontFeatureSettings = a.getString(R.styleable.ComposeThemeAdapterTextAppearance_android_fontFeatureSettings)</ID>
+    <ID>MaxLineLength:UserAnalytics.kt$UserAnalytics$(eventTracker as? BufferedUserAnalyticsEventTracker)?.setPlatformTokens(*tokens, networkRequestsManager = networkRequestsManager)</ID>
+    <ID>NestedBlockDepth:TypographyToTextStyleBridge.kt$internal fun TypedArray.getFontFamilyOrNull(index: Int): FontFamilyWithWeight?</ID>
+    <ID>NewLineAtEndOfFile:Amount.kt$net.gini.android.capture.Amount.kt</ID>
+    <ID>NewLineAtEndOfFile:AmountCurrency.kt$net.gini.android.capture.AmountCurrency.kt</ID>
+    <ID>NewLineAtEndOfFile:AmplitudeUserAnalyticsEventTracker.kt$net.gini.android.capture.tracking.useranalytics.tracker.AmplitudeUserAnalyticsEventTracker.kt</ID>
+    <ID>NewLineAtEndOfFile:AnalyticsKeyPairProperty.kt$net.gini.android.capture.tracking.useranalytics.properties.AnalyticsKeyPairProperty.kt</ID>
+    <ID>NewLineAtEndOfFile:AutoClearedValue.kt$net.gini.android.capture.internal.util.AutoClearedValue.kt</ID>
+    <ID>NewLineAtEndOfFile:BufferedUserAnalyticsEventTracker.kt$net.gini.android.capture.tracking.useranalytics.BufferedUserAnalyticsEventTracker.kt</ID>
+    <ID>NewLineAtEndOfFile:BundleHelper.kt$net.gini.android.capture.internal.util.BundleHelper.kt</ID>
+    <ID>NewLineAtEndOfFile:CameraHolder.kt$net.gini.android.capture.requirements.CameraHolder.kt</ID>
+    <ID>NewLineAtEndOfFile:CameraParametersHelper.kt$net.gini.android.capture.internal.camera.api.CameraParametersHelper.kt</ID>
+    <ID>NewLineAtEndOfFile:CameraPreviewContainer.kt$net.gini.android.capture.internal.camera.view.CameraPreviewContainer.kt</ID>
+    <ID>NewLineAtEndOfFile:CameraXController.kt$net.gini.android.capture.internal.camera.api.camerax.CameraXController.kt</ID>
+    <ID>NewLineAtEndOfFile:CameraXHolder.kt$net.gini.android.capture.requirements.CameraXHolder.kt</ID>
+    <ID>NewLineAtEndOfFile:CancelListener.kt$net.gini.android.capture.internal.util.CancelListener.kt</ID>
+    <ID>NewLineAtEndOfFile:CaptureSDKResult.kt$net.gini.android.capture.CaptureSDKResult.kt</ID>
+    <ID>NewLineAtEndOfFile:ClickListenerExt.kt$net.gini.android.capture.internal.ui.ClickListenerExt.kt</ID>
+    <ID>NewLineAtEndOfFile:ConfigurationNetworkResult.kt$net.gini.android.capture.internal.network.ConfigurationNetworkResult.kt</ID>
+    <ID>NewLineAtEndOfFile:CropToCameraFrameTextRecognizer.kt$net.gini.android.capture.internal.textrecognition.CropToCameraFrameTextRecognizer.kt</ID>
+    <ID>NewLineAtEndOfFile:DecimalFormatter.kt$net.gini.android.capture.ui.components.textinput.amount.DecimalFormatter.kt</ID>
+    <ID>NewLineAtEndOfFile:DecimalInputVisualTransformation.kt$net.gini.android.capture.ui.components.textinput.amount.DecimalInputVisualTransformation.kt</ID>
+    <ID>NewLineAtEndOfFile:DeviceInfo.kt$net.gini.android.capture.tracking.useranalytics.tracker.DeviceInfo.kt</ID>
+    <ID>NewLineAtEndOfFile:EntryPoint.kt$net.gini.android.capture.EntryPoint.kt</ID>
+    <ID>NewLineAtEndOfFile:ErrorLogger.kt$net.gini.android.capture.logging.ErrorLogger.kt</ID>
+    <ID>NewLineAtEndOfFile:ErrorLoggerListener.kt$net.gini.android.capture.logging.ErrorLoggerListener.kt</ID>
+    <ID>NewLineAtEndOfFile:ErrorType.kt$net.gini.android.capture.error.ErrorType.kt</ID>
+    <ID>NewLineAtEndOfFile:FailureException.kt$net.gini.android.capture.internal.network.FailureException.kt</ID>
+    <ID>NewLineAtEndOfFile:FileImportHelpFragment.kt$net.gini.android.capture.help.FileImportHelpFragment.kt</ID>
+    <ID>NewLineAtEndOfFile:FragmentExtensions.kt$net.gini.android.capture.internal.util.FragmentExtensions.kt</ID>
+    <ID>NewLineAtEndOfFile:GiniButton.kt$net.gini.android.capture.ui.components.button.filled.GiniButton.kt</ID>
+    <ID>NewLineAtEndOfFile:GiniButtonColors.kt$net.gini.android.capture.ui.components.button.filled.GiniButtonColors.kt</ID>
+    <ID>NewLineAtEndOfFile:GiniDatePickerDialog.kt$net.gini.android.capture.ui.components.picker.date.GiniDatePickerDialog.kt</ID>
+    <ID>NewLineAtEndOfFile:GiniDatePickerDialogColors.kt$net.gini.android.capture.ui.components.picker.date.GiniDatePickerDialogColors.kt</ID>
+    <ID>NewLineAtEndOfFile:GiniSwitch.kt$net.gini.android.capture.ui.components.switcher.GiniSwitch.kt</ID>
+    <ID>NewLineAtEndOfFile:GiniSwitchColors.kt$net.gini.android.capture.ui.components.switcher.GiniSwitchColors.kt</ID>
+    <ID>NewLineAtEndOfFile:GiniTextInput.kt$net.gini.android.capture.ui.components.textinput.GiniTextInput.kt</ID>
+    <ID>NewLineAtEndOfFile:GiniTextInputColors.kt$net.gini.android.capture.ui.components.textinput.GiniTextInputColors.kt</ID>
+    <ID>NewLineAtEndOfFile:GiniTopBar.kt$net.gini.android.capture.ui.components.topbar.GiniTopBar.kt</ID>
+    <ID>NewLineAtEndOfFile:GiniTopBarColors.kt$net.gini.android.capture.ui.components.topbar.GiniTopBarColors.kt</ID>
+    <ID>NewLineAtEndOfFile:HelpFragment.kt$net.gini.android.capture.help.HelpFragment.kt</ID>
+    <ID>NewLineAtEndOfFile:HelpItem.kt$net.gini.android.capture.help.HelpItem.kt</ID>
+    <ID>NewLineAtEndOfFile:HelpItemsAdapter.kt$net.gini.android.capture.help.HelpItemsAdapter.kt</ID>
+    <ID>NewLineAtEndOfFile:HintPopup.kt$net.gini.android.capture.internal.camera.view.HintPopup.kt</ID>
+    <ID>NewLineAtEndOfFile:IBANKnowledge.kt$net.gini.android.capture.internal.iban.IBANKnowledge.kt</ID>
+    <ID>NewLineAtEndOfFile:IBANRecognizer.kt$net.gini.android.capture.internal.iban.IBANRecognizer.kt</ID>
+    <ID>NewLineAtEndOfFile:IBANRecognizerFilter.kt$net.gini.android.capture.internal.iban.IBANRecognizerFilter.kt</ID>
+    <ID>NewLineAtEndOfFile:IBANValidator.kt$net.gini.android.capture.internal.iban.IBANValidator.kt</ID>
+    <ID>NewLineAtEndOfFile:InjectedViewAdapter.kt$net.gini.android.capture.view.InjectedViewAdapter.kt</ID>
+    <ID>NewLineAtEndOfFile:IntervalClickListener.kt$net.gini.android.capture.internal.ui.IntervalClickListener.kt</ID>
+    <ID>NewLineAtEndOfFile:IntervalClickListenerHelper.kt$net.gini.android.capture.internal.ui.IntervalClickListenerHelper.kt</ID>
+    <ID>NewLineAtEndOfFile:IntervalToolbarMenuItemIntervalClickListener.kt$net.gini.android.capture.internal.ui.IntervalToolbarMenuItemIntervalClickListener.kt</ID>
+    <ID>NewLineAtEndOfFile:MiddlePageManager.kt$net.gini.android.capture.review.multipage.previews.MiddlePageManager.kt</ID>
+    <ID>NewLineAtEndOfFile:NavigationBarTopAdapter.kt$net.gini.android.capture.view.NavigationBarTopAdapter.kt</ID>
+    <ID>NewLineAtEndOfFile:OnButtonLoadingIndicatorAdapter.kt$net.gini.android.capture.view.OnButtonLoadingIndicatorAdapter.kt</ID>
+    <ID>NewLineAtEndOfFile:OnboardingIllustrationAdapter.kt$net.gini.android.capture.onboarding.view.OnboardingIllustrationAdapter.kt</ID>
+    <ID>NewLineAtEndOfFile:OnboardingNavigationBarBottomAdapter.kt$net.gini.android.capture.onboarding.view.OnboardingNavigationBarBottomAdapter.kt</ID>
+    <ID>NewLineAtEndOfFile:PhotoTipsHelpFragment.kt$net.gini.android.capture.help.PhotoTipsHelpFragment.kt</ID>
+    <ID>NewLineAtEndOfFile:PreviewPagesAdapter.kt$net.gini.android.capture.review.multipage.previews.PreviewPagesAdapter.kt</ID>
+    <ID>NewLineAtEndOfFile:QRCodePopup.kt$net.gini.android.capture.internal.camera.view.QRCodePopup.kt</ID>
+    <ID>NewLineAtEndOfFile:RecognizedText.kt$net.gini.android.capture.internal.textrecognition.RecognizedText.kt</ID>
+    <ID>NewLineAtEndOfFile:ReviewNavigationBarBottomAdapter.kt$net.gini.android.capture.review.multipage.view.ReviewNavigationBarBottomAdapter.kt</ID>
+    <ID>NewLineAtEndOfFile:SnappedItemChangeRecyclerViewListener.kt$net.gini.android.capture.util.recyclerview.SnappedItemChangeRecyclerViewListener.kt</ID>
+    <ID>NewLineAtEndOfFile:SupportedFormatsHelpFragment.kt$net.gini.android.capture.help.SupportedFormatsHelpFragment.kt</ID>
+    <ID>NewLineAtEndOfFile:TextRecognizer.kt$net.gini.android.capture.internal.textrecognition.TextRecognizer.kt</ID>
+    <ID>NewLineAtEndOfFile:TypographyToTextStyleBridge.kt$net.gini.android.capture.ui.theme.typography.TypographyToTextStyleBridge.kt</ID>
+    <ID>NewLineAtEndOfFile:UniqueIdProvider.kt$net.gini.android.capture.internal.provider.UniqueIdProvider.kt</ID>
+    <ID>NewLineAtEndOfFile:UserAnalytics.kt$net.gini.android.capture.tracking.useranalytics.UserAnalytics.kt</ID>
+    <ID>NewLineAtEndOfFile:UserAnalyticsEvent.kt$net.gini.android.capture.tracking.useranalytics.UserAnalyticsEvent.kt</ID>
+    <ID>NewLineAtEndOfFile:UserAnalyticsEventProperty.kt$net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsEventProperty.kt</ID>
+    <ID>NewLineAtEndOfFile:UserAnalyticsEventSuperProperty.kt$net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsEventSuperProperty.kt</ID>
+    <ID>NewLineAtEndOfFile:UserAnalyticsMappers.kt$net.gini.android.capture.tracking.useranalytics.UserAnalyticsMappers.kt</ID>
+    <ID>NewLineAtEndOfFile:UserAnalyticsUserProperty.kt$net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsUserProperty.kt</ID>
+    <ID>NewLineAtEndOfFile:Width.kt$net.gini.android.capture.ui.theme.modifier.Width.kt</ID>
+    <ID>ReturnCount:CameraXController.kt$CameraXController$override fun open(): CompletableFuture&lt;Void></ID>
+    <ID>ReturnCount:CameraXController.kt$CameraXController$override fun takePicture(): CompletableFuture&lt;Photo></ID>
+    <ID>ReturnCount:ErrorFragmentImpl.kt$ErrorFragmentImpl$private fun shouldAllowRetakeImages(): Boolean</ID>
+    <ID>ReturnCount:ErrorType.kt$ErrorType.Companion$@JvmStatic fun typeFromError(error: Error): ErrorType</ID>
+    <ID>ReturnCount:ErrorType.kt$ErrorType.Companion$private fun isInvalidUserError(error: Error): Boolean</ID>
+    <ID>ReturnCount:GiniCaptureFragment.kt$CaptureFragmentFactory$override fun instantiate(classLoader: ClassLoader, className: String): Fragment</ID>
+    <ID>ReturnCount:SnappedItemChangeRecyclerViewListener.kt$SnappedItemChangeRecyclerViewListener$override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int)</ID>
+    <ID>SwallowedException:DeviceInfo.kt$DeviceInfo.CachedInfo$e: Exception</ID>
+    <ID>SwallowedException:DeviceInfo.kt$DeviceInfo.CachedInfo$e: PackageManager.NameNotFoundException</ID>
+    <ID>SwallowedException:ErrorType.kt$ErrorType.Companion$e: Exception</ID>
+    <ID>SwallowedException:IBANRecognizerImpl.kt$IBANRecognizerImpl$e: IBANValidator.IllegalIBANException</ID>
+    <ID>ThrowsCount:Extensions.kt$@Throws(CameraException::class) private fun cropByteArray(data: ByteArray, cropRect: Rect?): ByteArray</ID>
+    <ID>ThrowsCount:IBANValidator.kt$IBANValidator$@Throws(IllegalIBANException::class) private fun validateLength(iban: String)</ID>
+    <ID>TooGenericExceptionCaught:CameraXController.kt$CameraXController$e: Exception</ID>
+    <ID>TooGenericExceptionCaught:CameraXHolder.kt$CameraXHolder$e: Exception</ID>
+    <ID>TooGenericExceptionCaught:DeviceInfo.kt$DeviceInfo.CachedInfo$e: Exception</ID>
+    <ID>TooGenericExceptionCaught:ErrorType.kt$ErrorType.Companion$e: Exception</ID>
+    <ID>TooManyFunctions:CameraXController.kt$CameraXController : CameraInterface</ID>
+    <ID>TooManyFunctions:FileChooserFragment.kt$FileChooserFragment : BottomSheetDialogFragment</ID>
+    <ID>TooManyFunctions:GiniCaptureFragment.kt$GiniCaptureFragment : FragmentCameraFragmentListenerAnalysisFragmentListenerEnterManuallyButtonListenerCancelListener</ID>
+    <ID>TooManyFunctions:HelpFragment.kt$HelpFragment : Fragment</ID>
+    <ID>UnusedParameter:ErrorFragmentImpl.kt$ErrorFragmentImpl$savedInstanceState: Bundle?</ID>
+    <ID>UnusedParameter:TypographyToTextStyleBridge.kt$setTextColors: Boolean = true</ID>
+    <ID>UnusedPrivateMember:GiniAmountTextInput.kt$@Preview( showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES ) @Composable private fun GiniTextInputPreviewDark()</ID>
+    <ID>UnusedPrivateMember:GiniAmountTextInput.kt$@Preview(showBackground = true) @Composable private fun GiniTextInputPreviewLight()</ID>
+    <ID>UnusedPrivateMember:GiniButton.kt$@Preview @Composable private fun GiniContentButtonPreview()</ID>
+    <ID>UnusedPrivateMember:GiniButton.kt$@Preview @Composable private fun GiniTextButtonPreview()</ID>
+    <ID>UnusedPrivateMember:GiniDatePickerDialog.kt$@Preview @Composable private fun DatePickerDialogPreviewLight()</ID>
+    <ID>UnusedPrivateMember:GiniDatePickerDialog.kt$@Preview(uiMode = UI_MODE_NIGHT_YES) @Composable private fun DatePickerDialogPreviewDark()</ID>
+    <ID>UnusedPrivateMember:GiniSwitch.kt$@Preview(showBackground = true) @Composable private fun GiniSwitchPreview()</ID>
+    <ID>UnusedPrivateMember:GiniTextInput.kt$@Preview( showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES ) @Composable private fun GiniTextInputPreviewDark()</ID>
+    <ID>UnusedPrivateMember:GiniTextInput.kt$@Preview(showBackground = true) @Composable private fun GiniTextInputPreviewLight()</ID>
+    <ID>UnusedPrivateMember:GiniTopBar.kt$@Preview @Composable private fun GiniTopBarPreviewLight()</ID>
+    <ID>UnusedPrivateMember:GiniTopBar.kt$@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES) @Composable private fun GiniTopBarPreviewDark()</ID>
+    <ID>UnusedPrivateProperty:AmplitudeUserAnalyticsEventTracker.kt$AmplitudeUserAnalyticsEventTracker$val version = BuildConfig.VERSION_NAME</ID>
+    <ID>UnusedPrivateProperty:DecimalInputVisualTransformation.kt$DecimalInputVisualTransformation.CustomOffsetMapping$val thousandSeparatorCount = formatted.count { it == formattingSymbols.groupingSeparator }</ID>
+    <ID>UnusedPrivateProperty:DeviceInfo.kt$DeviceInfo$private val LOG = LoggerFactory.getLogger(DeviceInfo::class.java)</ID>
+    <ID>UseCheckOrError:AutoClearedValue.kt$AutoClearedValue$throw IllegalStateException( "should never call auto-cleared-value get when it might not be available" )</ID>
+    <ID>UseCheckOrError:UserAnalytics.kt$UserAnalytics$throw IllegalStateException( "You need to initialize analytics by calling `UserAnalytics.initialize(...)`" )</ID>
+    <ID>UseRequire:IBANRecognizerImpl.kt$IBANRecognizerImpl$throw IllegalArgumentException("Image height is 0")</ID>
+    <ID>UseRequire:IBANRecognizerImpl.kt$IBANRecognizerImpl$throw IllegalArgumentException("Image width is 0")</ID>
+    <ID>VariableNaming:AmplitudeUserAnalyticsEventTracker.kt$AmplitudeUserAnalyticsEventTracker$private val LOG = LoggerFactory.getLogger(AmplitudeUserAnalyticsEventTracker::class.java)</ID>
+    <ID>VariableNaming:BufferedUserAnalyticsEventTracker.kt$BufferedUserAnalyticsEventTracker$private val LOG = LoggerFactory.getLogger(BufferedUserAnalyticsEventTracker::class.java)</ID>
+    <ID>VariableNaming:DeviceInfo.kt$DeviceInfo$private val LOG = LoggerFactory.getLogger(DeviceInfo::class.java)</ID>
+    <ID>WildcardImport:CameraXController.kt$import android.graphics.*</ID>
+    <ID>WildcardImport:CameraXController.kt$import androidx.camera.core.*</ID>
+    <ID>WildcardImport:NavigationBarTopAdapter.kt$import android.view.*</ID>
+    <ID>WildcardImport:NavigationBarTopAdapter.kt$import net.gini.android.capture.view.NavButtonType.*</ID>
+  </CurrentIssues>
+</SmellBaseline>
diff --git a/capture-sdk/sdk/gradle.properties b/capture-sdk/sdk/gradle.properties
index 7acbf28ee3..e144a85d45 100644
--- a/capture-sdk/sdk/gradle.properties
+++ b/capture-sdk/sdk/gradle.properties
@@ -1,7 +1,7 @@
 # Maven coordinates
 # groupId is in the root gradle.properties
 artifactId=gini-capture-sdk
-version=3.10.3
+version=3.11.0
 # Version code is visible only in the generated BuildConfig file
 versionCode=0
 
diff --git a/capture-sdk/sdk/src/main/AndroidManifest.xml b/capture-sdk/sdk/src/main/AndroidManifest.xml
index 06676c4b5d..605aeb22bb 100644
--- a/capture-sdk/sdk/src/main/AndroidManifest.xml
+++ b/capture-sdk/sdk/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="net.gini.android.capture">
 
     <uses-permission android:name="android.permission.VIBRATE" />
@@ -18,6 +19,33 @@
         <meta-data
             android:name="com.google.mlkit.vision.DEPENDENCIES"
             android:value="barcode,ocr" />
+        <!-- Trigger Google Play services to install the backported photo picker module. -->
+        <service android:name="com.google.android.gms.metadata.ModuleDependencies"
+            android:enabled="false"
+            android:exported="false"
+            tools:ignore="MissingClass">
+            <intent-filter>
+                <action android:name="com.google.android.gms.metadata.MODULE_DEPENDENCIES" />
+            </intent-filter>
+            <meta-data android:name="photopicker_activity:0:required" android:value="" />
+        </service>
+
+        <!--Routing Mixpanel to EU Servers-->
+        <meta-data
+            android:name="com.mixpanel.android.MPConfig.EventsEndpoint"
+            android:value="https://api-eu.mixpanel.com/track?ip=1" />
+
+        <meta-data
+            android:name="com.mixpanel.android.MPConfig.PeopleEndpoint"
+            android:value="https://api-eu.mixpanel.com/engage?ip=1" />
+
+        <meta-data
+            android:name="com.mixpanel.android.MPConfig.GroupsEndpoint"
+            android:value="https://api-eu.mixpanel.com/groups" />
+
+        <meta-data
+            android:name="com.mixpanel.android.MPConfig.DecideEndpoint"
+            android:value="https://api-eu.mixpanel.com/decide" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/java/com/ortiz/touch/TouchImageView.java b/capture-sdk/sdk/src/main/java/com/ortiz/touch/TouchImageView.java
index 0f04db36ec..84ed88a8ad 100644
--- a/capture-sdk/sdk/src/main/java/com/ortiz/touch/TouchImageView.java
+++ b/capture-sdk/sdk/src/main/java/com/ortiz/touch/TouchImageView.java
@@ -35,6 +35,13 @@
 import android.widget.OverScroller;
 import android.widget.Scroller;
 
+import net.gini.android.capture.tracking.useranalytics.UserAnalytics;
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsEvent;
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsScreen;
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsEventProperty;
+
+import java.util.Collections;
+
 public class TouchImageView extends androidx.appcompat.widget.AppCompatImageView {
 
     private static final String DEBUG = "DEBUG";
@@ -100,6 +107,7 @@ private static enum State {
     private GestureDetector.OnDoubleTapListener doubleTapListener = null;
     private OnTouchListener userTouchListener = null;
     private OnTouchImageViewListener touchImageViewListener = null;
+    private UserAnalyticsScreen screenName = UserAnalyticsScreen.ReviewZoom.INSTANCE;
 
     public TouchImageView(final Context context) {
         super(context);
@@ -928,6 +936,10 @@ public boolean onScale(final ScaleGestureDetector detector) {
         @Override
         public void onScaleEnd(final ScaleGestureDetector detector) {
             super.onScaleEnd(detector);
+            UserAnalytics.INSTANCE.getAnalyticsEventTracker().trackEvent(
+                    UserAnalyticsEvent.PREVIEW_ZOOMED,
+                    Collections.singleton(new UserAnalyticsEventProperty.Screen(screenName))
+            );
             setState(State.NONE);
             boolean animateToZoomBoundary = false;
             float targetZoom = normalizedScale;
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/GiniCapture.java b/capture-sdk/sdk/src/main/java/net/gini/android/capture/GiniCapture.java
index 2f7efe97f3..3579902d81 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/GiniCapture.java
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/GiniCapture.java
@@ -1,5 +1,9 @@
 package net.gini.android.capture;
 
+import static net.gini.android.capture.internal.util.FileImportValidator.FILE_SIZE_LIMIT;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.emptyMap;
+
 import android.content.Context;
 import android.content.Intent;
 
@@ -37,6 +41,7 @@
 import net.gini.android.capture.tracking.EventTracker;
 import net.gini.android.capture.tracking.OnboardingScreenEvent;
 import net.gini.android.capture.tracking.ReviewScreenEvent;
+import net.gini.android.capture.tracking.useranalytics.UserAnalytics;
 import net.gini.android.capture.util.CancellationToken;
 import net.gini.android.capture.view.CustomLoadingIndicatorAdapter;
 import net.gini.android.capture.view.DefaultLoadingIndicatorAdapter;
@@ -55,10 +60,6 @@
 import java.util.List;
 import java.util.Map;
 
-import static java.util.Collections.emptyList;
-import static java.util.Collections.emptyMap;
-import static net.gini.android.capture.internal.util.FileImportValidator.FILE_SIZE_LIMIT;
-
 /**
  * Created by Alpar Szotyori on 22.02.2018.
  * <p>
@@ -298,6 +299,7 @@ public static void cleanup(Context context) {
         sInstance.mImageMultiPageDocumentMemoryStore.clear();
         sInstance.internal().setReviewScreenAnalysisError(null);
         sInstance = null; // NOPMD
+        UserAnalytics.INSTANCE.cleanup();
         ImageDiskStore.clear(context);
     }
 
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/GiniCaptureFragment.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/GiniCaptureFragment.kt
index fbf2a19fef..55e36ec00d 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/GiniCaptureFragment.kt
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/GiniCaptureFragment.kt
@@ -15,6 +15,7 @@ import net.gini.android.capture.camera.CameraFragment
 import net.gini.android.capture.camera.CameraFragmentDirections
 import net.gini.android.capture.camera.CameraFragmentListener
 import net.gini.android.capture.error.ErrorFragment
+import net.gini.android.capture.internal.network.Configuration
 import net.gini.android.capture.internal.util.CancelListener
 import net.gini.android.capture.internal.util.FeatureConfiguration.shouldShowOnboarding
 import net.gini.android.capture.internal.util.FeatureConfiguration.shouldShowOnboardingAtFirstRun
@@ -25,14 +26,22 @@ import net.gini.android.capture.network.model.GiniCaptureReturnReason
 import net.gini.android.capture.network.model.GiniCaptureSpecificExtraction
 import net.gini.android.capture.noresults.NoResultsFragment
 import net.gini.android.capture.review.multipage.MultiPageReviewFragment
+import net.gini.android.capture.tracking.useranalytics.UserAnalytics
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsEventSuperProperty
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsUserProperty
+import net.gini.android.capture.tracking.useranalytics.tracker.AmplitudeUserAnalyticsEventTracker
+import java.util.UUID
 
-class GiniCaptureFragment(private val openWithDocument: Document? = null) :
+
+class GiniCaptureFragment(
+    private val openWithDocument: Document? = null,
+    private val resetOpenWithDocument: () -> Unit
+) :
     Fragment(),
     CameraFragmentListener,
     AnalysisFragmentListener,
     EnterManuallyButtonListener,
-    CancelListener
-{
+    CancelListener {
 
     private lateinit var navController: NavController
     private lateinit var giniCaptureFragmentListener: GiniCaptureFragmentListener
@@ -44,6 +53,9 @@ class GiniCaptureFragment(private val openWithDocument: Document? = null) :
     private var willBeRestored = false
     private var didFinishWithResult = false
 
+    private val userAnalyticsEventTracker by lazy { UserAnalytics.getAnalyticsEventTracker() }
+
+
     fun setListener(listener: GiniCaptureFragmentListener) {
         this.giniCaptureFragmentListener = listener
     }
@@ -53,11 +65,52 @@ class GiniCaptureFragment(private val openWithDocument: Document? = null) :
             cameraListener = this,
             analysisFragmentListener = this,
             enterManuallyButtonListener = this,
-            cancelListener = this)
+            cancelListener = this
+        )
         super.onCreate(savedInstanceState)
         if (GiniCapture.hasInstance() && !GiniCapture.getInstance().allowScreenshots) {
             requireActivity().window.disallowScreenshots()
         }
+
+        setupUserAnalytics()
+    }
+
+    private fun setupUserAnalytics() {
+        if (GiniCapture.hasInstance()) {
+            UserAnalytics.initialize(requireActivity())
+            val networkRequestsManager =
+                GiniCapture.getInstance().internal().networkRequestsManager
+            val response = networkRequestsManager
+                ?.getConfigurations(UUID.randomUUID())
+            response?.thenAcceptAsync { res ->
+                UserAnalytics.setPlatformTokens(
+                    AmplitudeUserAnalyticsEventTracker.AmplitudeAnalyticsApiKey(
+                        res.configuration.amplitudeApiKey
+                    ),
+                    networkRequestsManager = networkRequestsManager
+                )
+                // set if return assistant is enabled for the client
+                res.configuration.let {
+                    setUserEventProperties(it)
+                }
+            }
+        }
+    }
+
+    private fun setUserEventProperties(configuration: Configuration) {
+        userAnalyticsEventTracker.setUserProperty(
+            setOf(
+                UserAnalyticsUserProperty.ReturnAssistantEnabled(
+                    configuration.isReturnAssistantEnabled
+                ),
+                UserAnalyticsUserProperty.GiniClientId(
+                    configuration.clientID
+                ),
+                UserAnalyticsUserProperty.CaptureSdkVersionName(
+                    BuildConfig.VERSION_NAME
+                )
+            )
+        )
     }
 
     override fun onGetLayoutInflater(savedInstanceState: Bundle?): LayoutInflater {
@@ -79,6 +132,7 @@ class GiniCaptureFragment(private val openWithDocument: Document? = null) :
         super.onViewCreated(view, savedInstanceState)
         navController = (childFragmentManager.fragments[0]).findNavController()
         oncePerInstallEventStore = OncePerInstallEventStore(requireContext())
+        setAnalyticsEntryPointProperty(openWithDocument != null)
         if (openWithDocument != null) {
             navController.navigate(
                 CameraFragmentDirections.toAnalysisFragment(
@@ -86,8 +140,12 @@ class GiniCaptureFragment(private val openWithDocument: Document? = null) :
                     ""
                 )
             )
+            resetOpenWithDocument()
         } else {
-            if (shouldShowOnboarding() || (shouldShowOnboardingAtFirstRun() && !oncePerInstallEventStore.containsEvent(OncePerInstallEvent.SHOW_ONBOARDING))) {
+            if (shouldShowOnboarding() || (shouldShowOnboardingAtFirstRun() && !oncePerInstallEventStore.containsEvent(
+                    OncePerInstallEvent.SHOW_ONBOARDING
+                ))
+            ) {
                 oncePerInstallEventStore.saveEvent(OncePerInstallEvent.SHOW_ONBOARDING)
                 navController.navigate(CameraFragmentDirections.toOnboardingFragment())
             }
@@ -104,6 +162,9 @@ class GiniCaptureFragment(private val openWithDocument: Document? = null) :
         if (!didFinishWithResult && !willBeRestored) {
             giniCaptureFragmentListener.onFinishedWithResult(CaptureSDKResult.Cancel)
         }
+        if (willBeRestored) {
+            UserAnalytics.flushEvents()
+        }
     }
 
     override fun onResume() {
@@ -193,10 +254,33 @@ class GiniCaptureFragment(private val openWithDocument: Document? = null) :
         giniCaptureFragmentListener.onFinishedWithResult(CaptureSDKResult.Cancel)
     }
 
+    private fun setAnalyticsEntryPointProperty(isOpenWithDocumentExists: Boolean) {
+        val entryPointProperty = if (isOpenWithDocumentExists) {
+            UserAnalyticsEventSuperProperty.EntryPoint(UserAnalyticsEventSuperProperty.EntryPoint.EntryPointType.OPEN_WITH)
+        } else {
+            UserAnalyticsEventSuperProperty.EntryPoint(
+                when (GiniCapture.getInstance().entryPoint) {
+                    EntryPoint.BUTTON -> UserAnalyticsEventSuperProperty.EntryPoint.EntryPointType.BUTTON
+                    EntryPoint.FIELD -> UserAnalyticsEventSuperProperty.EntryPoint.EntryPointType.FIELD
+                }
+            )
+        }
+        userAnalyticsEventTracker.setEventSuperProperty(entryPointProperty)
+    }
+
     companion object {
+
         @JvmStatic
         fun createInstance(document: Document? = null): GiniCaptureFragment {
-            return GiniCaptureFragment(document)
+            return GiniCaptureFragment(document) { }
+        }
+
+        @JvmStatic
+        fun createInstance(
+            document: Document? = null,
+            resetOpenWithDocument: () -> Unit
+        ): GiniCaptureFragment {
+            return GiniCaptureFragment(document, resetOpenWithDocument)
         }
     }
 }
@@ -222,7 +306,7 @@ class CaptureFragmentFactory(
                         analysisFragmentListener
                     )
                     setCancelListener(cancelListener)
-            }
+                }
 
             ErrorFragment::class.java.name -> return ErrorFragment().apply {
                 setListener(
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/analysis/AnalysisFragmentImpl.java b/capture-sdk/sdk/src/main/java/net/gini/android/capture/analysis/AnalysisFragmentImpl.java
index c4eaf3e0bf..20f265eac5 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/analysis/AnalysisFragmentImpl.java
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/analysis/AnalysisFragmentImpl.java
@@ -33,6 +33,11 @@
 import net.gini.android.capture.internal.ui.IntervalClickListener;
 import net.gini.android.capture.internal.util.Size;
 import net.gini.android.capture.tracking.AnalysisScreenEvent;
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsEvent;
+import net.gini.android.capture.tracking.useranalytics.UserAnalytics;
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsEventProperty;
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsMappersKt;
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsScreen;
 import net.gini.android.capture.internal.util.CancelListener;
 import net.gini.android.capture.view.CustomLoadingIndicatorAdapter;
 import net.gini.android.capture.view.InjectedViewAdapterHolder;
@@ -43,6 +48,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 
 import jersey.repackaged.jsr166e.CompletableFuture;
@@ -65,6 +72,7 @@ class AnalysisFragmentImpl extends AnalysisScreenContract.View {
     private InjectedViewContainer<NavigationBarTopAdapter> topAdapterInjectedViewContainer;
     private InjectedViewContainer<CustomLoadingIndicatorAdapter> injectedLoadingIndicatorContainer;
     private boolean isScanAnimationActive;
+    private final UserAnalyticsScreen screenName = UserAnalyticsScreen.Analysis.INSTANCE;
 
     AnalysisFragmentImpl(final FragmentImplCallback fragment,
                          final CancelListener cancelListener,
@@ -81,10 +89,26 @@ class AnalysisFragmentImpl extends AnalysisScreenContract.View {
     @VisibleForTesting
     void createPresenter(@NonNull final Activity activity, @NonNull final Document document,
                          final String documentAnalysisErrorMessage) {
+
+        addUserAnalyticEvents(document);
         new AnalysisScreenPresenter(activity, this, document,
                 documentAnalysisErrorMessage);
     }
 
+    private void addUserAnalyticEvents(@NonNull Document document) {
+        UserAnalytics.INSTANCE.getAnalyticsEventTracker().trackEvent(
+                UserAnalyticsEvent.SCREEN_SHOWN,
+                new HashSet<UserAnalyticsEventProperty>() {
+                    {
+                        add(new UserAnalyticsEventProperty.DocumentType(
+                                UserAnalyticsMappersKt.mapToAnalyticsDocumentType(document)
+                        ));
+                        add(new UserAnalyticsEventProperty.Screen(screenName));
+                    }
+                }
+        );
+    }
+
     @Override
     public void setListener(@NonNull final AnalysisFragmentListener listener) {
         getPresenter().setListener(listener);
@@ -94,20 +118,23 @@ public void setListener(@NonNull final AnalysisFragmentListener listener) {
     void showScanAnimation() {
         mAnalysisMessageTextView.setVisibility(View.VISIBLE);
         isScanAnimationActive = true;
-        injectedLoadingIndicatorContainer.modifyAdapterIfOwned(adapter -> {
-            adapter.onVisible();
-            return Unit.INSTANCE;
-        });
+        if (injectedLoadingIndicatorContainer != null)
+            injectedLoadingIndicatorContainer.modifyAdapterIfOwned(adapter -> {
+                adapter.onVisible();
+                return Unit.INSTANCE;
+            });
     }
 
     @Override
     void hideScanAnimation() {
         isScanAnimationActive = false;
-        injectedLoadingIndicatorContainer.modifyAdapterIfOwned(adapter -> {
-            adapter.onHidden();
-            return Unit.INSTANCE;
-        });
-        mAnalysisMessageTextView.setVisibility(View.GONE);
+        if (injectedLoadingIndicatorContainer != null)
+            injectedLoadingIndicatorContainer.modifyAdapterIfOwned(adapter -> {
+                adapter.onHidden();
+                return Unit.INSTANCE;
+            });
+        if (mAnalysisMessageTextView != null)
+            mAnalysisMessageTextView.setVisibility(View.GONE);
     }
 
     @Override
@@ -292,6 +319,12 @@ public void handleOnBackPressed() {
     private void onBack() {
         boolean popBackStack = mFragment.findNavController().popBackStack();
         if (!popBackStack) {
+            UserAnalytics.INSTANCE.getAnalyticsEventTracker().trackEvent(UserAnalyticsEvent.CLOSE_TAPPED,
+                    new HashSet<UserAnalyticsEventProperty>() {
+                        {
+                            add(new UserAnalyticsEventProperty.Screen(screenName));
+                        }
+                    });
             trackAnalysisScreenEvent(AnalysisScreenEvent.CANCEL);
             mCancelListener.onCancelFlow();
         }
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/analysis/AnalysisScreenPresenter.java b/capture-sdk/sdk/src/main/java/net/gini/android/capture/analysis/AnalysisScreenPresenter.java
index 689fe91682..d87bf53280 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/analysis/AnalysisScreenPresenter.java
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/analysis/AnalysisScreenPresenter.java
@@ -313,6 +313,7 @@ public Void apply(final AnalysisInteractor.ResultHolder resultHolder,
                                             .onProceedToNoExtractionsScreen(mMultiPageDocument);
                                     return null;
                                 }
+
                                 getAnalysisFragmentListenerOrNoOp()
                                         .onExtractionsAvailable(getMapOrEmpty(resultHolder.getExtractions()),
                                                 getMapOrEmpty(resultHolder.getCompoundExtractions()),
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/camera/CameraFragmentImpl.java b/capture-sdk/sdk/src/main/java/net/gini/android/capture/camera/CameraFragmentImpl.java
index 9c463df50a..dd2ada2294 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/camera/CameraFragmentImpl.java
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/camera/CameraFragmentImpl.java
@@ -112,6 +112,11 @@
 import net.gini.android.capture.requirements.RequirementReport;
 import net.gini.android.capture.tracking.AnalysisScreenEvent;
 import net.gini.android.capture.tracking.CameraScreenEvent;
+import net.gini.android.capture.tracking.useranalytics.UserAnalytics;
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsEvent;
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsEventTracker;
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsEventProperty;
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsScreen;
 import net.gini.android.capture.util.IntentHelper;
 import net.gini.android.capture.util.UriHelper;
 import net.gini.android.capture.view.CustomLoadingIndicatorAdapter;
@@ -124,6 +129,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -149,6 +155,9 @@ class CameraFragmentImpl implements CameraFragmentInterface, PaymentQRCodeReader
     private static final long DIFFERENT_QRCODE_DETECTED_POPUP_DELAY_MS = 1000;
     private static final Logger LOG = LoggerFactory.getLogger(CameraFragmentImpl.class);
 
+    private static final UserAnalyticsScreen.CameraAccess sScreenNamePermission =
+            UserAnalyticsScreen.CameraAccess.INSTANCE;
+
     private static final CameraFragmentListener NO_OP_LISTENER = new CameraFragmentListener() {
         @Override
         public void onCheckImportedDocument(@NonNull final Document document,
@@ -188,6 +197,10 @@ public void onExtractionsAvailable(
     private ImageMultiPageDocument mMultiPageDocument;
     private PaymentQRCodeReader mPaymentQRCodeReader;
 
+    @VisibleForTesting
+    UserAnalyticsEventTracker mUserAnalyticsEventTracker;
+
+
     private ConstraintLayout mLayoutRoot;
     private ViewGroup mCameraPreviewContainer;
     private View mCameraPreview;
@@ -199,7 +212,8 @@ public void onExtractionsAvailable(
     private Button mButtonCameraFlashTrigger;
     private Group mCameraFlashButtonGroup;
     private TextView mCameraFlashButtonSubtitle;
-    private ConstraintLayout mLayoutNoPermission;
+    @VisibleForTesting
+    ConstraintLayout mLayoutNoPermission;
     private ViewGroup mButtonImportDocumentWrapper;
     private Button mButtonImportDocument;
     private ConstraintLayout mCameraFrameWrapper;
@@ -215,6 +229,8 @@ public void onExtractionsAvailable(
     private ImportImageFileUrisAsyncTask mImportUrisAsyncTask;
     private Group mImportButtonGroup;
     private String mQRCodeContent;
+    private boolean shouldSendUserAnalyticsTrackerForQrCodes = true;
+    private boolean isIbanDetectedOnceForUserAnalytics = false;
 
     private InjectedViewContainer<NavigationBarTopAdapter> topAdapterInjectedViewContainer;
     private InjectedViewContainer<CustomLoadingIndicatorAdapter> mLoadingIndicator;
@@ -222,8 +238,9 @@ public void onExtractionsAvailable(
 
     private IBANRecognizerFilter ibanRecognizerFilter;
     private CropToCameraFrameTextRecognizer cropToCameraFrameTextRecognizer;
+    private final UserAnalyticsScreen screenName = UserAnalyticsScreen.Camera.INSTANCE;
 
-    CameraFragmentImpl(@NonNull final FragmentImplCallback fragment, @NonNull final CancelListener cancelListener,final boolean addPages) {
+    CameraFragmentImpl(@NonNull final FragmentImplCallback fragment, @NonNull final CancelListener cancelListener, final boolean addPages) {
         mFragment = fragment;
         mCancelListener = cancelListener;
         this.addPages = addPages;
@@ -297,6 +314,7 @@ private void showQRCodeView(PaymentQRCodeData data, String qrCodeContent) {
     private void showUnsupportedQRCodePopup() {
         if (mIbanDetectedTextView.getVisibility() != View.VISIBLE) {
             mUnsupportedQRCodePopup.show(null);
+            sendQRCodeScannedEventToUserAnalytics(false);
         }
     }
 
@@ -325,6 +343,7 @@ public void onCreate(final Bundle savedInstanceState) {
         if (savedInstanceState != null) {
             restoreSavedState(savedInstanceState);
         }
+
     }
 
     private void initFlashState() {
@@ -341,6 +360,7 @@ private void restoreSavedState(@NonNull final Bundle savedInstanceState) {
     View onCreateView(final LayoutInflater inflater, final ViewGroup container,
                       final Bundle savedInstanceState) {
         final View view = inflater.inflate(R.layout.gc_fragment_camera, container, false);
+        mUserAnalyticsEventTracker = UserAnalytics.INSTANCE.getAnalyticsEventTracker();
 
         bindViews(view);
         preventPaneClickThrough();
@@ -372,6 +392,11 @@ private void handleOnBackPressed() {
         activity.getOnBackPressedDispatcher().addCallback(mFragment.getViewLifecycleOwner(), new OnBackPressedCallback(true) {
             @Override
             public void handleOnBackPressed() {
+                if (!addPages) {
+                    trackCameraScreenCloseTappedEventIfNeeded();
+                }
+                trackCameraScreenEvent(CameraScreenEvent.EXIT);
+                trackCameraAccessPermissionRequiredCloseClickedEventIfNeeded();
                 onBackPressed();
             }
         });
@@ -456,6 +481,8 @@ private void setFileChooserFragmentResultListener() {
     public void handleFileChooserResult(@NonNull FileChooserResult result) {
         if (result instanceof FileChooserResult.FilesSelected) {
             importDocumentFromIntent(((FileChooserResult.FilesSelected) result).getDataIntent());
+        } else if(result instanceof FileChooserResult.FilesSelectedUri) {
+            importDocumentFromUriList(((FileChooserResult.FilesSelectedUri) result).getList());
         } else if (result instanceof FileChooserResult.Error) {
             final GiniCaptureError error = ((FileChooserResult.Error) result).getError();
             final String message = "Document import failed: " + error.getMessage();
@@ -635,6 +662,7 @@ private CompletableFuture<Void> openCamera() {
                         }
                     } else {
                         LOG.info("Camera opened");
+                        trackCameraScreenShownEvent();
                         hideNoPermissionView();
                     }
                     return null;
@@ -760,6 +788,8 @@ private void setTopBarInjectedViewContainer() {
                 }
 
                 injectedViewAdapter.setOnNavButtonClickListener(new IntervalClickListener(v -> {
+                    trackCameraAccessPermissionRequiredCloseClickedEventIfNeeded();
+                    trackCameraScreenCloseTappedEventIfNeeded();
                     onBackPressed();
                 }));
             }));
@@ -777,10 +807,14 @@ private void setBottomInjectedViewContainer() {
                         injectedViewAdapter.setBackButtonVisibility(isEmpty ? View.GONE : View.VISIBLE);
 
                         injectedViewAdapter.setOnBackButtonClickListener(new IntervalClickListener(v -> {
+                            trackCameraAccessPermissionRequiredCloseClickedEventIfNeeded();
+                            trackCameraScreenCloseTappedEventIfNeeded();
                             onBackPressed();
                         }));
 
-                        injectedViewAdapter.setOnHelpButtonClickListener(new IntervalClickListener(v -> startHelpActivity()));
+                        injectedViewAdapter.setOnHelpButtonClickListener(new IntervalClickListener(v -> {
+                            startHelpActivity();
+                        }));
                     }));
         }
     }
@@ -816,6 +850,9 @@ void startHelpActivity() {
         mFragment.findNavController().navigate(CameraFragmentDirections.toHelpFragment());
 
         trackCameraScreenEvent(CameraScreenEvent.HELP);
+
+        trackCameraScreenHelpTappedIfNeeded();
+        trackCameraAccessPermissionRequiredHelpClickedEventIfNeeded();
     }
 
     private void initOnlyQRScanning() {
@@ -861,16 +898,53 @@ private boolean isDocumentImportEnabled(@NonNull final Activity activity) {
     }
 
     private void setInputHandlers() {
-        ClickListenerExtKt.setIntervalClickListener(mButtonCameraTrigger, v -> onCameraTriggerClicked());
+        ClickListenerExtKt.setIntervalClickListener(mButtonCameraTrigger, v -> {
+            mUserAnalyticsEventTracker.trackEvent(
+                    UserAnalyticsEvent.CAPTURE_TAPPED,
+                    new HashSet<UserAnalyticsEventProperty>() {
+                        {
+                            add(new UserAnalyticsEventProperty.Screen(screenName));
+                            add(new UserAnalyticsEventProperty.IbanDetectionLayerVisible(isIbanDetectedOnceForUserAnalytics));
+                        }
+                    }
+            );
+            onCameraTriggerClicked();
+        });
 
         ClickListenerExtKt.setIntervalClickListener(mButtonCameraFlashTrigger, v -> {
+            mUserAnalyticsEventTracker.trackEvent(
+                    UserAnalyticsEvent.FLASH_TAPPED,
+                    new HashSet<UserAnalyticsEventProperty>() {
+                        {
+                            add(new UserAnalyticsEventProperty.Screen(screenName));
+                            add(new UserAnalyticsEventProperty.FlashActive(mCameraController.isFlashEnabled()));
+                        }
+                    }
+            );
             mIsFlashEnabled = !mCameraController.isFlashEnabled();
             updateCameraFlashState();
         });
 
-        ClickListenerExtKt.setIntervalClickListener(mButtonImportDocument, v -> showFileChooser());
+        ClickListenerExtKt.setIntervalClickListener(mButtonImportDocument, v -> {
+            mUserAnalyticsEventTracker.trackEvent(UserAnalyticsEvent.IMPORT_FILES_TAPPED,
+                    new HashSet<UserAnalyticsEventProperty>() {
+                        {
+                            add(new UserAnalyticsEventProperty.Screen(screenName));
+                        }
+                    });
+            showFileChooser();
+        });
 
         ClickListenerExtKt.setIntervalClickListener(mPhotoThumbnail, v -> {
+            mUserAnalyticsEventTracker.trackEvent(
+                    UserAnalyticsEvent.MULTIPLE_PAGES_CAPTURED_TAPPED,
+                    new HashSet<UserAnalyticsEventProperty>() {
+                        {
+                            add(new UserAnalyticsEventProperty.Screen(screenName));
+                            add(new UserAnalyticsEventProperty.DocumentPageNumber(mMultiPageDocument.getDocuments().size()));
+                        }
+                    }
+            );
             onBackPressed();
         });
     }
@@ -907,17 +981,35 @@ private void handlePaymentQRCodeData(@NonNull final PaymentQRCodeData paymentQRC
             case BEZAHL_CODE:
                 QRCodeDocument mQRCodeDocument = QRCodeDocument.fromPaymentQRCodeData(
                         paymentQRCodeData);
+                sendQRCodeScannedEventToUserAnalytics(true);
                 analyzeQRCode(mQRCodeDocument);
                 break;
             case EPS_PAYMENT:
+                sendQRCodeScannedEventToUserAnalytics(true);
                 handleEPSPaymentQRCode(paymentQRCodeData);
                 break;
             default:
+                sendQRCodeScannedEventToUserAnalytics(false);
                 LOG.error("Unknown payment QR Code format: {}", paymentQRCodeData);
                 break;
         }
     }
 
+    private void sendQRCodeScannedEventToUserAnalytics(boolean validQRCode) {
+        if (shouldSendUserAnalyticsTrackerForQrCodes) {
+            mUserAnalyticsEventTracker.trackEvent(
+                    UserAnalyticsEvent.QR_CODE_SCANNED,
+                    new HashSet<UserAnalyticsEventProperty>() {
+                        {
+                            add(new UserAnalyticsEventProperty.Screen(screenName));
+                            add(new UserAnalyticsEventProperty.QrCodeValid(validQRCode));
+                        }
+                    }
+            );
+            shouldSendUserAnalyticsTrackerForQrCodes = false;
+        }
+    }
+
     private void handleEPSPaymentQRCode(@NonNull final PaymentQRCodeData paymentQRCodeData) {
         final GiniCaptureExtraction extraction = new GiniCaptureExtraction(
                 paymentQRCodeData.getUnparsedContent(), EXTRACTION_ENTITY_NAME,
@@ -1113,6 +1205,13 @@ private void importDocumentFromIntent(@NonNull final Intent data) {
         }
     }
 
+    private void importDocumentFromUriList(List<Uri> uriList) {
+        if (mFragment.getActivity() == null)
+            return;
+
+        handleMultiPageDocumentAndCallListener(mFragment.getActivity(), new Intent(Intent.ACTION_PICK), uriList);
+    }
+
     private boolean isImage(@NonNull final Intent data, @NonNull final Activity activity) {
         return IntentHelper.hasMimeTypeWithPrefix(data, activity, MimeType.IMAGE_PREFIX.asString());
     }
@@ -1158,7 +1257,7 @@ public void documentAccepted() {
                                     proceedToMultiPageReviewScreen(true);
                                 }
                             } else {
-                                mFragment.findNavController().navigate(CameraFragmentDirections.toAnalysisFragment(document , ""));
+                                mFragment.findNavController().navigate(CameraFragmentDirections.toAnalysisFragment(document, ""));
                             }
                         }
                     }
@@ -1187,7 +1286,7 @@ private void proceedToMultiPageReviewScreen(final boolean shouldScrollToLastPage
             mFragment.getParentFragmentManager().setFragmentResult(REQUEST_KEY, resultBundle);
             mFragment.findNavController().popBackStack();
         } else {
-            mFragment.findNavController().navigate(CameraFragmentDirections.toReviewFragment(shouldScrollToLastPage));
+            mFragment.safeNavigate(CameraFragmentDirections.toReviewFragment(shouldScrollToLastPage));
         }
     }
 
@@ -1223,6 +1322,7 @@ private void handleMultiPageDocumentAndCallListener(@NonNull final Context conte
                 new AsyncCallback<ImageMultiPageDocument, ImportedFileValidationException>() {
                     @Override
                     public void onSuccess(final ImageMultiPageDocument multiPageDocument) {
+                        hideActivityIndicatorAndEnableInteraction();
                         if (mMultiPageDocument == null) {
                             mInMultiPageState = true;
                             mMultiPageDocument = multiPageDocument;
@@ -1238,7 +1338,6 @@ public void onSuccess(final ImageMultiPageDocument multiPageDocument) {
                         }
                         LOG.info("Document imported: {}", mMultiPageDocument);
                         updatePhotoThumbnail();
-                        hideActivityIndicatorAndEnableInteraction();
                         requestClientDocumentCheck(mMultiPageDocument);
                     }
 
@@ -1364,6 +1463,17 @@ private void disableInteraction() {
     }
 
     private void showGenericInvalidFileError(ErrorType errorType) {
+        String errorMessage = mFragment.getActivity().getResources()
+                .getString(errorType.getTitleTextResource());
+        mUserAnalyticsEventTracker.trackEvent(
+                UserAnalyticsEvent.ERROR_DIALOG_SHOWN,
+                new HashSet<UserAnalyticsEventProperty>() {
+                    {
+                        add(new UserAnalyticsEventProperty.Screen(screenName));
+                        add(new UserAnalyticsEventProperty.ErrorMessage(errorMessage));
+                    }
+                }
+        );
         final Activity activity = mFragment.getActivity();
         if (activity == null) {
             return;
@@ -1612,6 +1722,7 @@ private void showNoPermissionView() {
         inflateNoPermissionStub();
         setUpNoPermissionButton();
         if (mLayoutNoPermission != null) {
+            trackCameraAccessPermissionRequiredShownEvent();
             mLayoutNoPermission.setVisibility(View.VISIBLE);
         }
     }
@@ -1662,7 +1773,10 @@ private void handleNoPermissionButtonClick() {
             return;
         }
         final Button button = view.findViewById(R.id.gc_button_camera_no_permission);
-        button.setOnClickListener(v -> startApplicationDetailsSettings());
+        button.setOnClickListener(v -> {
+            trackCameraAccessPermissionRequiredGetAccessClickedEvent();
+            startApplicationDetailsSettings();
+        });
     }
 
     private void hideNoPermissionButton() {
@@ -1788,6 +1902,7 @@ private void handleIBANsDetected(List<String> ibans) {
     }
 
     private void showIBANsDetectedOnScreen(List<String> ibans) {
+        isIbanDetectedOnceForUserAnalytics = true;
         mIbanDetectedTextView.setVisibility(View.VISIBLE);
         mImageFrame.setImageTintList(ColorStateList.valueOf(
                         ContextCompat.getColor(
@@ -1850,8 +1965,80 @@ private void handleError(final GiniCaptureError.ErrorCode errorCode,
     private void onBackPressed() {
         boolean popSuccess = mFragment.findNavController().popBackStack();
         if (!popSuccess) {
-            trackCameraScreenEvent(CameraScreenEvent.EXIT);
             mCancelListener.onCancelFlow();
         }
     }
+
+    private void trackCameraScreenCloseTappedEventIfNeeded() {
+        if (mLayoutNoPermission == null || mLayoutNoPermission.getVisibility() != View.VISIBLE) {
+            mUserAnalyticsEventTracker.trackEvent(UserAnalyticsEvent.CLOSE_TAPPED,
+                    new HashSet<UserAnalyticsEventProperty>() {
+                        {
+                            add(new UserAnalyticsEventProperty.Screen(screenName));
+                        }
+                    });
+        }
+    }
+
+    private void trackCameraScreenShownEvent() {
+        mUserAnalyticsEventTracker.trackEvent(UserAnalyticsEvent.SCREEN_SHOWN,
+                new HashSet<UserAnalyticsEventProperty>() {
+                    {
+                        add(new UserAnalyticsEventProperty.Screen(screenName));
+                    }
+                });
+    }
+
+    private void trackCameraScreenHelpTappedIfNeeded() {
+        if (mLayoutNoPermission == null || mLayoutNoPermission.getVisibility() != View.VISIBLE) {
+            mUserAnalyticsEventTracker.trackEvent(UserAnalyticsEvent.HELP_TAPPED,
+                    new HashSet<UserAnalyticsEventProperty>() {
+                        {
+                            add(new UserAnalyticsEventProperty.Screen(screenName));
+                        }
+                    });
+        }
+    }
+
+    private void trackCameraAccessPermissionRequiredShownEvent() {
+        mUserAnalyticsEventTracker.trackEvent(
+                UserAnalyticsEvent.SCREEN_SHOWN,
+                new HashSet<UserAnalyticsEventProperty>() {
+                    {
+                        add(new UserAnalyticsEventProperty.Screen(sScreenNamePermission));
+                    }
+                }
+        );
+    }
+
+    private void trackCameraAccessPermissionRequiredGetAccessClickedEvent() {
+        mUserAnalyticsEventTracker.trackEvent(
+                UserAnalyticsEvent.GIVE_ACCESS_TAPPED, new HashSet<UserAnalyticsEventProperty>() {
+                    {
+                        add(new UserAnalyticsEventProperty.Screen(sScreenNamePermission));
+                    }
+                });
+    }
+
+    private void trackCameraAccessPermissionRequiredHelpClickedEventIfNeeded() {
+        if (mLayoutNoPermission != null && mLayoutNoPermission.getVisibility() == View.VISIBLE) {
+            mUserAnalyticsEventTracker.trackEvent(
+                    UserAnalyticsEvent.HELP_TAPPED, new HashSet<UserAnalyticsEventProperty>() {
+                        {
+                            add(new UserAnalyticsEventProperty.Screen(sScreenNamePermission));
+                        }
+                    });
+        }
+    }
+
+    private void trackCameraAccessPermissionRequiredCloseClickedEventIfNeeded() {
+        if (mLayoutNoPermission != null && mLayoutNoPermission.getVisibility() == View.VISIBLE) {
+            mUserAnalyticsEventTracker.trackEvent(
+                    UserAnalyticsEvent.CLOSE_TAPPED, new HashSet<UserAnalyticsEventProperty>() {
+                        {
+                            add(new UserAnalyticsEventProperty.Screen(sScreenNamePermission));
+                        }
+                    });
+        }
+    }
 }
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/error/ErrorFragmentImpl.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/error/ErrorFragmentImpl.kt
index 725df66397..97158982f3 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/error/ErrorFragmentImpl.kt
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/error/ErrorFragmentImpl.kt
@@ -7,6 +7,7 @@ import android.view.ViewGroup
 import android.widget.Button
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.activity.OnBackPressedCallback
 import net.gini.android.capture.Document
 import net.gini.android.capture.EnterManuallyButtonListener
 import net.gini.android.capture.GiniCapture
@@ -18,6 +19,13 @@ import net.gini.android.capture.internal.ui.setIntervalClickListener
 import net.gini.android.capture.internal.util.ActivityHelper
 import net.gini.android.capture.tracking.AnalysisScreenEvent
 import net.gini.android.capture.tracking.EventTrackingHelper
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsEvent
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsEventTracker
+import net.gini.android.capture.tracking.useranalytics.UserAnalytics.getAnalyticsEventTracker
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsEventProperty
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsScreen
+import net.gini.android.capture.tracking.useranalytics.mapToAnalyticsDocumentType
+import net.gini.android.capture.tracking.useranalytics.mapToAnalyticsErrorType
 import net.gini.android.capture.internal.util.CancelListener
 import net.gini.android.capture.view.InjectedViewAdapterHolder
 import net.gini.android.capture.view.InjectedViewContainer
@@ -40,6 +48,8 @@ class ErrorFragmentImpl(
 
     private var enterManuallyButtonListener: EnterManuallyButtonListener? = null
     private lateinit var retakeImagesButton: Button
+    private lateinit var mUserAnalyticsEventTracker: UserAnalyticsEventTracker
+    private val screenName: UserAnalyticsScreen = UserAnalyticsScreen.Error
 
     fun onCreate(savedInstanceState: Bundle?) {
         ActivityHelper.forcePortraitOrientationOnPhones(fragmentCallback.activity)
@@ -48,6 +58,7 @@ class ErrorFragmentImpl(
         if (GiniCapture.hasInstance()) {
             GiniCapture.getInstance().internal().imageMultiPageDocumentMemoryStore.clear()
         }
+        mUserAnalyticsEventTracker = getAnalyticsEventTracker()
     }
 
     fun onCreateView(
@@ -57,20 +68,33 @@ class ErrorFragmentImpl(
     ): View {
         val view: View = inflater.inflate(R.layout.gc_fragment_error, container, false)
         retakeImagesButton = view.findViewById(R.id.gc_button_error_retake_images)
+        handleOnBackPressed()
+        addUserAnalyticEvents()
 
         setInjectedTopBarContainer(view)
 
         if (shouldAllowRetakeImages()) {
             retakeImagesButton.setIntervalClickListener {
+                mUserAnalyticsEventTracker.trackEvent(
+                    UserAnalyticsEvent.BACK_TO_CAMERA_TAPPED,
+                    setOf(UserAnalyticsEventProperty.Screen(screenName))
+                )
                 EventTrackingHelper.trackAnalysisScreenEvent(AnalysisScreenEvent.RETRY)
-                fragmentCallback.findNavController().navigate(ErrorFragmentDirections.toCameraFragment())
+                fragmentCallback.findNavController()
+                    .navigate(ErrorFragmentDirections.toCameraFragment())
             }
         } else {
             retakeImagesButton.visibility = View.GONE
         }
 
         val enterManuallyButton = view.findViewById<View>(R.id.gc_button_error_enter_manually)
-        enterManuallyButton.setIntervalClickListener { enterManuallyButtonListener?.onEnterManuallyPressed() }
+        enterManuallyButton.setIntervalClickListener {
+            mUserAnalyticsEventTracker.trackEvent(
+                UserAnalyticsEvent.ENTER_MANUALLY_TAPPED,
+                setOf(UserAnalyticsEventProperty.Screen(screenName))
+            )
+            enterManuallyButtonListener?.onEnterManuallyPressed()
+        }
 
         customError?.let {
             view.findViewById<TextView>(R.id.gc_error_header).text = it
@@ -88,15 +112,36 @@ class ErrorFragmentImpl(
         return view
     }
 
+    private fun addUserAnalyticEvents() {
+        val errorMessage = customError ?:
+        fragmentCallback.activity?.getString(errorType?.titleTextResource ?: 0).toString()
+        mUserAnalyticsEventTracker.trackEvent(
+            UserAnalyticsEvent.SCREEN_SHOWN,
+            setOf(
+                UserAnalyticsEventProperty.Screen(screenName),
+                UserAnalyticsEventProperty.DocumentType(document.mapToAnalyticsDocumentType()),
+                UserAnalyticsEventProperty.DocumentId(document?.id.toString()),
+                UserAnalyticsEventProperty.ErrorType(errorType.mapToAnalyticsErrorType()),
+                UserAnalyticsEventProperty.ErrorMessage(errorMessage)
+            ),
+        )
+    }
+
     private fun setInjectedTopBarContainer(view: View) {
         val topBarContainer =
             view.findViewById<InjectedViewContainer<NavigationBarTopAdapter>>(R.id.gc_injected_navigation_bar_container_top)
         if (GiniCapture.hasInstance()) {
-            topBarContainer.injectedViewAdapterHolder = InjectedViewAdapterHolder(GiniCapture.getInstance().internal().navigationBarTopAdapterInstance) { injectedViewAdapter ->
+            topBarContainer.injectedViewAdapterHolder = InjectedViewAdapterHolder(
+                GiniCapture.getInstance().internal().navigationBarTopAdapterInstance
+            ) { injectedViewAdapter ->
                 injectedViewAdapter.apply {
                     setTitle(fragmentCallback.activity?.getString(R.string.gc_title_error) ?: "")
                     setNavButtonType(NavButtonType.CLOSE)
                     setOnNavButtonClickListener(IntervalClickListener {
+                        mUserAnalyticsEventTracker.trackEvent(
+                            UserAnalyticsEvent.CLOSE_TAPPED,
+                            setOf(UserAnalyticsEventProperty.Screen(screenName))
+                        )
                         cancelListener.onCancelFlow()
                     })
                 }
@@ -104,13 +149,30 @@ class ErrorFragmentImpl(
         }
     }
 
+    private fun handleOnBackPressed() {
+        fragmentCallback.getActivity()?.onBackPressedDispatcher
+            ?.addCallback(
+                fragmentCallback.getViewLifecycleOwner(),
+                object : OnBackPressedCallback(true) {
+                    override fun handleOnBackPressed() {
+                        mUserAnalyticsEventTracker.trackEvent(
+                            UserAnalyticsEvent.CLOSE_TAPPED,
+                            setOf(UserAnalyticsEventProperty.Screen(screenName))
+                        )
+                        remove()
+                        cancelListener.onCancelFlow()
+                    }
+                })
+    }
+
     fun setListener(enterManuallyButtonListener: EnterManuallyButtonListener?) {
         this.enterManuallyButtonListener = enterManuallyButtonListener ?: defaultListener
     }
 
     private fun shouldAllowRetakeImages(): Boolean {
         if (document == null) {
-            retakeImagesButton.text = fragmentCallback.activity?.getString(R.string.gc_error_back_to_camera)
+            retakeImagesButton.text =
+                fragmentCallback.activity?.getString(R.string.gc_error_back_to_camera)
             return true
         }
 
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/help/FileImportHelpFragment.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/help/FileImportHelpFragment.kt
index 4872fd1f30..347e717dd1 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/help/FileImportHelpFragment.kt
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/help/FileImportHelpFragment.kt
@@ -90,7 +90,10 @@ class FileImportHelpFragment : Fragment() {
     }
 
     private fun waitForHalfSecondAndShowSnackBar() {
-        Handler(Looper.getMainLooper()).postDelayed({ this.showCustomSnackBar() }, 500)
+        Handler(Looper.getMainLooper()).postDelayed(
+            { if (isVisible) this.showCustomSnackBar() },
+            500
+        )
     }
 
     private fun showCustomSnackBar() {
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/help/HelpFragment.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/help/HelpFragment.kt
index 8c2402e2ec..ab5c74edcd 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/help/HelpFragment.kt
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/help/HelpFragment.kt
@@ -14,6 +14,10 @@ import net.gini.android.capture.databinding.GcFragmentHelpBinding
 import net.gini.android.capture.internal.ui.IntervalClickListener
 import net.gini.android.capture.internal.util.autoCleared
 import net.gini.android.capture.internal.util.getLayoutInflaterWithGiniCaptureTheme
+import net.gini.android.capture.tracking.useranalytics.UserAnalytics
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsEvent
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsScreen
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsEventProperty
 import net.gini.android.capture.view.InjectedViewAdapterHolder
 import net.gini.android.capture.view.NavButtonType
 
@@ -23,6 +27,10 @@ import net.gini.android.capture.view.NavButtonType
 class HelpFragment : Fragment() {
     private var binding: GcFragmentHelpBinding by autoCleared()
 
+    private val userAnalyticsEventTracker by lazy { UserAnalytics.getAnalyticsEventTracker() }
+    private val helpItemsAdapter by lazy { HelpItemsAdapter { helpItem -> launchHelpScreen(helpItem) } }
+    private val screenName: UserAnalyticsScreen = UserAnalyticsScreen.Help
+
     override fun onGetLayoutInflater(savedInstanceState: Bundle?): LayoutInflater {
         val inflater = super.onGetLayoutInflater(savedInstanceState)
         return this.getLayoutInflaterWithGiniCaptureTheme(inflater)
@@ -37,17 +45,20 @@ class HelpFragment : Fragment() {
         setupTopBarNavigation()
         setupBottomBarNavigation()
         handleOnBackPressed()
+        trackHelpOpenEvent()
         return binding.root
     }
 
     private fun handleOnBackPressed() {
-        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner, object : OnBackPressedCallback(true) {
-            override fun handleOnBackPressed() {
-                findNavController().navigate(HelpFragmentDirections.toCameraFragment())
-                isEnabled = false
-                remove()
-            }
-        })
+        requireActivity().onBackPressedDispatcher.addCallback(
+            viewLifecycleOwner,
+            object : OnBackPressedCallback(true) {
+                override fun handleOnBackPressed() {
+                    navigateBackToCamera()
+                    isEnabled = false
+                    remove()
+                }
+            })
     }
 
 
@@ -67,7 +78,10 @@ class HelpFragment : Fragment() {
     private fun setUpHelpItems() {
         binding.gcHelpItems.apply {
             layoutManager = LinearLayoutManager(requireContext())
-            adapter = HelpItemsAdapter { helpItem -> launchHelpScreen(helpItem) }
+            adapter = HelpItemsAdapter { helpItem ->
+                trackHelpItemTappedEvent(helpItem)
+                launchHelpScreen(helpItem)
+            }
         }
     }
 
@@ -83,7 +97,7 @@ class HelpFragment : Fragment() {
                     injectedViewAdapter.setNavButtonType(navType)
                     injectedViewAdapter.setTitle(getString(R.string.gc_title_help))
                     injectedViewAdapter.setOnNavButtonClickListener(IntervalClickListener {
-                        findNavController().navigate(HelpFragmentDirections.toCameraFragment())
+                        navigateBackToCamera()
                     })
                 }
         }
@@ -96,7 +110,7 @@ class HelpFragment : Fragment() {
                 GiniCapture.getInstance().internal().helpNavigationBarBottomAdapterInstance
             ) { injectedViewAdapter ->
                 injectedViewAdapter.setOnBackClickListener(IntervalClickListener {
-                    findNavController().navigate(HelpFragmentDirections.toCameraFragment())
+                    navigateBackToCamera()
                 })
             }
         }
@@ -111,6 +125,47 @@ class HelpFragment : Fragment() {
         }
     }
 
+    private fun navigateBackToCamera() {
+        trackBackTappedEvent()
+        findNavController().navigate(HelpFragmentDirections.toCameraFragment())
+    }
+
+    // region Analytics
+
+    private fun trackHelpOpenEvent() = runCatching {
+        val hasCustomItems = GiniCapture.hasInstance() &&
+                GiniCapture.getInstance().customHelpItems.isNotEmpty()
+
+        val helpItems = helpItemsAdapter.items.map { "\"${getString(it.title)}\"" }
+
+        userAnalyticsEventTracker.trackEvent(
+            UserAnalyticsEvent.SCREEN_SHOWN, setOf(
+                UserAnalyticsEventProperty.Screen(screenName),
+                UserAnalyticsEventProperty.HasCustomItems(hasCustomItems),
+                UserAnalyticsEventProperty.HelpItems(helpItems),
+            )
+        )
+    }
+
+    private fun trackBackTappedEvent() = runCatching {
+        userAnalyticsEventTracker.trackEvent(
+            UserAnalyticsEvent.CLOSE_TAPPED,
+            setOf(UserAnalyticsEventProperty.Screen(screenName))
+        )
+    }
+
+    private fun trackHelpItemTappedEvent(helpItem: HelpItem) = runCatching {
+        userAnalyticsEventTracker.trackEvent(
+            UserAnalyticsEvent.HELP_ITEM_TAPPED,
+            setOf(
+                UserAnalyticsEventProperty.Screen(screenName),
+                UserAnalyticsEventProperty.ItemTapped(getString(helpItem.title))
+            )
+        )
+    }
+
+    // endregion
+
     companion object {
         @JvmStatic
         fun newInstance() = HelpFragment()
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/camera/api/camerax/CameraXController.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/camera/api/camerax/CameraXController.kt
index f76c590713..7ba42658d4 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/camera/api/camerax/CameraXController.kt
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/camera/api/camerax/CameraXController.kt
@@ -135,7 +135,7 @@ internal class CameraXController(val activity: Activity) : CameraInterface {
 
                 val imageAnalysis = ImageAnalysis.Builder()
                     .setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST)
-                    .setTargetResolution(targetResolution)
+                    .setResolutionSelector(resolutionSelector)
                     .setTargetRotation(targetRotation)
                     .build()
                 imageAnalysisUseCase = imageAnalysis
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/camera/photo/ImmutablePhoto.java b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/camera/photo/ImmutablePhoto.java
index e0d9d3f817..136ff2a9ce 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/camera/photo/ImmutablePhoto.java
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/camera/photo/ImmutablePhoto.java
@@ -29,6 +29,7 @@
 class ImmutablePhoto implements Photo {
 
     private static final Logger LOG = LoggerFactory.getLogger(ImmutablePhoto.class);
+    private static final int PREVIEW_SHRINK_WEIGHT = 5_000;
 
     Bitmap mBitmapPreview;
     byte[] mData;
@@ -61,7 +62,11 @@ final Bitmap createPreview() {
         }
 
         final BitmapFactory.Options options = new BitmapFactory.Options();
-        options.inSampleSize = 2;
+        if (mData.length / 1_000 > PREVIEW_SHRINK_WEIGHT) {
+            options.inSampleSize = 8;
+        } else {
+            options.inSampleSize = 2;
+        }
 
         return BitmapFactory.decodeByteArray(mData, 0, mData.length, options);
     }
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/fileimport/FileChooserFragment.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/fileimport/FileChooserFragment.kt
index 996a41d5f0..933241dc85 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/fileimport/FileChooserFragment.kt
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/fileimport/FileChooserFragment.kt
@@ -7,6 +7,7 @@ import android.app.Dialog
 import android.content.Context
 import android.content.Intent
 import android.content.pm.ResolveInfo
+import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.Parcelable
@@ -15,7 +16,9 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.setFragmentResult
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.GridLayoutManager
@@ -30,6 +33,7 @@ import net.gini.android.capture.R
 import net.gini.android.capture.databinding.GcFragmentFileChooserBinding
 import net.gini.android.capture.internal.fileimport.providerchooser.ProvidersAdapter
 import net.gini.android.capture.internal.fileimport.providerchooser.ProvidersAppItem
+import net.gini.android.capture.internal.fileimport.providerchooser.ProvidersAppWrapperItem
 import net.gini.android.capture.internal.fileimport.providerchooser.ProvidersItem
 import net.gini.android.capture.internal.fileimport.providerchooser.ProvidersSectionItem
 import net.gini.android.capture.internal.fileimport.providerchooser.ProvidersSeparatorItem
@@ -40,6 +44,11 @@ import net.gini.android.capture.internal.util.MimeType
 import net.gini.android.capture.internal.util.autoCleared
 import net.gini.android.capture.internal.util.disallowScreenshots
 import net.gini.android.capture.internal.util.getLayoutInflaterWithGiniCaptureTheme
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsEvent
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsEventTracker
+import net.gini.android.capture.tracking.useranalytics.UserAnalytics
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsScreen
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsEventProperty
 
 private const val ARG_DOCUMENT_IMPORT_FILE_TYPES = "GC_EXTRA_IN_DOCUMENT_IMPORT_FILE_TYPES"
 private const val GRID_SPAN_COUNT_PHONE = 3
@@ -52,12 +61,20 @@ class FileChooserFragment : BottomSheetDialogFragment() {
     private var docImportEnabledFileTypes: DocumentImportEnabledFileTypes? = null
     private var binding: GcFragmentFileChooserBinding by autoCleared()
     private var chooseFileLauncher: ActivityResultLauncher<Intent>? = null
+    private var pickMedia: ActivityResultLauncher<PickVisualMediaRequest>? = null
+    private lateinit var mUserAnalyticsEventTracker: UserAnalyticsEventTracker
+    private val screenName: UserAnalyticsScreen = UserAnalyticsScreen.Camera
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        mUserAnalyticsEventTracker =
+            UserAnalytics.getAnalyticsEventTracker()
         arguments?.let {
             docImportEnabledFileTypes = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                it.getSerializable(ARG_DOCUMENT_IMPORT_FILE_TYPES, DocumentImportEnabledFileTypes::class.java)
+                it.getSerializable(
+                    ARG_DOCUMENT_IMPORT_FILE_TYPES,
+                    DocumentImportEnabledFileTypes::class.java
+                )
             } else {
                 it.getSerializable(ARG_DOCUMENT_IMPORT_FILE_TYPES) as? DocumentImportEnabledFileTypes
             }
@@ -97,7 +114,8 @@ class FileChooserFragment : BottomSheetDialogFragment() {
     }
 
     private fun setupFileProvidersView() {
-        binding.gcFileProviders.layoutManager = GridLayoutManager(requireContext(), getGridSpanCount())
+        binding.gcFileProviders.layoutManager =
+            GridLayoutManager(requireContext(), getGridSpanCount())
     }
 
     private fun setupFileChooserListener() {
@@ -139,6 +157,46 @@ class FileChooserFragment : BottomSheetDialogFragment() {
                     })
                 }
         }
+
+        val photoPickType =
+            if (FeatureConfiguration.isMultiPageEnabled()) {
+                ActivityResultContracts.PickMultipleVisualMedia(maxItems = 10)
+            } else {
+                ActivityResultContracts.PickVisualMedia()
+            }
+
+        pickMedia = registerForActivityResult(photoPickType) { activityResultUriList ->
+            findNavController().popBackStack()
+            val resultList = handleUriList(activityResultUriList)
+            setFragmentResult(REQUEST_KEY, Bundle().apply {
+                putParcelable(RESULT_KEY, resultList)
+            })
+        }
+    }
+
+    private fun handleUriList(activityResultUriList: Any?): FileChooserResult {
+        return if (activityResultUriList == null) {
+            FileChooserResult.Cancelled
+        } else {
+            try {
+                val uriList = when(activityResultUriList){
+                    is Uri -> listOf(activityResultUriList)
+                    is List<*> -> {
+                        activityResultUriList.filterIsInstance<Uri>().takeIf {
+                            it.size == activityResultUriList.size
+                        } ?: throw IllegalArgumentException("List contains non-Uri elements")
+                    }
+                    else -> throw IllegalArgumentException("uri is neither Uri nor List<Uri>")
+                }
+                if (uriList.isNotEmpty()) {
+                    FileChooserResult.FilesSelectedUri(uriList)
+                } else {
+                    FileChooserResult.Cancelled
+                }
+            } catch (e: IllegalArgumentException) {
+                FileChooserResult.Error(GiniCaptureError(GiniCaptureError.ErrorCode.DOCUMENT_IMPORT, e.message))
+            }
+        }
     }
 
     private fun getGridSpanCount(): Int =
@@ -151,15 +209,20 @@ class FileChooserFragment : BottomSheetDialogFragment() {
 
     private fun populateFileProviders() {
         val providerItems: MutableList<ProvidersItem> = ArrayList()
-        var imageProviderItems: List<ProvidersItem> = ArrayList()
+        var imageProviderItems: List<ProvidersItem> = arrayListOf()
         var pdfProviderItems: List<ProvidersItem> = ArrayList()
         if (shouldShowImageProviders()) {
             val imagePickerResolveInfos = queryImagePickers(requireContext())
             val imageProviderResolveInfos = queryImageProviders(requireContext())
-            imageProviderItems = getImageProviderItems(
-                imagePickerResolveInfos,
-                imageProviderResolveInfos
-            )
+
+            imageProviderItems =
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &&
+                    ActivityResultContracts.PickVisualMedia.isPhotoPickerAvailable(requireContext())
+                ) {
+                    getPhotoPickerProvider()
+                } else {
+                    getImageProviderItems(imagePickerResolveInfos, imageProviderResolveInfos)
+                }
         }
         if (shouldShowPdfProviders()) {
             val pdfProviderResolveInfos = queryPdfProviders(requireContext())
@@ -172,15 +235,45 @@ class FileChooserFragment : BottomSheetDialogFragment() {
         providerItems.addAll(pdfProviderItems)
         (binding.gcFileProviders.layoutManager as GridLayoutManager).spanSizeLookup =
             ProvidersSpanSizeLookup(providerItems, getGridSpanCount())
-        binding.gcFileProviders.adapter = ProvidersAdapter(requireContext(), providerItems) { item -> launchApp(item) }
+        binding.gcFileProviders.adapter =
+            ProvidersAdapter(requireContext(), providerItems) { item ->
+                if (item in imageProviderItems) {
+                    mUserAnalyticsEventTracker.trackEvent(
+                        UserAnalyticsEvent.UPLOAD_PHOTOS_TAPPED,
+                        setOf(UserAnalyticsEventProperty.Screen(screenName))
+                    )
+
+                } else {
+                    mUserAnalyticsEventTracker.trackEvent(
+                        UserAnalyticsEvent.UPLOAD_DOCUMENTS_TAPPED,
+                        setOf(UserAnalyticsEventProperty.Screen(screenName))
+                    )
+
+                }
+                launchApp(item)
+            }
     }
 
-    private fun launchApp(item: ProvidersAppItem) {
-        item.intent.setClassName(
-            item.resolveInfo.activityInfo.packageName,
-            item.resolveInfo.activityInfo.name
-        )
-        chooseFileLauncher?.launch(item.intent)
+    private fun launchApp(item: ProvidersItem) {
+        when (item) {
+            is ProvidersAppItem -> {
+                item.intent.setClassName(
+                    item.resolveInfo.activityInfo.packageName,
+                    item.resolveInfo.activityInfo.name
+                )
+                chooseFileLauncher?.launch(item.intent)
+            }
+
+            is ProvidersAppWrapperItem -> {
+                pickMedia?.launch(
+                    PickVisualMediaRequest(
+                        ActivityResultContracts.PickVisualMedia.SingleMimeType(
+                            MimeType.IMAGE_WILDCARD.asString()
+                        )
+                    )
+                )
+            }
+        }
     }
 
     private fun getImageProviderItems(
@@ -204,6 +297,23 @@ class FileChooserFragment : BottomSheetDialogFragment() {
         }
     }
 
+    private fun getPhotoPickerProvider(): List<ProvidersItem> {
+        val providerList =
+            ContextCompat.getDrawable(requireContext(), (R.drawable.gc_photo_picker_app_icon))
+                ?.let { image ->
+                    listOf(
+                        ProvidersSectionItem(getString(R.string.gc_file_chooser_fotos_section_header)),
+                        ProvidersAppWrapperItem(
+                            image,
+                            getString(R.string.gc_file_chooser_fotos_section_header)
+                        )
+                    )
+                } ?: run {
+                emptyList()
+            }
+        return providerList
+    }
+
     private fun getPdfProviderItems(pdfProviderResolveInfos: List<ResolveInfo>): List<ProvidersItem> =
         mutableListOf<ProvidersItem>().apply {
             if (pdfProviderResolveInfos.isNotEmpty()) {
@@ -311,6 +421,7 @@ class FileChooserFragment : BottomSheetDialogFragment() {
 @Parcelize
 sealed class FileChooserResult : Parcelable {
     data class FilesSelected(val dataIntent: Intent) : FileChooserResult()
+    data class FilesSelectedUri(val list: List<Uri>) : FileChooserResult()
     data class Error(val error: GiniCaptureError) : FileChooserResult()
     object Cancelled : FileChooserResult()
 }
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/fileimport/providerchooser/ProvidersAdapter.java b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/fileimport/providerchooser/ProvidersAdapter.java
index 7a672cb21f..8728015502 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/fileimport/providerchooser/ProvidersAdapter.java
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/fileimport/providerchooser/ProvidersAdapter.java
@@ -40,12 +40,14 @@ public int getItemViewType(final int position) {
 
     @Override
     public ProvidersItemViewHolder onCreateViewHolder(final ViewGroup parent,
-            final int viewType) {
+                                                      final int viewType) {
         switch (ProvidersItem.FileProviderItemType.fromOrdinal(viewType)) {
             case SECTION:
                 return createSectionItemViewHolder(parent);
             case APP:
-                return createAppItemViewHolder(parent);
+                return createAppItemViewHolder(parent, ProvidersItem.FileProviderItemType.APP);
+            case APP_WRAPPER_PHOTO_PICKER:
+                return createAppItemViewHolder(parent, ProvidersItem.FileProviderItemType.APP_WRAPPER_PHOTO_PICKER);
             case SEPARATOR:
                 return createSeparatorItemViewHolder(parent);
             default:
@@ -62,10 +64,12 @@ private ProvidersItemViewHolder createSectionItemViewHolder(
     }
 
     @NonNull
-    private ProvidersItemViewHolder createAppItemViewHolder(@NonNull final ViewGroup parent) {
+    private ProvidersItemViewHolder createAppItemViewHolder(
+            @NonNull final ViewGroup parent,
+            @NonNull ProvidersItem.FileProviderItemType providerItemType) {
         final View itemView = LayoutInflater.from(parent.getContext())
                 .inflate(R.layout.gc_item_file_provider_app, parent, false);
-        return new ProvidersAppItemViewHolder(itemView);
+        return new ProvidersAppItemViewHolder(itemView, providerItemType);
     }
 
     private ProvidersItemViewHolder createSeparatorItemViewHolder(@NonNull final ViewGroup parent) {
@@ -83,6 +87,9 @@ public void onBindViewHolder(final ProvidersItemViewHolder holder, final int pos
             case APP:
                 bindAppItemViewHolder((ProvidersAppItemViewHolder) holder, position);
                 break;
+            case APP_WRAPPER_PHOTO_PICKER:
+                bindAppWrapperItemViewHolder((ProvidersAppItemViewHolder) holder, position);
+                break;
             case SEPARATOR:
                 break;
             default:
@@ -101,13 +108,22 @@ private void bindAppItemViewHolder(@NonNull final ProvidersAppItemViewHolder hol
         final ProvidersAppItem item = (ProvidersAppItem) mItems.get(position);
         holder.icon.setImageDrawable(item.getResolveInfo().loadIcon(mContext.getPackageManager()));
         holder.label.setText(item.getResolveInfo().loadLabel(mContext.getPackageManager()));
-        holder.itemView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(final View view) {
-                final ProvidersAppItem item =
-                        (ProvidersAppItem) mItems.get(holder.getAdapterPosition());
-                mItemSelectedListener.onItemSelected(item);
-            }
+        holder.itemView.setOnClickListener(view -> {
+            final ProvidersAppItem selectedItem =
+                    (ProvidersAppItem) mItems.get(holder.getAdapterPosition());
+            mItemSelectedListener.onItemSelected(selectedItem);
+        });
+    }
+
+    private void bindAppWrapperItemViewHolder(@NonNull final ProvidersAppItemViewHolder holder,
+                                       final int position) {
+        final ProvidersAppWrapperItem item = (ProvidersAppWrapperItem) mItems.get(position);
+        holder.icon.setImageDrawable(item.getDrawableIcon());
+        holder.label.setText(item.getText());
+        holder.itemView.setOnClickListener(view -> {
+            final ProvidersAppWrapperItem selectedItem =
+                    (ProvidersAppWrapperItem) mItems.get(holder.getAdapterPosition());
+            mItemSelectedListener.onItemSelected(selectedItem);
         });
     }
 
@@ -123,8 +139,8 @@ private static class ProvidersAppItemViewHolder extends ProvidersItemViewHolder
         @NonNull
         final TextView label;
 
-        ProvidersAppItemViewHolder(@NonNull final View itemView) {
-            super(itemView, ProvidersItem.FileProviderItemType.APP);
+        ProvidersAppItemViewHolder(@NonNull final View itemView, @NonNull ProvidersItem.FileProviderItemType providerItemType) {
+            super(itemView, providerItemType);
             icon = itemView.findViewById(R.id.gc_app_icon);
             label = itemView.findViewById(R.id.gc_app_label);
         }
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/fileimport/providerchooser/ProvidersAppItemSelectedListener.java b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/fileimport/providerchooser/ProvidersAppItemSelectedListener.java
index 9324d0de5b..f6e16751ef 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/fileimport/providerchooser/ProvidersAppItemSelectedListener.java
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/fileimport/providerchooser/ProvidersAppItemSelectedListener.java
@@ -9,5 +9,5 @@
  */
 public interface ProvidersAppItemSelectedListener {
 
-    void onItemSelected(@NonNull final ProvidersAppItem item);
+    void onItemSelected(@NonNull final ProvidersItem item);
 }
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/fileimport/providerchooser/ProvidersAppWrapperItem.java b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/fileimport/providerchooser/ProvidersAppWrapperItem.java
new file mode 100644
index 0000000000..7dee3c5b82
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/fileimport/providerchooser/ProvidersAppWrapperItem.java
@@ -0,0 +1,31 @@
+package net.gini.android.capture.internal.fileimport.providerchooser;
+
+import android.graphics.drawable.Drawable;
+
+import androidx.annotation.NonNull;
+
+/**
+ * Internal use only.
+ *
+ * @suppress
+ */
+public class ProvidersAppWrapperItem extends ProvidersItem {
+
+    private final Drawable mIcon;
+    private final String mText;
+
+    public ProvidersAppWrapperItem(@NonNull final Drawable icon, @NonNull final String text) {
+        super(FileProviderItemType.APP_WRAPPER_PHOTO_PICKER);
+        mIcon = icon;
+        mText = text;
+    }
+
+    public Drawable getDrawableIcon() {
+        return mIcon;
+    }
+
+    public String getText() {
+        return mText;
+    }
+
+}
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/fileimport/providerchooser/ProvidersItem.java b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/fileimport/providerchooser/ProvidersItem.java
index 97749a19a3..408c20573b 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/fileimport/providerchooser/ProvidersItem.java
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/fileimport/providerchooser/ProvidersItem.java
@@ -53,7 +53,8 @@ FileProviderItemType getType() {
     enum FileProviderItemType {
         SECTION,
         SEPARATOR,
-        APP;
+        APP,
+        APP_WRAPPER_PHOTO_PICKER;
 
         static FileProviderItemType fromOrdinal(final int ordinal) {
             if (ordinal >= values().length) {
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/network/AmplitudeModels.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/network/AmplitudeModels.kt
new file mode 100644
index 0000000000..ed96ea186a
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/network/AmplitudeModels.kt
@@ -0,0 +1,26 @@
+package net.gini.android.capture.internal.network
+
+data class AmplitudeRoot(
+    val apiKey: String,
+    val events: List<AmplitudeEventModel>,
+)
+
+data class AmplitudeEventModel(
+    val userId: String,
+    val deviceId: String,
+    val eventType: String,
+    val sessionId: String,
+    val eventId: String,
+    val time: Long,
+    val platform: String,
+    val osVersion: String,
+    val deviceManufacturer: String,
+    val deviceBrand: String,
+    val deviceModel: String,
+    val versionName: String,
+    val osName: String,
+    val carrier: String,
+    val language: String,
+    val eventProperties: Map<String, Any>? = null,
+    val userProperties: Map<String, Any>? = null,
+)
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/network/Configuration.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/network/Configuration.kt
new file mode 100644
index 0000000000..5edb11e7fd
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/network/Configuration.kt
@@ -0,0 +1,14 @@
+package net.gini.android.capture.internal.network
+
+import java.util.UUID
+
+data class Configuration(
+    val id: UUID = UUID.randomUUID(),
+    val clientID: String,
+    val isUserJourneyAnalyticsEnabled: Boolean,
+    val isSkontoEnabled: Boolean,
+    val isReturnAssistantEnabled: Boolean,
+    val mixpanelToken: String,
+    val amplitudeApiKey: String,
+
+    )
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/network/ConfigurationNetworkResult.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/network/ConfigurationNetworkResult.kt
new file mode 100644
index 0000000000..206eb5200e
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/network/ConfigurationNetworkResult.kt
@@ -0,0 +1,8 @@
+package net.gini.android.capture.internal.network
+
+import java.util.UUID
+
+data class ConfigurationNetworkResult(
+    val configuration: Configuration,
+    val id: UUID
+)
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/network/NetworkRequestsManager.java b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/network/NetworkRequestsManager.java
index 6794644559..151bb252e4 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/network/NetworkRequestsManager.java
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/network/NetworkRequestsManager.java
@@ -2,7 +2,7 @@
 
 /**
  * Created by Alpar Szotyori on 13.04.2018.
- *
+ * <p>
  * Copyright (c) 2018 Gini GmbH.
  */
 
@@ -35,6 +35,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import java.util.concurrent.CancellationException;
 
 import jersey.repackaged.jsr166e.CompletableFuture;
@@ -55,20 +56,142 @@ public class NetworkRequestsManager {
             mDocumentDeleteFutures;
     private final Map<String, CompletableFuture<
             AnalysisNetworkRequestResult<GiniCaptureMultiPageDocument>>> mDocumentAnalyzeFutures;
+    private final Map<UUID, CompletableFuture<ConfigurationNetworkResult>> mConfigurationFutures;
+    private final Map<UUID, CompletableFuture<String>> mUserJourneyEventsFutures;
 
     private final GiniCaptureNetworkService mGiniCaptureNetworkService;
     private final DocumentDataMemoryCache mDocumentDataMemoryCache;
 
     public NetworkRequestsManager(@NonNull final GiniCaptureNetworkService giniCaptureNetworkService,
-            @NonNull final DocumentDataMemoryCache documentDataMemoryCache) {
+                                  @NonNull final DocumentDataMemoryCache documentDataMemoryCache) {
         mGiniCaptureNetworkService = giniCaptureNetworkService;
         mDocumentDataMemoryCache = documentDataMemoryCache;
         mApiDocumentIds = new HashMap<>();
         mDocumentUploadFutures = new HashMap<>();
         mDocumentDeleteFutures = new HashMap<>();
         mDocumentAnalyzeFutures = new HashMap<>();
+        mConfigurationFutures = new HashMap<>();
+        mUserJourneyEventsFutures = new HashMap<>();
+    }
+
+
+    public CompletableFuture<String> sendEvents(AmplitudeRoot amplitudeRoot, UUID id) {
+
+        final CompletableFuture<String> userJourneyEventsFutures =
+                mUserJourneyEventsFutures.get(id);
+        if (userJourneyEventsFutures != null) {
+            return userJourneyEventsFutures;
+        }
+
+        final CompletableFuture<String> future =
+                new CompletableFuture<>();
+        mUserJourneyEventsFutures.put(id, future);
+
+        final CancellationToken cancellationToken =
+                mGiniCaptureNetworkService.sendEvents(amplitudeRoot,
+                        new GiniCaptureNetworkCallback<Void, Error>() {
+                            @Override
+                            public void failure(final Error error) {
+                                LOG.error("Send events failed for {}",
+                                        error.getMessage());
+                                ErrorType errorType = ErrorType.typeFromError(error);
+                                future.completeExceptionally(new FailureException(errorType));
+                            }
+
+                            @Override
+                            public void success(final Void result) {
+                                LOG.debug("Send events success for {}:",
+                                        result);
+                                future.complete(null);
+                            }
+
+                            @Override
+                            public void cancelled() {
+                                LOG.debug("Send events cancelled for");
+                                future.cancel(false);
+
+                            }
+                        });
+
+        future.handle(
+                (requestResult, throwable) -> {
+                    if (throwable != null) {
+                        if (isCancellation(throwable)) {
+                            cancellationToken.cancel();
+                        } else {
+                            ErrorLogger.log(new ErrorLog("Send events failed", throwable));
+                        }
+                    } else if (requestResult != null) {
+                        mUserJourneyEventsFutures.remove(id);
+                    }
+                    mUserJourneyEventsFutures.remove(id);
+                    return requestResult;
+                });
+
+        return future;
     }
 
+    public CompletableFuture<ConfigurationNetworkResult> getConfigurations(UUID id) {
+
+        final CompletableFuture<ConfigurationNetworkResult> configurationFuture =
+                mConfigurationFutures.get(id);
+        if (configurationFuture != null) {
+            return configurationFuture;
+        }
+
+        final CompletableFuture<ConfigurationNetworkResult> future =
+                new CompletableFuture<>();
+        mConfigurationFutures.put(id, future);
+
+        final CancellationToken cancellationToken =
+                mGiniCaptureNetworkService.getConfiguration(
+                        new GiniCaptureNetworkCallback<Configuration, Error>() {
+                            @Override
+                            public void failure(final Error error) {
+                                LOG.error("Get configuration failed for {}: {}",
+                                        id,
+                                        error.getMessage());
+                                ErrorType errorType = ErrorType.typeFromError(error);
+                                future.completeExceptionally(new FailureException(errorType));
+                            }
+
+                            @Override
+                            public void success(final Configuration result) {
+                                LOG.debug("Get configuration success for {}: {}",
+                                        id,
+                                        result);
+                                future.complete(new ConfigurationNetworkResult(result,
+                                        result.getId()));
+                            }
+
+                            @Override
+                            public void cancelled() {
+                                LOG.debug("Get configuration cancelled for {}",
+                                        id);
+                                future.cancel(false);
+
+                            }
+                        });
+
+        future.handle(
+                (requestResult, throwable) -> {
+                    if (throwable != null) {
+                        if (isCancellation(throwable)) {
+                            cancellationToken.cancel();
+                        } else {
+                            ErrorLogger.log(new ErrorLog("Getting configuration failed", throwable));
+                        }
+                    } else if (requestResult != null) {
+                        mConfigurationFutures.remove(id);
+                    }
+                    mConfigurationFutures.remove(id);
+                    return requestResult;
+                });
+
+        return future;
+    }
+
+
     public CompletableFuture<NetworkRequestResult<GiniCaptureDocument>> upload(
             @NonNull final Context context,
             @NonNull final GiniCaptureDocument document) {
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/provider/UniqueIdProvider.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/provider/UniqueIdProvider.kt
new file mode 100644
index 0000000000..4cb65de3f4
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/provider/UniqueIdProvider.kt
@@ -0,0 +1,22 @@
+package net.gini.android.capture.internal.provider
+
+import android.content.Context
+import java.util.UUID
+
+internal class UniqueIdProvider(context: Context) {
+
+    companion object {
+        private const val SP_NAME = "InstallationIdPref"
+    }
+
+    private val sp = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE)
+
+    fun getUniqueId(key: String): String = sp.getString(
+        key, null
+    ) ?: UUID.randomUUID().toString().also { setUniqueId(it, key) }
+
+
+    private fun setUniqueId(installationId: String, key: String) {
+        sp.edit().putString(key, installationId).apply()
+    }
+}
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/ui/FragmentImplCallback.java b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/ui/FragmentImplCallback.java
index b3e563c6f2..25918069e7 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/ui/FragmentImplCallback.java
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/ui/FragmentImplCallback.java
@@ -1,6 +1,5 @@
 package net.gini.android.capture.internal.ui;
 
-import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.view.View;
@@ -13,6 +12,10 @@
 import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.navigation.NavController;
+import androidx.navigation.NavDirections;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Internal use only.
@@ -54,4 +57,13 @@ void showAlertDialog(@NonNull final String message,
     @NonNull
     NavController findNavController();
 
+    @NonNull
+    default void safeNavigate(@NonNull final NavDirections navDirections) {
+        try {
+            findNavController().navigate(navDirections);
+        } catch (Exception exception) {
+            Logger logger = LoggerFactory.getLogger(FragmentImplCallback.class);
+            logger.error("Navigation exception " + exception.getMessage());
+        }
+    }
 }
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/network/GiniCaptureNetworkService.java b/capture-sdk/sdk/src/main/java/net/gini/android/capture/network/GiniCaptureNetworkService.java
index 57a0423a5f..bed7c267e8 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/network/GiniCaptureNetworkService.java
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/network/GiniCaptureNetworkService.java
@@ -6,7 +6,8 @@
 
 import net.gini.android.capture.Document;
 import net.gini.android.capture.GiniCapture;
-import net.gini.android.capture.analysis.AnalysisFragmentListener;
+import net.gini.android.capture.internal.network.AmplitudeRoot;
+import net.gini.android.capture.internal.network.Configuration;
 import net.gini.android.capture.logging.ErrorLog;
 import net.gini.android.capture.logging.ErrorLoggerListener;
 import net.gini.android.capture.network.model.GiniCaptureCompoundExtraction;
@@ -110,6 +111,14 @@ void sendFeedback(@NonNull final Map<String, GiniCaptureSpecificExtraction> extr
      */
     void cleanup();
 
+    default CancellationToken getConfiguration(@NonNull final GiniCaptureNetworkCallback<Configuration, Error> callback) {
+        return null;
+    }
+
+    default CancellationToken sendEvents(@NonNull final AmplitudeRoot amplitudeRoot, @NonNull final GiniCaptureNetworkCallback<Void, Error> callback) {
+        return null;
+    }
+
     @Override
     default void handleErrorLog(@NonNull ErrorLog errorLog) {
     }
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/noresults/NoResultsFragmentImpl.java b/capture-sdk/sdk/src/main/java/net/gini/android/capture/noresults/NoResultsFragmentImpl.java
index e6924a621b..1168354846 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/noresults/NoResultsFragmentImpl.java
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/noresults/NoResultsFragmentImpl.java
@@ -10,6 +10,7 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -25,13 +26,21 @@
 import net.gini.android.capture.internal.ui.ClickListenerExtKt;
 import net.gini.android.capture.internal.ui.FragmentImplCallback;
 import net.gini.android.capture.internal.ui.IntervalClickListener;
-import net.gini.android.capture.tracking.AnalysisScreenEvent;
 import net.gini.android.capture.internal.util.CancelListener;
+import net.gini.android.capture.tracking.AnalysisScreenEvent;
+import net.gini.android.capture.tracking.useranalytics.UserAnalytics;
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsEvent;
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsEventTracker;
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsMappersKt;
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsScreen;
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsEventProperty;
 import net.gini.android.capture.view.InjectedViewAdapterHolder;
 import net.gini.android.capture.view.InjectedViewContainer;
 import net.gini.android.capture.view.NavButtonType;
 import net.gini.android.capture.view.NavigationBarTopAdapter;
 
+import java.util.HashSet;
+
 /**
  * Main logic implementation for no results UI presented by {@link NoResultsFragment}.
  * Internal use only.
@@ -47,8 +56,10 @@ class NoResultsFragmentImpl {
     private final CancelListener mCancelListener;
     private EnterManuallyButtonListener mListener;
     private TextView mTitleTextView;
+    private UserAnalyticsEventTracker mUserAnalyticsEventTracker;
 
     private InjectedViewContainer<NavigationBarTopAdapter> topAdapterInjectedViewContainer;
+    private final UserAnalyticsScreen screenName = UserAnalyticsScreen.NoResults.INSTANCE;
 
     NoResultsFragmentImpl(@NonNull final FragmentImplCallback fragment,
                           @NonNull final Document document,
@@ -79,11 +90,27 @@ View onCreateView(final LayoutInflater inflater, final ViewGroup container,
                       final Bundle savedInstanceState) {
         final View view = inflater.inflate(R.layout.gc_fragment_noresults, container, false);
         final View retakeImagesButton = view.findViewById(R.id.gc_button_no_results_retake_images);
+        handleOnBackPressed();
+        mUserAnalyticsEventTracker = UserAnalytics.INSTANCE.getAnalyticsEventTracker();
+        mUserAnalyticsEventTracker.trackEvent(UserAnalyticsEvent.SCREEN_SHOWN,
+                new HashSet<UserAnalyticsEventProperty>() {
+                    {
+                        add(new UserAnalyticsEventProperty.Screen(screenName));
+                        add(new UserAnalyticsEventProperty.DocumentId(mDocument.getId()));
+                        add(new UserAnalyticsEventProperty.DocumentType(UserAnalyticsMappersKt.mapToAnalyticsDocumentType(mDocument)));
+                    }
+                }
+        );
         if (shouldAllowRetakeImages()) {
             ClickListenerExtKt.setIntervalClickListener(retakeImagesButton, v -> {
+                mUserAnalyticsEventTracker.trackEvent(UserAnalyticsEvent.RETAKE_IMAGES_TAPPED,
+                        new HashSet<UserAnalyticsEventProperty>() {
+                            {
+                                add(new UserAnalyticsEventProperty.Screen(screenName));
+                            }
+                        });
                 trackAnalysisScreenEvent(AnalysisScreenEvent.RETRY);
                 mFragment.findNavController().navigate(NoResultsFragmentDirections.toCameraFragment());
-
             });
         } else {
             retakeImagesButton.setVisibility(GONE);
@@ -91,6 +118,12 @@ View onCreateView(final LayoutInflater inflater, final ViewGroup container,
 
         final View enterManuallyButton = view.findViewById(R.id.gc_button_no_results_enter_manually);
         ClickListenerExtKt.setIntervalClickListener(enterManuallyButton, v -> {
+            mUserAnalyticsEventTracker.trackEvent(UserAnalyticsEvent.ENTER_MANUALLY_TAPPED,
+                    new HashSet<UserAnalyticsEventProperty>() {
+                        {
+                            add(new UserAnalyticsEventProperty.Screen(screenName));
+                        }
+                    });
             mListener.onEnterManuallyPressed();
         });
 
@@ -106,6 +139,22 @@ View onCreateView(final LayoutInflater inflater, final ViewGroup container,
         return view;
     }
 
+    private void handleOnBackPressed() {
+        mFragment.getActivity().getOnBackPressedDispatcher().addCallback(mFragment.getViewLifecycleOwner(), new OnBackPressedCallback(true) {
+            @Override
+            public void handleOnBackPressed() {
+                mUserAnalyticsEventTracker.trackEvent(UserAnalyticsEvent.CLOSE_TAPPED,
+                        new HashSet<UserAnalyticsEventProperty>() {
+                            {
+                                add(new UserAnalyticsEventProperty.Screen(screenName));
+                            }
+                        });
+                remove();
+
+            }
+        });
+    }
+
     private boolean isDocumentFromCameraScreen(Document document) {
         return document.getImportMethod() != Document.ImportMethod.OPEN_WITH && document.getSource().getName().equals("camera");
     }
@@ -158,6 +207,12 @@ private void setTopBarInjectedViewContainer() {
                         injectedViewAdapter.setNavButtonType(NavButtonType.CLOSE);
                         injectedViewAdapter.setOnNavButtonClickListener(new IntervalClickListener(view -> {
                             if (mFragment.getActivity() != null) {
+                                mUserAnalyticsEventTracker.trackEvent(UserAnalyticsEvent.CLOSE_TAPPED,
+                                        new HashSet<UserAnalyticsEventProperty>() {
+                                            {
+                                                add(new UserAnalyticsEventProperty.Screen(screenName));
+                                            }
+                                        });
                                 mCancelListener.onCancelFlow();
                             }
                         }));
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/onboarding/OnboardingScreenPresenter.java b/capture-sdk/sdk/src/main/java/net/gini/android/capture/onboarding/OnboardingScreenPresenter.java
index 65b4789028..f68290b029 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/onboarding/OnboardingScreenPresenter.java
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/onboarding/OnboardingScreenPresenter.java
@@ -4,28 +4,43 @@
 
 import android.app.Activity;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.annotation.VisibleForTesting;
+
 import net.gini.android.capture.GiniCapture;
-import net.gini.android.capture.GiniCaptureError;
+import net.gini.android.capture.R;
 import net.gini.android.capture.internal.util.FeatureConfiguration;
 import net.gini.android.capture.tracking.OnboardingScreenEvent;
+import net.gini.android.capture.tracking.useranalytics.UserAnalytics;
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsEvent;
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsEventProperty;
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsScreen;
 
+import java.util.HashSet;
 import java.util.List;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
+import java.util.Set;
 
 /**
  * Created by Alpar Szotyori on 20.05.2019.
- *
+ * <p>
  * Copyright (c) 2019 Gini GmbH.
  */
 class OnboardingScreenPresenter extends OnboardingScreenContract.Presenter {
 
     private List<OnboardingPage> mPages;
     private int mCurrentPageIndex;
+    // used only for user analytics tracking
+    private InteractionType mInteractionType = InteractionType.SWIPED;
+
+    private enum InteractionType {
+        SWIPED,
+        TAPPED
+    }
+
 
     OnboardingScreenPresenter(@NonNull final Activity activity,
-            @NonNull final OnboardingScreenContract.View view) {
+                              @NonNull final OnboardingScreenContract.View view) {
         super(activity, view);
         view.setPresenter(this);
         mPages = getDefaultPages();
@@ -43,6 +58,7 @@ void setCustomPages(@NonNull final List<OnboardingPage> pages) {
     @Override
     public void showNextPage() {
         if (isOnLastPage()) {
+            addUserAnalyticsEvent(mCurrentPageIndex, UserAnalyticsEvent.GET_STARTED_TAPPED);
             getView().close();
             trackOnboardingScreenEvent(OnboardingScreenEvent.FINISH);
         } else {
@@ -50,8 +66,10 @@ public void showNextPage() {
         }
     }
 
+
     @Override
     public void skip() {
+        addUserAnalyticsEvent(mCurrentPageIndex, UserAnalyticsEvent.SKIP_TAPPED);
         getView().close();
         trackOnboardingScreenEvent(OnboardingScreenEvent.FINISH);
     }
@@ -61,6 +79,8 @@ private boolean isOnLastPage() {
     }
 
     private void scrollToNextPage() {
+        addUserAnalyticsEvent(mCurrentPageIndex, UserAnalyticsEvent.NEXT_STEP_TAPPED);
+        mInteractionType = InteractionType.TAPPED;
         final int nextPageIndex = mCurrentPageIndex + 1;
         if (nextPageIndex < mPages.size()) {
             getView().scrollToPage(nextPageIndex);
@@ -69,9 +89,54 @@ private void scrollToNextPage() {
 
     @Override
     void onScrolledToPage(final int pageIndex) {
+        if (mInteractionType == InteractionType.SWIPED) {
+            addUserAnalyticsEvent(mCurrentPageIndex, UserAnalyticsEvent.PAGE_SWIPED);
+        }
+        addUserAnalyticsEvent(pageIndex, UserAnalyticsEvent.SCREEN_SHOWN);
         mCurrentPageIndex = pageIndex;
         getView().activatePageIndicatorForPage(mCurrentPageIndex);
         updateButtons();
+        mInteractionType = InteractionType.SWIPED;
+    }
+
+    private void addUserAnalyticsEvent(int pageIndex, UserAnalyticsEvent event) {
+        List<OnboardingPage> customPages = null;
+        if (GiniCapture.hasInstance()) {
+            customPages = GiniCapture.getInstance().getCustomOnboardingPages();
+        }
+
+        boolean hasCustomItems = customPages != null && !customPages.isEmpty();
+        Set<UserAnalyticsEventProperty> eventProperties = new HashSet<>();
+
+        if (event == UserAnalyticsEvent.SCREEN_SHOWN) {
+            eventProperties.add(new UserAnalyticsEventProperty.OnboardingHasCustomItems(hasCustomItems));
+        }
+        if (hasCustomItems) {
+            eventProperties.add(
+                    new UserAnalyticsEventProperty.CustomOnboardingTitle(String.valueOf(mPages.get(pageIndex).getTitleResId()))
+            );
+            eventProperties.add(new UserAnalyticsEventProperty.Screen(new UserAnalyticsScreen.OnBoarding.Custom(pageIndex)));
+            UserAnalytics.INSTANCE.getAnalyticsEventTracker().trackEvent(
+                    event,
+                    eventProperties
+            );
+        } else {
+            eventProperties.add(new UserAnalyticsEventProperty.Screen(getOnBoardingEventScreenName(mPages.get(pageIndex).getTitleResId())));
+            UserAnalytics.INSTANCE.getAnalyticsEventTracker().trackEvent(event, eventProperties);
+        }
+    }
+
+    private UserAnalyticsScreen.OnBoarding getOnBoardingEventScreenName(@StringRes int titleResId) {
+        if (titleResId == R.string.gc_onboarding_qr_code_title) {
+            return UserAnalyticsScreen.OnBoarding.QrCode.INSTANCE;
+        }
+        if (titleResId == R.string.gc_onboarding_multipage_title) {
+            return UserAnalyticsScreen.OnBoarding.MultiplePages.INSTANCE;
+        }
+        if (titleResId == R.string.gc_onboarding_lighting_title) {
+            return UserAnalyticsScreen.OnBoarding.Lighting.INSTANCE;
+        }
+        return UserAnalyticsScreen.OnBoarding.FlatPaper.INSTANCE;
     }
 
     private void updateButtons() {
@@ -105,6 +170,7 @@ public void start() {
         updateButtons();
 
         trackOnboardingScreenEvent(OnboardingScreenEvent.START);
+        addUserAnalyticsEvent(mCurrentPageIndex, UserAnalyticsEvent.SCREEN_SHOWN);
     }
 
     private void setupNavigationBarBottom() {
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/review/multipage/MultiPageReviewFragment.java b/capture-sdk/sdk/src/main/java/net/gini/android/capture/review/multipage/MultiPageReviewFragment.java
index bfa16c24d8..6d81ec007c 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/review/multipage/MultiPageReviewFragment.java
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/review/multipage/MultiPageReviewFragment.java
@@ -48,6 +48,7 @@
 import net.gini.android.capture.internal.ui.ClickListenerExtKt;
 import net.gini.android.capture.internal.ui.IntervalClickListener;
 import net.gini.android.capture.internal.util.AlertDialogHelperCompat;
+import net.gini.android.capture.internal.util.CancelListener;
 import net.gini.android.capture.internal.util.FileImportHelper;
 import net.gini.android.capture.review.multipage.previews.MiddlePageManager;
 import net.gini.android.capture.review.multipage.previews.PreviewFragmentListener;
@@ -56,7 +57,12 @@
 import net.gini.android.capture.tracking.AnalysisScreenEvent;
 import net.gini.android.capture.tracking.ReviewScreenEvent;
 import net.gini.android.capture.tracking.ReviewScreenEvent.UPLOAD_ERROR_DETAILS_MAP_KEY;
-import net.gini.android.capture.internal.util.CancelListener;
+import net.gini.android.capture.tracking.useranalytics.UserAnalytics;
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsEvent;
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsEventTracker;
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsEventProperty;
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsScreen;
+import net.gini.android.capture.util.recyclerview.SnappedItemChangeRecyclerViewListener;
 import net.gini.android.capture.view.InjectedViewAdapterHolder;
 import net.gini.android.capture.view.InjectedViewContainer;
 import net.gini.android.capture.view.NavButtonType;
@@ -67,6 +73,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 
 import jersey.repackaged.jsr166e.CompletableFuture;
@@ -116,6 +123,11 @@ public class MultiPageReviewFragment extends Fragment implements PreviewFragment
     private int mScrollToPosition = -1;
     private final String KEY_SHOULD_SCROLL_TO_LAST_PAGE = "GC_SHOULD_SCROLL_TO_LAST_PAGE";
     private final String KEY_SCROLL_TO_POSITION = "GC_SHOULD_SCROLL_TO_LAST_PAGE";
+    private UserAnalyticsEventTracker mUserAnalyticsEventTracker;
+
+    private final UserAnalyticsScreen screenName = UserAnalyticsScreen.Review.INSTANCE;
+
+    private SnappedItemChangeRecyclerViewListener mAnalyticsPageScrolledListener;
 
     public static MultiPageReviewFragment newInstance() {
 
@@ -135,13 +147,26 @@ public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         forcePortraitOrientationOnPhones(getActivity());
-
+        mUserAnalyticsEventTracker = UserAnalytics.INSTANCE.getAnalyticsEventTracker();
+        mUserAnalyticsEventTracker.trackEvent(UserAnalyticsEvent.SCREEN_SHOWN,
+                new HashSet<UserAnalyticsEventProperty>() {
+                    {
+                        add(new UserAnalyticsEventProperty.Screen(screenName));
+                    }
+                });
         OnBackPressedCallback callback = new OnBackPressedCallback(true /* enabled by default */) {
             @Override
             public void handleOnBackPressed() {
-                onBack();
+                trackReviewScreenEvent(ReviewScreenEvent.BACK);
+                mUserAnalyticsEventTracker.trackEvent(UserAnalyticsEvent.CLOSE_TAPPED,
+                        new HashSet<UserAnalyticsEventProperty>() {
+                            {
+                                add(new UserAnalyticsEventProperty.Screen(screenName));
+                            }
+                        });
                 setEnabled(false);
                 remove();
+                onBack();
             }
         };
         requireActivity().getOnBackPressedDispatcher().addCallback(this, callback);
@@ -328,6 +353,10 @@ private void initRecyclerView() {
         mRecyclerView.setHasFixedSize(true);
         mRecyclerView.setAdapter(mPreviewPagesAdapter);
 
+        mAnalyticsPageScrolledListener = new SnappedItemChangeRecyclerViewListener(mSnapHelper, pos -> {
+            trackPageSwipedAnalyticsEvent();
+            return Unit.INSTANCE;
+        });
 
         mRecyclerView.postDelayed(this::attachScrollListener, 200);
 
@@ -337,6 +366,10 @@ private void initRecyclerView() {
     //Smooth scroll needed when starting screen
     //Ordinary scroll needed when screen rotated
     private void scrollToCorrectPosition(int mSnapViewPosition, boolean isSmooth) {
+        // Notify listener about ongoing programmatic scrolling.
+        // Programmatic scroll detection should be skipped
+        mAnalyticsPageScrolledListener.skipNextEventDetection();
+
         mRecyclerView.post(() -> {
             if (!isSmooth)
                 mRecyclerView.scrollToPosition(mSnapViewPosition);
@@ -364,7 +397,6 @@ public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newStat
                         int position = mRecyclerView.getChildAdapterPosition(viewAtPosition);
                         updateTabIndicatorPosition(position);
                         setScrollToPosition(position);
-
                         if (position < mMultiPageDocument.getDocuments().size() - 1)
                             mShouldScrollToLastPage = false;
                     }
@@ -395,6 +427,8 @@ public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
         if (mMultiPageDocument.getDocuments().size() == 1) {
             mRecyclerView.post(() -> showHideBlueRect(View.VISIBLE));
         }
+
+        mRecyclerView.addOnScrollListener(mAnalyticsPageScrolledListener);
     }
 
 
@@ -440,6 +474,12 @@ private void setReviewNavigationBarBottomAdapter(View view) {
                     GiniCapture.getInstance().internal().getReviewNavigationBarBottomAdapterInstance(),
                     injectedViewAdapter -> {
                         injectedViewAdapter.setOnAddPageButtonClickListener(new IntervalClickListener(v -> {
+                            mUserAnalyticsEventTracker.trackEvent(UserAnalyticsEvent.ADD_PAGES_TAPPED,
+                                    new HashSet<UserAnalyticsEventProperty>() {
+                                        {
+                                            add(new UserAnalyticsEventProperty.Screen(screenName));
+                                        }
+                                    });
                             NavHostFragment.findNavController(this).navigate(MultiPageReviewFragmentDirections.toCameraFragmentForAddingPages());
                         }));
 
@@ -518,9 +558,14 @@ private void setupTopNavigationBar() {
                         injectedViewAdapter.setNavButtonType(NavButtonType.CLOSE);
 
                         injectedViewAdapter.setOnNavButtonClickListener(new IntervalClickListener(v -> {
-                            if (getActivity() != null) {
-                                onBack();
-                            }
+                            trackReviewScreenEvent(ReviewScreenEvent.BACK);
+                            mUserAnalyticsEventTracker.trackEvent(UserAnalyticsEvent.CLOSE_TAPPED,
+                                    new HashSet<UserAnalyticsEventProperty>() {
+                                        {
+                                            add(new UserAnalyticsEventProperty.Screen(screenName));
+                                        }
+                                    });
+                            onBack();
                         }));
                     }));
         }
@@ -535,6 +580,12 @@ private void setInputHandlers() {
         }
 
         ClickListenerExtKt.setIntervalClickListener(mAddPagesButton, v -> {
+            mUserAnalyticsEventTracker.trackEvent(UserAnalyticsEvent.ADD_PAGES_TAPPED,
+                    new HashSet<UserAnalyticsEventProperty>() {
+                        {
+                            add(new UserAnalyticsEventProperty.Screen(screenName));
+                        }
+                    });
             NavHostFragment.findNavController(this).navigate(MultiPageReviewFragmentDirections.toCameraFragmentForAddingPages());
         });
     }
@@ -633,6 +684,9 @@ private void updateNextButtonVisibility() {
                 break;
             }
         }
+        if (!uploadFailed) {
+            hideIndicator();
+        }
         setNextButtonEnabled(!uploadFailed);
     }
 
@@ -661,6 +715,16 @@ private void setNextButtonEnabled(final boolean enabled) {
     @VisibleForTesting
     void onNextButtonClicked() {
         trackReviewScreenEvent(ReviewScreenEvent.NEXT);
+        mUserAnalyticsEventTracker.trackEvent(
+                UserAnalyticsEvent.PROCEED_TAPPED,
+                new HashSet<UserAnalyticsEventProperty>() {
+                    {
+                        add(new UserAnalyticsEventProperty.Screen(screenName));
+                        add(new UserAnalyticsEventProperty
+                                .DocumentPageNumber(mMultiPageDocument.getDocuments().size()));
+                    }
+                }
+        );
         mNextClicked = true;
         NavHostFragment.findNavController(this).navigate(MultiPageReviewFragmentDirections.toAnalysisFragment(mMultiPageDocument, ""));
     }
@@ -754,7 +818,6 @@ void uploadDocument(final ImageDocument document) {
                         }
 
                     } else if (requestResult != null) {
-                        hideIndicator();
                         mDocumentUploadResults.put(document.getId(), true);
                     }
                     updateNextButtonVisibility();
@@ -940,7 +1003,6 @@ private void clearMultiPageDocument() {
     private void onBack() {
         boolean popBackStack = NavHostFragment.findNavController(this).popBackStack();
         if (!popBackStack) {
-            trackReviewScreenEvent(ReviewScreenEvent.BACK);
             mCancelListener.onCancelFlow();
         }
     }
@@ -957,7 +1019,21 @@ public void onDeleteDocument(@NonNull final ImageDocument document) {
 
     @Override
     public void onPageClicked(@NonNull ImageDocument document) {
-        NavHostFragment.findNavController(this).navigate( MultiPageReviewFragmentDirections.toZoomInPreviewFragment(document));
+        mUserAnalyticsEventTracker.trackEvent(UserAnalyticsEvent.FULL_SCREEN_PAGE_TAPPED,
+                new HashSet<UserAnalyticsEventProperty>() {
+                    {
+                        add(new UserAnalyticsEventProperty.Screen(screenName));
+                    }
+                });
+        NavHostFragment.findNavController(this).navigate(MultiPageReviewFragmentDirections.toZoomInPreviewFragment(document));
     }
 
+    private void trackPageSwipedAnalyticsEvent() {
+        UserAnalytics.INSTANCE.getAnalyticsEventTracker().trackEvent(UserAnalyticsEvent.PAGE_SWIPED,
+                new HashSet<UserAnalyticsEventProperty>() {
+                    {
+                        add(new UserAnalyticsEventProperty.Screen(screenName));
+                    }
+                });
+    }
 }
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/review/multipage/previews/PreviewPagesAdapter.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/review/multipage/previews/PreviewPagesAdapter.kt
index c218c4a854..feb26252fe 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/review/multipage/previews/PreviewPagesAdapter.kt
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/review/multipage/previews/PreviewPagesAdapter.kt
@@ -3,7 +3,8 @@ package net.gini.android.capture.review.multipage.previews
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.*
+import android.widget.ImageButton
+import android.widget.ImageView
 import androidx.recyclerview.widget.RecyclerView
 import net.gini.android.capture.AsyncCallback
 import net.gini.android.capture.GiniCapture
@@ -13,6 +14,10 @@ import net.gini.android.capture.document.ImageMultiPageDocument
 import net.gini.android.capture.internal.camera.photo.Photo
 import net.gini.android.capture.internal.ui.setIntervalClickListener
 import net.gini.android.capture.review.RotatableImageViewContainer
+import net.gini.android.capture.tracking.useranalytics.UserAnalytics.getAnalyticsEventTracker
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsEvent
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsScreen
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsEventProperty
 
 class PreviewPagesAdapter(
     private val multiPageDocument: ImageMultiPageDocument,
@@ -22,12 +27,18 @@ class PreviewPagesAdapter(
 
     inner class PagesViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
 
-        val mImageViewContainer: RotatableImageViewContainer? = view.findViewById(R.id.gc_image_container)
+        val mImageViewContainer: RotatableImageViewContainer? =
+            view.findViewById(R.id.gc_image_container)
         private val mDeletePage: ImageButton? = view.findViewById(R.id.gc_button_delete)
+        private val screenName: UserAnalyticsScreen = UserAnalyticsScreen.Review
 
         init {
 
             mDeletePage?.setIntervalClickListener {
+                getAnalyticsEventTracker().trackEvent(
+                    UserAnalyticsEvent.DELETE_PAGES_TAPPED,
+                    setOf(UserAnalyticsEventProperty.Screen(screenName))
+                )
                 previewFragmentListener.onDeleteDocument(multiPageDocument.documents[absoluteAdapterPosition])
             }
 
@@ -59,7 +70,10 @@ class PreviewPagesAdapter(
 
                     override fun onSuccess(result: Photo?) {
                         holder.mImageViewContainer?.imageView?.setImageBitmap(result?.bitmapPreview)
-                        holder.mImageViewContainer?.rotateImageView(result?.rotationForDisplay ?: 0, false);
+                        holder.mImageViewContainer?.rotateImageView(
+                            result?.rotationForDisplay ?: 0,
+                            false
+                        )
                     }
 
                     override fun onError(exception: Exception?) {
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/review/zoom/ZoomInPreviewFragment.java b/capture-sdk/sdk/src/main/java/net/gini/android/capture/review/zoom/ZoomInPreviewFragment.java
index 7053873752..ea74f81594 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/review/zoom/ZoomInPreviewFragment.java
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/review/zoom/ZoomInPreviewFragment.java
@@ -8,6 +8,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
@@ -19,6 +20,12 @@
 import net.gini.android.capture.document.ImageDocument;
 import net.gini.android.capture.internal.camera.photo.Photo;
 import net.gini.android.capture.review.RotatableTouchImageViewContainer;
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsEvent;
+import net.gini.android.capture.tracking.useranalytics.UserAnalytics;
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsScreen;
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsEventProperty;
+
+import java.util.HashSet;
 
 public class ZoomInPreviewFragment extends Fragment {
 
@@ -26,6 +33,7 @@ public class ZoomInPreviewFragment extends Fragment {
     private ImageDocument mImageDocument;
 
     private RotatableTouchImageViewContainer mRotatableTouchImageViewContainer;
+    private final UserAnalyticsScreen screenName = UserAnalyticsScreen.ReviewZoom.INSTANCE;
 
     public static ZoomInPreviewFragment newInstance(ImageDocument imageDocument) {
         Bundle args = new Bundle();
@@ -55,13 +63,45 @@ public LayoutInflater onGetLayoutInflater(@Nullable Bundle savedInstanceState) {
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         final View view = inflater.inflate(R.layout.gc_fragment_zoom_in_preview, container, false);
         setupInputHandlers(view);
+        UserAnalytics.INSTANCE.getAnalyticsEventTracker().trackEvent(UserAnalyticsEvent.SCREEN_SHOWN,
+                new HashSet<UserAnalyticsEventProperty>() {
+                    {
+                        add(new UserAnalyticsEventProperty.Screen(screenName));
+                    }
+                });
         return view;
     }
 
     private void setupInputHandlers(View view) {
-        view.findViewById(R.id.gc_action_close).setOnClickListener(v -> NavHostFragment.findNavController(this).popBackStack());
+        view.findViewById(R.id.gc_action_close).setOnClickListener(v -> {
+            UserAnalytics.INSTANCE.getAnalyticsEventTracker().trackEvent(UserAnalyticsEvent.CLOSE_TAPPED,
+                    new HashSet<UserAnalyticsEventProperty>() {
+                        {
+                            add(new UserAnalyticsEventProperty.Screen(screenName));
+                        }
+                    });
+            NavHostFragment.findNavController(this).popBackStack();
+        });
+        handleOnBackPressed();
     }
 
+    private void handleOnBackPressed() {
+        requireActivity().getOnBackPressedDispatcher().addCallback(getViewLifecycleOwner(), new OnBackPressedCallback(true) {
+            @Override
+            public void handleOnBackPressed() {
+                UserAnalytics.INSTANCE.getAnalyticsEventTracker().trackEvent(UserAnalyticsEvent.CLOSE_TAPPED,
+                        new HashSet<UserAnalyticsEventProperty>() {
+                            {
+                                add(new UserAnalyticsEventProperty.Screen(screenName));
+                            }
+                        });
+                remove();
+                NavHostFragment.findNavController(ZoomInPreviewFragment.this).popBackStack();
+            }
+        });
+    }
+
+
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/BufferedUserAnalyticsEventTracker.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/BufferedUserAnalyticsEventTracker.kt
new file mode 100644
index 0000000000..2b1a70aa3a
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/BufferedUserAnalyticsEventTracker.kt
@@ -0,0 +1,131 @@
+package net.gini.android.capture.tracking.useranalytics
+
+import android.content.Context
+import net.gini.android.capture.internal.network.NetworkRequestsManager
+import net.gini.android.capture.internal.provider.UniqueIdProvider
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsEventProperty
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsEventSuperProperty
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsUserProperty
+import net.gini.android.capture.tracking.useranalytics.tracker.AmplitudeUserAnalyticsEventTracker
+import org.slf4j.LoggerFactory
+import java.util.Collections
+import java.util.LinkedList
+import java.util.Queue
+
+internal class BufferedUserAnalyticsEventTracker(
+    val context: Context,
+    val sessionId: String,
+    private val uniqueIdProvider: UniqueIdProvider = UniqueIdProvider(context),
+) : UserAnalyticsEventTracker {
+
+    private val LOG = LoggerFactory.getLogger(BufferedUserAnalyticsEventTracker::class.java)
+
+    private var eventTrackers: MutableSet<UserAnalyticsEventTracker> =
+        Collections.synchronizedSet(mutableSetOf())
+
+    private val eventSuperProperties: Queue<Set<UserAnalyticsEventSuperProperty>> = LinkedList()
+    private val userProperties: Queue<Set<UserAnalyticsUserProperty>> = LinkedList()
+    private val events: Queue<Pair<UserAnalyticsEvent, Set<UserAnalyticsEventProperty>>> =
+        LinkedList()
+    private var amplitude: AmplitudeUserAnalyticsEventTracker? = null
+
+    fun setPlatformTokens(
+        vararg tokens: UserAnalytics.AnalyticsApiKey,
+        networkRequestsManager: NetworkRequestsManager,
+    ) {
+        tokens.forEach { token ->
+            when (token) {
+
+                is AmplitudeUserAnalyticsEventTracker.AmplitudeAnalyticsApiKey -> {
+                    eventTrackers.removeIf { tracker -> tracker is AmplitudeUserAnalyticsEventTracker }
+
+                    amplitude = AmplitudeUserAnalyticsEventTracker(
+                        context = context,
+                        apiKey = token,
+                        sessionId = sessionId,
+                        networkRequestsManager = networkRequestsManager,
+                        uniqueIdProvider = uniqueIdProvider
+                    )
+                    amplitude?.startRepeatingJob()
+                    amplitude?.let { eventTrackers.add(it) }
+
+                    LOG.debug("Amplitude Initialized")
+                }
+
+                else -> throw IllegalArgumentException("Unsupported token type: ${token.javaClass.simpleName}")
+            }
+        }
+        trySendEvents()
+    }
+
+
+    override fun setEventSuperProperty(property: Set<UserAnalyticsEventSuperProperty>) {
+        this.eventSuperProperties.add(property)
+        trySendEvents()
+    }
+
+    override fun setEventSuperProperty(property: UserAnalyticsEventSuperProperty) {
+        setEventSuperProperty(setOf(property))
+    }
+
+    override fun setUserProperty(userProperties: Set<UserAnalyticsUserProperty>) {
+        this.userProperties.add(userProperties)
+        trySendEvents()
+    }
+
+    override fun setUserProperty(userProperty: UserAnalyticsUserProperty) {
+        setUserProperty(setOf(userProperty))
+    }
+
+    override fun trackEvent(
+        eventName: UserAnalyticsEvent,
+        properties: Set<UserAnalyticsEventProperty>
+    ) {
+        events.add(Pair(eventName, properties))
+        trySendEvents()
+    }
+
+    override fun trackEvent(eventName: UserAnalyticsEvent) {
+        trackEvent(eventName, emptySet())
+    }
+
+    override fun flushEvents() {
+        amplitude?.flushEvents()
+    }
+
+    private fun trySendEvents() {
+        if (eventTrackers.isEmpty()) {
+            LOG.debug("No trackers found. Skipping sending events")
+            return
+        }
+
+        LOG.debug("${eventTrackers.size} Tracker(s) found. Sending events...")
+
+
+        while (eventSuperProperties.isNotEmpty()) {
+            eventSuperProperties.poll()?.let { superPropertySet ->
+                everyTracker { it.setEventSuperProperty(superPropertySet) }
+
+            }
+        }
+        while (userProperties.isNotEmpty()) {
+            userProperties.poll()?.let { userPropertiesSet ->
+                everyTracker { it.setUserProperty(userPropertiesSet) }
+            }
+        }
+        while (events.isNotEmpty()) {
+            events.poll()?.let { eventToPropertiesPair ->
+                val (event, properties) = eventToPropertiesPair
+                everyTracker { it.trackEvent(event, properties) }
+            }
+        }
+
+
+        LOG.debug("Events sent")
+    }
+
+    private fun everyTracker(block: (UserAnalyticsEventTracker) -> Unit) {
+        eventTrackers.forEach(block)
+    }
+
+}
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/UserAnalytics.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/UserAnalytics.kt
new file mode 100644
index 0000000000..89d6ddd5e3
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/UserAnalytics.kt
@@ -0,0 +1,38 @@
+package net.gini.android.capture.tracking.useranalytics
+
+import android.content.Context
+import net.gini.android.capture.internal.network.NetworkRequestsManager
+
+object UserAnalytics {
+
+    private var eventTracker: UserAnalyticsEventTracker? = null
+    private lateinit var sessionId : String
+
+    fun initialize(
+        applicationContext: Context
+    ) {
+        if (eventTracker != null) return
+
+        sessionId = System.currentTimeMillis().toString()
+        eventTracker = BufferedUserAnalyticsEventTracker(applicationContext, sessionId)
+    }
+
+    fun setPlatformTokens(vararg tokens: AnalyticsApiKey, networkRequestsManager: NetworkRequestsManager) {
+        (eventTracker as? BufferedUserAnalyticsEventTracker)?.setPlatformTokens(*tokens, networkRequestsManager = networkRequestsManager)
+    }
+
+    fun flushEvents() {
+        (eventTracker as? BufferedUserAnalyticsEventTracker)?.flushEvents()
+    }
+
+    fun getAnalyticsEventTracker(
+    ) = eventTracker ?: throw IllegalStateException(
+        "You need to initialize analytics by calling `UserAnalytics.initialize(...)`"
+    )
+
+    fun cleanup() {
+        eventTracker = null
+    }
+
+    open class AnalyticsApiKey(val key: String)
+}
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/UserAnalyticsEvent.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/UserAnalyticsEvent.kt
new file mode 100644
index 0000000000..c5d6d89e85
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/UserAnalyticsEvent.kt
@@ -0,0 +1,41 @@
+package net.gini.android.capture.tracking.useranalytics
+
+
+enum class UserAnalyticsEvent(val eventName: String) {
+    SCREEN_SHOWN("screen_shown"),
+    NEXT_STEP_TAPPED("next_step_tapped"),
+    CLOSE_TAPPED("close_tapped"),
+    GET_STARTED_TAPPED("get_started_tapped"),
+    HELP_ITEM_TAPPED("help_item_tapped"),
+    PAGE_SWIPED("page_swiped"),
+    SKIP_TAPPED("skip_tapped"),
+    CAPTURE_TAPPED("capture_tapped"),
+    IMPORT_FILES_TAPPED("import_files_tapped"),
+    UPLOAD_PHOTOS_TAPPED("upload_photos_tapped"),
+    UPLOAD_DOCUMENTS_TAPPED("upload_documents_tapped"),
+    FLASH_TAPPED("flash_tapped"),
+    HELP_TAPPED("help_tapped"),
+    MULTIPLE_PAGES_CAPTURED_TAPPED("multiple_pages_captured_tapped"),
+    ERROR_DIALOG_SHOWN("error_dialog_shown"),
+    QR_CODE_SCANNED("qr_code_scanned"),
+    PROCEED_TAPPED("proceed_tapped"),
+    ADD_PAGES_TAPPED("add_pages_tapped"),
+    DELETE_PAGES_TAPPED("delete_pages_tapped"),
+    ENTER_MANUALLY_TAPPED("enter_manually_tapped"),
+    RETAKE_IMAGES_TAPPED("retake_images_tapped"),
+    BACK_TO_CAMERA_TAPPED("back_to_camera_tapped"),
+    DRAG_TO_DISMISS("drag_to_dismiss"),
+    SAVE_TAPPED("save_tapped"),
+    FULL_SCREEN_PAGE_TAPPED("full_screen_page_tapped"),
+    PREVIEW_ZOOMED("preview_zoomed"),
+    // region Return Assistant
+    ITEM_SWITCH_TAPPED("item_switch_tapped"),
+    EDIT_TAPPED("edit_tapped"),
+    // endregion
+    // region Camera Permission
+    GIVE_ACCESS_TAPPED("give_access_tapped"),
+    // endregion
+    SDK_OPENED("sdk_opened"),
+    SDK_CLOSED("sdk_closed"),
+    DISMISSED("dismissed")
+}
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/UserAnalyticsEventTracker.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/UserAnalyticsEventTracker.kt
new file mode 100644
index 0000000000..4b86086224
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/UserAnalyticsEventTracker.kt
@@ -0,0 +1,31 @@
+package net.gini.android.capture.tracking.useranalytics
+
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsEventProperty
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsEventSuperProperty
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsUserProperty
+
+
+interface UserAnalyticsEventTracker {
+
+    fun setEventSuperProperty(property: UserAnalyticsEventSuperProperty)
+
+    fun setEventSuperProperty(property: Set<UserAnalyticsEventSuperProperty>)
+
+    fun setUserProperty(userProperty: UserAnalyticsUserProperty)
+
+    fun setUserProperty(userProperties: Set<UserAnalyticsUserProperty>)
+
+    fun trackEvent(eventName: UserAnalyticsEvent)
+
+    fun trackEvent(eventName: UserAnalyticsEvent, properties: Set<UserAnalyticsEventProperty>)
+
+    fun flushEvents()
+}
+
+
+
+
+
+
+
+
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/UserAnalyticsMappers.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/UserAnalyticsMappers.kt
new file mode 100644
index 0000000000..9560404024
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/UserAnalyticsMappers.kt
@@ -0,0 +1,34 @@
+package net.gini.android.capture.tracking.useranalytics
+
+import net.gini.android.capture.Document
+import net.gini.android.capture.error.ErrorType
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsEventProperty.DocumentType.Type as AnalyticsDocumentType
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsEventProperty.ErrorType.Type as AnalyticsErrorType
+
+fun Boolean.mapToAnalyticsValue() = if (this) "yes" else "no"
+
+fun Document?.mapToAnalyticsDocumentType(): AnalyticsDocumentType {
+    return when (this?.getType()) {
+        Document.Type.IMAGE, Document.Type.IMAGE_MULTI_PAGE -> AnalyticsDocumentType.Image
+        Document.Type.PDF, Document.Type.PDF_MULTI_PAGE -> AnalyticsDocumentType.Pdf
+        Document.Type.QRCode, Document.Type.QR_CODE_MULTI_PAGE -> AnalyticsDocumentType.QrCode
+        null -> AnalyticsDocumentType.Unknown
+    }
+}
+
+fun ErrorType?.mapToAnalyticsErrorType(): AnalyticsErrorType {
+    return when (this) {
+        ErrorType.GENERAL, null -> AnalyticsErrorType.Unknown
+        ErrorType.NO_CONNECTION -> AnalyticsErrorType.NoInternet
+        ErrorType.AUTH -> AnalyticsErrorType.Unauthorized
+        ErrorType.UPLOAD -> AnalyticsErrorType.Upload
+        ErrorType.SERVER -> AnalyticsErrorType.Server
+        ErrorType.OUTAGE -> AnalyticsErrorType.Outage
+        ErrorType.MAINTENANCE -> AnalyticsErrorType.Maintenance
+        ErrorType.FILE_IMPORT_GENERIC -> AnalyticsErrorType.FileImportGeneric
+        ErrorType.FILE_IMPORT_SIZE -> AnalyticsErrorType.FileImportSize
+        ErrorType.FILE_IMPORT_PAGE_COUNT -> AnalyticsErrorType.FileImportPageCount
+        ErrorType.FILE_IMPORT_UNSUPPORTED -> AnalyticsErrorType.FileImportUnsupported
+        ErrorType.FILE_IMPORT_PASSWORD -> AnalyticsErrorType.FileImportPassword
+    }
+}
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/UserAnalyticsScreen.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/UserAnalyticsScreen.kt
new file mode 100644
index 0000000000..06faad056c
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/UserAnalyticsScreen.kt
@@ -0,0 +1,24 @@
+package net.gini.android.capture.tracking.useranalytics
+
+sealed class UserAnalyticsScreen(val name: String) {
+    object Camera : UserAnalyticsScreen("camera")
+    object CameraAccess : UserAnalyticsScreen("camera_access")
+    object Review : UserAnalyticsScreen("review")
+    object ReviewZoom : UserAnalyticsScreen("review_zoom")
+    object Analysis : UserAnalyticsScreen("analysis")
+    object NoResults : UserAnalyticsScreen("no_results")
+    object Help : UserAnalyticsScreen("help")
+    object Error : UserAnalyticsScreen("error")
+    sealed class OnBoarding(name: String) : UserAnalyticsScreen(name) {
+        object FlatPaper : OnBoarding("onboarding_flat_paper")
+        object Lighting : OnBoarding("onboarding_lighting")
+        object MultiplePages : OnBoarding("onboarding_multiple_pages")
+        object QrCode : OnBoarding("onboarding_qr_code")
+        data class Custom(val page: Int) : UserAnalyticsScreen("onboarding_custom_$page")
+    }
+
+    object ReturnAssistant : UserAnalyticsScreen("return_assistant")
+    object ReturnAssistantOnBoarding : UserAnalyticsScreen("onoarding_return_assistant")
+
+    object EditReturnAssistant : UserAnalyticsScreen("edit_return_assistant")
+}
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/properties/AnalyticsKeyPairProperty.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/properties/AnalyticsKeyPairProperty.kt
new file mode 100644
index 0000000000..fc78e78a00
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/properties/AnalyticsKeyPairProperty.kt
@@ -0,0 +1,5 @@
+package net.gini.android.capture.tracking.useranalytics.properties
+
+abstract class AnalyticsKeyPairProperty(private val key: String, private val value: Any) {
+    fun getPair() = key to value
+}
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/properties/UserAnalyticsEventProperty.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/properties/UserAnalyticsEventProperty.kt
new file mode 100644
index 0000000000..c170872c70
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/properties/UserAnalyticsEventProperty.kt
@@ -0,0 +1,108 @@
+package net.gini.android.capture.tracking.useranalytics.properties
+
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsScreen
+import net.gini.android.capture.tracking.useranalytics.mapToAnalyticsValue
+
+sealed class UserAnalyticsEventProperty(key: String, value: String) :
+    AnalyticsKeyPairProperty(key, value) {
+
+    data class DocumentType(private val docType: Type) :
+        UserAnalyticsEventProperty("document_type", docType.analyticsValue) {
+        enum class Type(val analyticsValue: String) {
+            Image("image"),
+            Pdf("pdf"),
+            QrCode("qrcode"),
+            Unknown("unknown")
+        }
+    }
+
+    data class PartialDocumentId(val documentId: String) :
+        UserAnalyticsEventProperty("partial_document_id", documentId)
+
+
+    data class DocumentId(val documentId: String) :
+        UserAnalyticsEventProperty("document_id", documentId)
+
+    data class DocumentPageNumber(val documentPageNumber: Int) :
+        UserAnalyticsEventProperty("document_page_number", documentPageNumber.toString())
+
+    data class ErrorCode(val errorCode: String) :
+        UserAnalyticsEventProperty("error_code", errorCode)
+
+    data class ErrorType(val errorType: Type) :
+        UserAnalyticsEventProperty("error_type", errorType.analyticsValue) {
+        enum class Type(val analyticsValue: String) {
+            Unknown("unknown"),
+            NoInternet("no_internet"),
+            Unauthorized("unauthorized"),
+            Upload("upload"),
+            Server("server"),
+            Outage("outage"),
+            Maintenance("maintenance"),
+            FileImportGeneric("file_import_generic"),
+            FileImportSize("file_import_size"),
+            FileImportPageCount("file_import_page_count"),
+            FileImportUnsupported("file_import_unsupported"),
+            FileImportPassword("file_import_password"),
+        }
+    }
+
+    data class ErrorMessage(val errorMessage: String) :
+        UserAnalyticsEventProperty("error_message", errorMessage)
+
+    data class FlashActive(val flashActive: Boolean) :
+        UserAnalyticsEventProperty("flash_active", flashActive.mapToAnalyticsValue())
+
+    data class IbanDetectionLayerVisible(val ibanDetectionLayerVisible: Boolean) :
+        UserAnalyticsEventProperty(
+            "iban_detection_layer_visible",
+            ibanDetectionLayerVisible.mapToAnalyticsValue()
+        )
+
+    data class QrCodeValid(val qrCodeValid: Boolean) :
+        UserAnalyticsEventProperty("qr_code_valid", qrCodeValid.mapToAnalyticsValue())
+
+    data class Screen(val screen: UserAnalyticsScreen) :
+        UserAnalyticsEventProperty("screen", screen.name)
+
+    // region Help Screen
+    data class HasCustomItems(val hasCustomItems: Boolean) :
+        UserAnalyticsEventProperty("has_custom_items", hasCustomItems.mapToAnalyticsValue())
+
+    data class HelpItems(val helpItems: List<String>) :
+        UserAnalyticsEventProperty("help_items", helpItems.toString())
+
+    data class ItemTapped(val itemTappedName: String) :
+        UserAnalyticsEventProperty("item_tapped", itemTappedName)
+
+    // endregion
+    data class CustomOnboardingTitle(val customOnboardingTitle: String) :
+        UserAnalyticsEventProperty("custom_onboarding_title", customOnboardingTitle)
+
+    data class OnboardingHasCustomItems(val hasCustomItems: Boolean) :
+        UserAnalyticsEventProperty("has_custom_items", hasCustomItems.mapToAnalyticsValue())
+
+    // region Return Assistant
+    data class SwitchActive(val switchActive: Boolean) :
+        UserAnalyticsEventProperty("switch_active", switchActive.mapToAnalyticsValue())
+
+    data class ItemsChanged(val differences: Set<DifferenceType>) :
+        UserAnalyticsEventProperty(
+            "items_changed",
+            differences.map { it.analyticsName }.toString()
+        ) {
+        enum class DifferenceType(val analyticsName: String) {
+            Name("name"),
+            Quantity("quantity"),
+            Price("price"),
+        }
+    }
+    // endregion
+
+    data class Status(val statusType: StatusType) :
+        UserAnalyticsEventProperty("status", statusType.analyticsName) {
+        enum class StatusType(val analyticsName: String) {
+            Successful("successful")
+        }
+    }
+}
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/properties/UserAnalyticsEventSuperProperty.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/properties/UserAnalyticsEventSuperProperty.kt
new file mode 100644
index 0000000000..ffb219d7a2
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/properties/UserAnalyticsEventSuperProperty.kt
@@ -0,0 +1,14 @@
+package net.gini.android.capture.tracking.useranalytics.properties
+
+sealed class UserAnalyticsEventSuperProperty(key: String, value: String) :
+    AnalyticsKeyPairProperty(key, value) {
+    data class GiniClientId(val clientId: String) :
+        UserAnalyticsEventSuperProperty("gini_client_id", clientId)
+
+    data class EntryPoint(val entryPointType: EntryPointType) :
+        UserAnalyticsEventSuperProperty("entry_point", entryPointType.analyticsName) {
+        enum class EntryPointType(val analyticsName: String) {
+            OPEN_WITH("open_with"), BUTTON("button"), FIELD("field")
+        }
+    }
+}
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/properties/UserAnalyticsUserProperty.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/properties/UserAnalyticsUserProperty.kt
new file mode 100644
index 0000000000..32e50ba010
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/properties/UserAnalyticsUserProperty.kt
@@ -0,0 +1,21 @@
+package net.gini.android.capture.tracking.useranalytics.properties
+
+import net.gini.android.capture.tracking.useranalytics.mapToAnalyticsValue
+
+sealed class UserAnalyticsUserProperty(key: String, value: String) :
+    AnalyticsKeyPairProperty(key, value) {
+    data class GiniClientId(val clientId: String) :
+        UserAnalyticsUserProperty("gini_client_id", clientId)
+
+    data class ReturnReasonsEnabled(val isEnabled: Boolean) :
+        UserAnalyticsUserProperty("return_reasons_enabled", isEnabled.mapToAnalyticsValue())
+
+    data class ReturnAssistantEnabled(val isEnabled: Boolean) :
+        UserAnalyticsUserProperty("return_assistant_enabled", isEnabled.mapToAnalyticsValue())
+
+    data class BankSdkVersionName(val versionName: String) :
+        UserAnalyticsUserProperty("bank_sdk_version", versionName)
+
+    data class CaptureSdkVersionName(val versionName: String) :
+        UserAnalyticsUserProperty("capture_sdk_version", versionName)
+}
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/tracker/AmplitudeUserAnalyticsEventTracker.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/tracker/AmplitudeUserAnalyticsEventTracker.kt
new file mode 100644
index 0000000000..425fb0b60b
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/tracker/AmplitudeUserAnalyticsEventTracker.kt
@@ -0,0 +1,137 @@
+package net.gini.android.capture.tracking.useranalytics.tracker
+
+import android.content.Context
+import android.util.Log
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import net.gini.android.capture.BuildConfig
+import net.gini.android.capture.internal.network.AmplitudeEventModel
+import net.gini.android.capture.internal.network.AmplitudeRoot
+import net.gini.android.capture.internal.network.NetworkRequestsManager
+import net.gini.android.capture.internal.provider.UniqueIdProvider
+import net.gini.android.capture.tracking.useranalytics.UserAnalytics
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsEvent
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsEventTracker
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsEventProperty
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsEventSuperProperty
+import net.gini.android.capture.tracking.useranalytics.properties.UserAnalyticsUserProperty
+import org.slf4j.LoggerFactory
+import java.util.Calendar
+import java.util.TimeZone
+import java.util.UUID
+
+internal class AmplitudeUserAnalyticsEventTracker(
+    val context: Context,
+    val apiKey: AmplitudeAnalyticsApiKey,
+    val sessionId: String,
+    val networkRequestsManager: NetworkRequestsManager,
+    val uniqueIdProvider: UniqueIdProvider = UniqueIdProvider(context)
+) : UserAnalyticsEventTracker {
+
+    private val LOG = LoggerFactory.getLogger(AmplitudeUserAnalyticsEventTracker::class.java)
+
+    companion object {
+        private const val KEY_DEVICE_ID = "device_id"
+    }
+
+    private val superProperties = mutableSetOf<UserAnalyticsEventSuperProperty>()
+    private lateinit var userProperties: Map<String, Any>
+    private var eventId = 0
+
+    private val contextProvider: DeviceInfo = DeviceInfo(
+        context
+    )
+
+    override fun setUserProperty(userProperties: Set<UserAnalyticsUserProperty>) {
+        this.userProperties = userProperties.associate { it.getPair() }
+    }
+
+    override fun setEventSuperProperty(property: UserAnalyticsEventSuperProperty) {
+        setEventSuperProperty(setOf(property))
+    }
+
+    override fun setEventSuperProperty(property: Set<UserAnalyticsEventSuperProperty>) {
+        superProperties.addAll(property)
+    }
+
+    override fun setUserProperty(userProperty: UserAnalyticsUserProperty) {
+        setUserProperty(setOf(userProperty))
+    }
+
+    override fun trackEvent(eventName: UserAnalyticsEvent) {
+        trackEvent(eventName, emptySet())
+    }
+
+    private val events: MutableList<AmplitudeEventModel> = mutableListOf()
+
+    override fun trackEvent(
+        eventName: UserAnalyticsEvent,
+        properties: Set<UserAnalyticsEventProperty>
+    ) {
+
+        val superPropertiesMap = superProperties.associate { it.getPair() }
+        val propertiesMap = properties.associate { it.getPair() }
+        val finalProperties = superPropertiesMap.plus(propertiesMap)
+        val c: Calendar = Calendar.getInstance(TimeZone.getTimeZone("Europe/Berlin"))
+
+        val version = BuildConfig.VERSION_NAME
+        events.add(
+            AmplitudeEventModel(
+                userId = uniqueIdProvider.getUniqueId(KEY_DEVICE_ID),
+                deviceId = uniqueIdProvider.getUniqueId(KEY_DEVICE_ID),
+                eventType = eventName.eventName,
+                sessionId = sessionId,
+                eventId = eventId++.toString(),
+                time = c.timeInMillis,
+                platform = contextProvider.osName,
+                osVersion = contextProvider.osVersion,
+                deviceManufacturer = contextProvider.manufacturer,
+                deviceBrand = contextProvider.brand,
+                deviceModel = contextProvider.model,
+                versionName = contextProvider.versionName ?: "unknown",
+                osName = contextProvider.osName,
+                carrier = contextProvider.carrier ?: "unknown",
+                language = contextProvider.language,
+                eventProperties = finalProperties,
+                userProperties = userProperties
+            )
+        )
+
+        Log.e("User journey", "Event: ${eventName.eventName}\n" +
+                properties.joinToString("\n") { "  ${it.getPair().first}=${it.getPair().second}" })
+
+        LOG.debug("\nEvent: ${eventName.eventName}\n" +
+                properties.joinToString("\n") { "  ${it.getPair().first}=${it.getPair().second}" })
+    }
+
+    fun startRepeatingJob(): Job {
+        return CoroutineScope(Dispatchers.IO).launch {
+            while (isActive) {
+                sendEventsToAmplitudeApi()
+                delay(5000)
+            }
+        }
+    }
+
+    override fun flushEvents() {
+        CoroutineScope(Dispatchers.IO).launch {
+            sendEventsToAmplitudeApi()
+        }
+    }
+
+    private fun sendEventsToAmplitudeApi() {
+        if (events.isNotEmpty()) {
+            val reqBody = AmplitudeRoot(apiKey = apiKey.key, events.toList())
+            networkRequestsManager.sendEvents(reqBody, UUID.randomUUID())
+            events.clear()
+        }
+    }
+
+
+    data class AmplitudeAnalyticsApiKey(private val apiKey: String) :
+        UserAnalytics.AnalyticsApiKey(apiKey)
+}
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/tracker/DeviceInfo.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/tracker/DeviceInfo.kt
new file mode 100644
index 0000000000..db197909bc
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/tracking/useranalytics/tracker/DeviceInfo.kt
@@ -0,0 +1,136 @@
+package net.gini.android.capture.tracking.useranalytics.tracker
+
+import android.content.Context
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import android.content.res.Resources
+import android.os.Build
+import android.telephony.TelephonyManager
+import org.slf4j.LoggerFactory
+import java.util.Locale
+
+class DeviceInfo(private val context: Context) {
+
+    private var cachedInfo: CachedInfo? = null
+        get() {
+            if (field == null) {
+                field = CachedInfo()
+            }
+            return field
+        }
+
+    private val LOG = LoggerFactory.getLogger(DeviceInfo::class.java)
+
+    /**
+     * Internal class serves as a cache
+     */
+    inner class CachedInfo {
+        val versionName: String?
+        val osName: String
+        val osVersion: String
+        val brand: String
+        val manufacturer: String
+        val model: String
+        val carrier: String?
+        val language: String
+
+        init {
+            versionName = fetchVersionName()
+            osName = OS_NAME
+            osVersion = fetchOsVersion()
+            brand = fetchBrand()
+            manufacturer = fetchManufacturer()
+            model = fetchModel()
+            carrier = fetchCarrier()
+            language = fetchLanguage()
+        }
+
+        /**
+         * Internal methods for getting raw information
+         */
+        private fun fetchVersionName(): String? {
+            val packageInfo: PackageInfo
+            try {
+                packageInfo = context.packageManager.getPackageInfo(context.packageName, 0)
+                return packageInfo.versionName
+            } catch (e: PackageManager.NameNotFoundException) {
+            } catch (e: Exception) {
+            }
+            return null
+        }
+
+        private fun fetchOsVersion(): String {
+            return Build.VERSION.RELEASE
+        }
+
+        private fun fetchBrand(): String {
+            return Build.BRAND
+        }
+
+        private fun fetchManufacturer(): String {
+            return Build.MANUFACTURER
+        }
+
+        private fun fetchModel(): String {
+            return Build.MODEL
+        }
+
+        private fun fetchCarrier(): String? {
+            try {
+                val manager = context
+                    .getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
+                return manager.networkOperatorName
+            } catch (e: Exception) {
+                // Failed to get network operator name from network
+            }
+            return null
+        }
+
+
+        private val locale: Locale
+            get() {
+                val configuration = Resources.getSystem().configuration
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                    val localeList = configuration.locales
+                    if (localeList.isEmpty) {
+                        return Locale.getDefault()
+                    } else {
+                        return localeList.get(0)
+                    }
+                } else {
+                    return configuration.locale
+                }
+            }
+
+        private fun fetchLanguage(): String {
+            return locale.language
+        }
+
+    }
+
+    fun prefetch() {
+        cachedInfo
+    }
+
+
+    val versionName: String?
+        get() = cachedInfo!!.versionName
+    val osName: String
+        get() = cachedInfo!!.osName
+    val osVersion: String
+        get() = cachedInfo!!.osVersion
+    val brand: String
+        get() = cachedInfo!!.brand
+    val manufacturer: String
+        get() = cachedInfo!!.manufacturer
+    val model: String
+        get() = cachedInfo!!.model
+    val carrier: String?
+        get() = cachedInfo!!.carrier
+    val language: String
+        get() = cachedInfo!!.language
+
+    companion object {
+        const val OS_NAME = "android"
+    }
+}
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/button/filled/GiniButton.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/button/filled/GiniButton.kt
new file mode 100644
index 0000000000..427b66fbd6
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/button/filled/GiniButton.kt
@@ -0,0 +1,90 @@
+package net.gini.android.capture.ui.components.button.filled
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Done
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.rememberVectorPainter
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import net.gini.android.capture.ui.theme.GiniTheme
+
+@Composable
+fun GiniButton(
+    text: String,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    giniButtonColors: GiniButtonColors = GiniButtonColors(),
+) {
+    GiniButton(
+        onClick = onClick,
+        modifier = modifier,
+        giniButtonColors = giniButtonColors,
+    ) {
+        Text(text = text)
+    }
+}
+
+@Composable
+fun GiniButton(
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    giniButtonColors: GiniButtonColors = GiniButtonColors.colors(),
+    content: @Composable () -> Unit,
+) {
+    Button(
+        modifier = modifier.padding(vertical = 16.dp),
+        onClick = onClick,
+        shape = RoundedCornerShape(4.dp),
+        colors = ButtonDefaults.buttonColors(
+            containerColor = giniButtonColors.containerColor,
+            contentColor = giniButtonColors.contentContent,
+        ),
+    ) {
+        content()
+    }
+}
+
+
+@Preview
+@Composable
+private fun GiniTextButtonPreview() {
+    GiniTheme {
+        Column {
+            GiniButton(text = "Text Only", onClick = {})
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun GiniContentButtonPreview() {
+    GiniTheme {
+        Column {
+            GiniButton(onClick = {}) {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.spacedBy(8.dp)
+                ) {
+                    Icon(
+                        painter = rememberVectorPainter(image = Icons.Outlined.Done),
+                        contentDescription = null
+                    )
+                    Text(
+                        text = "Custom Content",
+                    )
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/button/filled/GiniButtonColors.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/button/filled/GiniButtonColors.kt
new file mode 100644
index 0000000000..ebad464e6e
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/button/filled/GiniButtonColors.kt
@@ -0,0 +1,24 @@
+package net.gini.android.capture.ui.components.button.filled
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.graphics.Color
+import net.gini.android.capture.ui.theme.GiniTheme
+
+@Immutable
+data class GiniButtonColors(
+    val containerColor: Color = Color.Unspecified,
+    val contentContent: Color = Color.Unspecified,
+) {
+
+    companion object {
+        @Composable
+        fun colors(
+            containerColor: Color = GiniTheme.colorScheme.button.container,
+            contentContent: Color = GiniTheme.colorScheme.button.content,
+        ) = GiniButtonColors(
+            containerColor = containerColor,
+            contentContent = contentContent,
+        )
+    }
+}
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/picker/date/GiniDatePickerDialog.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/picker/date/GiniDatePickerDialog.kt
new file mode 100644
index 0000000000..b64296181a
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/picker/date/GiniDatePickerDialog.kt
@@ -0,0 +1,130 @@
+@file:OptIn(ExperimentalMaterial3Api::class)
+
+package net.gini.android.capture.ui.components.picker.date
+
+import android.content.res.Configuration.UI_MODE_NIGHT_YES
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Card
+import androidx.compose.material3.DatePicker
+import androidx.compose.material3.DatePickerDefaults
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.SelectableDates
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.rememberDatePickerState
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import net.gini.android.capture.R
+import net.gini.android.capture.ui.theme.GiniTheme
+import java.time.Instant
+import java.time.LocalDate
+import java.time.ZoneId
+import java.time.ZoneOffset
+
+@Composable
+fun GiniDatePickerDialog(
+    onDismissRequest: () -> Unit,
+    onSaved: (LocalDate) -> Unit,
+    modifier: Modifier = Modifier,
+    date: LocalDate = LocalDate.now(),
+    selectableDates: SelectableDates = DatePickerDefaults.AllDates,
+    colors: GiniDatePickerDialogColors = GiniDatePickerDialogColors.colors()
+) {
+
+    val dateState = rememberDatePickerState(
+        selectableDates = selectableDates,
+        initialSelectedDateMillis =
+        date
+            .atTime(12, 0, 0)
+            .toInstant(ZoneOffset.UTC)
+            .toEpochMilli(),
+    )
+
+    Dialog(
+        properties = DialogProperties(usePlatformDefaultWidth = false),
+        onDismissRequest = onDismissRequest
+    ) {
+        Card(
+            modifier = modifier.fillMaxWidth(0.95f),
+        ) {
+            DatePicker(
+                state = dateState,
+                showModeToggle = false,
+                colors = with(colors) {
+                    DatePickerDefaults.colors(
+                        titleContentColor = textSupporting,
+                        headlineContentColor = textHeadline,
+                        weekdayContentColor = textDateEnabled,
+                        navigationContentColor = textDateEnabled,
+                        dayContentColor = textDateEnabled,
+                        selectedDayContentColor = textDateSelected,
+                        selectedDayContainerColor = dateSelected,
+                        todayContentColor = textDateToday,
+                        todayDateBorderColor = dateSelected,
+                        dividerColor = divider,
+                    )
+                }
+            )
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(bottom = 16.dp),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.End,
+            ) {
+                TextButton(
+                    modifier = Modifier.padding(horizontal = 8.dp),
+                    onClick = { onDismissRequest() }) {
+                    Text(
+                        text = stringResource(id = R.string.gc_date_picker_cancel),
+                        style = GiniTheme.typography.body1
+                    )
+                }
+                TextButton(
+                    modifier = Modifier.padding(horizontal = 8.dp),
+                    onClick = {
+                        dateState.selectedDateMillis?.let {
+                            onSaved(
+                                Instant.ofEpochMilli(it).atZone(ZoneId.systemDefault())
+                                    .toLocalDate()
+                            )
+                        }
+                    }) {
+                    Text(
+                        text = stringResource(id = R.string.gc_date_picker_select),
+                        style = GiniTheme.typography.body1
+                    )
+                }
+            }
+        }
+
+    }
+}
+
+@Preview
+@Composable
+private fun DatePickerDialogPreviewLight() {
+    DatePickerDialogPreview()
+}
+
+@Preview(uiMode = UI_MODE_NIGHT_YES)
+@Composable
+private fun DatePickerDialogPreviewDark() {
+    DatePickerDialogPreview()
+}
+
+@Composable
+private fun DatePickerDialogPreview() {
+    GiniTheme {
+        GiniDatePickerDialog(onDismissRequest = {}, onSaved = {})
+    }
+}
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/picker/date/GiniDatePickerDialogColors.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/picker/date/GiniDatePickerDialogColors.kt
new file mode 100644
index 0000000000..f28ee262f8
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/picker/date/GiniDatePickerDialogColors.kt
@@ -0,0 +1,49 @@
+package net.gini.android.capture.ui.components.picker.date
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.graphics.Color
+import net.gini.android.capture.ui.theme.GiniTheme
+
+@Immutable
+data class GiniDatePickerDialogColors(
+    val dateSelected: Color = Color.Unspecified,
+    val borderDate: Color = Color.Unspecified,
+    val textHeadline: Color = Color.Unspecified,
+    val textSupporting: Color = Color.Unspecified,
+    val textButtons: Color = Color.Unspecified,
+    val textDateToday: Color = Color.Unspecified,
+    val textDateSelected: Color = Color.Unspecified,
+    val textDateEnabled: Color = Color.Unspecified,
+    val textDateDisabled: Color = Color.Unspecified,
+    val divider: Color = Color.Unspecified,
+) {
+
+    companion object {
+
+        @Composable
+        fun colors(
+            dateSelected: Color = GiniTheme.colorScheme.datePicker.date.containerFocused,
+            borderDate: Color = GiniTheme.colorScheme.datePicker.date.containerOutlined,
+            textHeadline: Color = GiniTheme.colorScheme.datePicker.text.primary,
+            textSupporting: Color = GiniTheme.colorScheme.datePicker.text.secondary,
+            textButtons: Color = GiniTheme.colorScheme.datePicker.text.accent,
+            textDateToday: Color = GiniTheme.colorScheme.datePicker.text.primary,
+            textDateSelected: Color = GiniTheme.colorScheme.datePicker.date.contentFocused,
+            textDateEnabled: Color = GiniTheme.colorScheme.datePicker.text.primary,
+            textDateDisabled: Color = GiniTheme.colorScheme.datePicker.text.secondary,
+            divider: Color = GiniTheme.colorScheme.datePicker.divider,
+        ) = GiniDatePickerDialogColors(
+            dateSelected = dateSelected,
+            borderDate = borderDate,
+            textHeadline = textHeadline,
+            textSupporting = textSupporting,
+            textButtons = textButtons,
+            textDateToday = textDateToday,
+            textDateSelected = textDateSelected,
+            textDateEnabled = textDateEnabled,
+            textDateDisabled = textDateDisabled,
+            divider = divider,
+        )
+    }
+}
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/switcher/GiniSwitch.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/switcher/GiniSwitch.kt
new file mode 100644
index 0000000000..d6e062eab6
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/switcher/GiniSwitch.kt
@@ -0,0 +1,45 @@
+package net.gini.android.capture.ui.components.switcher
+
+import androidx.compose.material3.Switch
+import androidx.compose.material3.SwitchDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.scale
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.tooling.preview.Preview
+import net.gini.android.capture.ui.theme.GiniTheme
+
+@Composable
+fun GiniSwitch(
+    modifier: Modifier = Modifier,
+    checked: Boolean,
+    onCheckedChange: (Boolean) -> Unit,
+    giniSwitchColors: GiniSwitchColors = GiniSwitchColors.colors(),
+) {
+    Switch(modifier = modifier.scale(0.7f),
+        checked = checked,
+        onCheckedChange = onCheckedChange,
+        colors = with(giniSwitchColors) {
+            SwitchDefaults.colors(
+                uncheckedTrackColor = uncheckedTrackColor,
+                checkedTrackColor = checkedTrackColor,
+                uncheckedThumbColor = uncheckedThumbColor,
+                checkedThumbColor = checkedThumbColor,
+                checkedBorderColor = Color.Transparent,
+                uncheckedBorderColor = Color.Transparent,
+            )
+        })
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun GiniSwitchPreview() {
+    var checked by remember { mutableStateOf(false) }
+    GiniTheme {
+        GiniSwitch(checked = checked, onCheckedChange = { checked = !checked })
+    }
+}
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/switcher/GiniSwitchColors.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/switcher/GiniSwitchColors.kt
new file mode 100644
index 0000000000..f4ad36bf86
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/switcher/GiniSwitchColors.kt
@@ -0,0 +1,30 @@
+package net.gini.android.capture.ui.components.switcher
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.graphics.Color
+import net.gini.android.capture.ui.theme.GiniTheme
+
+@Immutable
+data class GiniSwitchColors(
+    val checkedTrackColor: Color,
+    val checkedThumbColor: Color,
+    val uncheckedTrackColor: Color,
+    val uncheckedThumbColor: Color,
+) {
+    companion object {
+
+        @Composable
+        fun colors(
+            checkedTrackColor: Color = GiniTheme.colorScheme.toggles.track.selected,
+            checkedThumbColor: Color = GiniTheme.colorScheme.toggles.thumb.selected,
+            uncheckedTrackColor: Color = GiniTheme.colorScheme.toggles.track.unselected,
+            uncheckedThumbColor: Color = GiniTheme.colorScheme.toggles.thumb.unselected
+        ) = GiniSwitchColors(
+            checkedTrackColor = checkedTrackColor,
+            checkedThumbColor = checkedThumbColor,
+            uncheckedTrackColor = uncheckedTrackColor,
+            uncheckedThumbColor = uncheckedThumbColor,
+        )
+    }
+}
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/textinput/GiniTextInput.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/textinput/GiniTextInput.kt
new file mode 100644
index 0000000000..22b7eb812e
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/textinput/GiniTextInput.kt
@@ -0,0 +1,136 @@
+package net.gini.android.capture.ui.components.textinput
+
+import android.content.res.Configuration
+import androidx.compose.foundation.interaction.InteractionSource
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.input.VisualTransformation
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import net.gini.android.capture.ui.theme.GiniTheme
+
+@Composable
+fun GiniTextInput(
+    text: String,
+    label: String,
+    modifier: Modifier = Modifier,
+    onValueChange: (String) -> Unit,
+    trailingContent: @Composable () -> Unit = {},
+    enabled: Boolean = true,
+    isError: Boolean = false,
+    readOnly: Boolean = false,
+    keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
+    colors: GiniTextInputColors = GiniTextInputColors.colors(),
+    visualTransformation: VisualTransformation = VisualTransformation.None,
+    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
+) {
+    GiniTextInput(
+        modifier = modifier,
+        text = text,
+        enabled = enabled,
+        readOnly = readOnly,
+        isError = isError,
+        interactionSource = interactionSource,
+        keyboardOptions = keyboardOptions,
+        label = {
+            Text(
+                text = label,
+                style = GiniTheme.typography.caption1,
+            )
+        },
+        onValueChange = onValueChange,
+        trailingContent = trailingContent,
+        colors = colors,
+        visualTransformation = visualTransformation,
+    )
+}
+
+@Composable
+fun GiniTextInput(
+    text: String,
+    label: @Composable () -> Unit,
+    onValueChange: (String) -> Unit,
+    modifier: Modifier = Modifier,
+    trailingContent: @Composable () -> Unit = {},
+    enabled: Boolean = true,
+    isError: Boolean = false,
+    readOnly: Boolean = false,
+    keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
+    colors: GiniTextInputColors = GiniTextInputColors.colors(),
+    visualTransformation: VisualTransformation = VisualTransformation.None,
+    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
+) {
+    TextField(
+        modifier = modifier,
+        value = text,
+        enabled = enabled,
+        keyboardOptions = keyboardOptions,
+        textStyle = GiniTheme.typography.subtitle1,
+        label = label,
+        isError = isError,
+        readOnly = readOnly,
+        interactionSource = interactionSource,
+        visualTransformation = visualTransformation,
+        colors = with(colors) {
+            TextFieldDefaults.colors(
+                focusedContainerColor = containerFocused,
+                unfocusedContainerColor = containerUnfocused,
+                disabledContainerColor = containerUnfocused,
+                focusedTextColor = textFocused,
+                unfocusedTextColor = textUnfocused,
+                disabledTextColor = textDisabled,
+                errorTextColor = textError,
+                unfocusedLabelColor = labelUnfocused,
+                errorLabelColor = labelError,
+                focusedLabelColor = labelFocused,
+                disabledLabelColor = labelDisabled,
+                focusedIndicatorColor = indicatorFocused,
+                unfocusedIndicatorColor = indicatorUnfocused,
+                disabledIndicatorColor = indicatorDisabled,
+                errorIndicatorColor = indicatorError,
+                focusedTrailingIconColor = trailingContentFocused,
+                unfocusedTrailingIconColor = trailingContentUnfocused,
+                disabledTrailingIconColor = trailingContentDisabled,
+                errorTrailingIconColor = trailingContentError,
+                errorContainerColor = containerUnfocused,
+            )
+        },
+        onValueChange = onValueChange,
+        trailingIcon = trailingContent
+    )
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun GiniTextInputPreviewLight() {
+    GiniTextInputPreview()
+}
+
+@Preview(
+    showBackground = true,
+    uiMode = Configuration.UI_MODE_NIGHT_YES
+)
+@Composable
+private fun GiniTextInputPreviewDark() {
+    GiniTextInputPreview()
+}
+
+@Composable
+private fun GiniTextInputPreview() {
+    GiniTheme {
+        GiniTextInput(
+            modifier = Modifier.padding(16.dp),
+            text = "Some text here",
+            label = "Label Text",
+            trailingContent = { },
+            onValueChange = {}
+        )
+    }
+}
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/textinput/GiniTextInputColors.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/textinput/GiniTextInputColors.kt
new file mode 100644
index 0000000000..40e84341e8
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/textinput/GiniTextInputColors.kt
@@ -0,0 +1,75 @@
+package net.gini.android.capture.ui.components.textinput
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.graphics.Color
+import net.gini.android.capture.ui.theme.GiniTheme
+
+@Immutable
+data class GiniTextInputColors(
+    val containerFocused: Color,
+    val containerUnfocused: Color,
+    val containerDisabled: Color,
+    val labelError: Color,
+    val labelUnfocused: Color,
+    val labelFocused: Color,
+    val labelDisabled: Color,
+    val textFocused: Color,
+    val textUnfocused: Color,
+    val textDisabled: Color,
+    val textError: Color,
+    val indicatorFocused: Color,
+    val indicatorUnfocused: Color,
+    val indicatorDisabled: Color,
+    val indicatorError: Color,
+    val trailingContentFocused: Color,
+    val trailingContentUnfocused: Color,
+    val trailingContentDisabled: Color,
+    val trailingContentError: Color,
+) {
+    companion object {
+
+        @Composable
+        fun colors(
+            containerFocused: Color = GiniTheme.colorScheme.textField.container,
+            containerUnfocused: Color = GiniTheme.colorScheme.textField.container,
+            containerDisabled: Color = GiniTheme.colorScheme.textField.container,
+            textFocused: Color = GiniTheme.colorScheme.textField.text.focused,
+            textUnfocused: Color = GiniTheme.colorScheme.textField.text.unfocused,
+            textDisabled: Color = GiniTheme.colorScheme.textField.text.disabled,
+            textError: Color = GiniTheme.colorScheme.textField.text.focused,
+            indicatorFocused: Color = GiniTheme.colorScheme.textField.indicator.focused,
+            indicatorUnfocused: Color = GiniTheme.colorScheme.textField.indicator.unfocused,
+            indicatorDisabled: Color = GiniTheme.colorScheme.textField.indicator.disabled,
+            indicatorError: Color = GiniTheme.colorScheme.textField.indicator.error,
+            trailingContentFocused: Color = GiniTheme.colorScheme.textField.content.trailing,
+            trailingContentUnfocused: Color = GiniTheme.colorScheme.textField.content.trailing,
+            trailingContentDisabled: Color = GiniTheme.colorScheme.textField.content.trailing,
+            trailingContentError: Color = GiniTheme.colorScheme.textField.content.trailing,
+            labelError: Color = GiniTheme.colorScheme.textField.label.error,
+            labelUnfocused: Color = GiniTheme.colorScheme.textField.label.unfocused,
+            labelFocused: Color = GiniTheme.colorScheme.textField.label.focused,
+            labelDisabled: Color = GiniTheme.colorScheme.textField.label.disabled,
+        ) = GiniTextInputColors(
+            containerFocused = containerFocused,
+            containerUnfocused = containerUnfocused,
+            containerDisabled = containerDisabled,
+            textFocused = textFocused,
+            textUnfocused = textUnfocused,
+            textDisabled = textDisabled,
+            textError = textError,
+            indicatorFocused = indicatorFocused,
+            indicatorUnfocused = indicatorUnfocused,
+            indicatorDisabled = indicatorDisabled,
+            indicatorError = indicatorError,
+            trailingContentFocused = trailingContentFocused,
+            trailingContentUnfocused = trailingContentUnfocused,
+            trailingContentDisabled = trailingContentDisabled,
+            trailingContentError = trailingContentError,
+            labelError = labelError,
+            labelUnfocused = labelUnfocused,
+            labelFocused = labelFocused,
+            labelDisabled = labelDisabled,
+        )
+    }
+}
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/textinput/amount/DecimalFormatter.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/textinput/amount/DecimalFormatter.kt
new file mode 100644
index 0000000000..159576a8e2
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/textinput/amount/DecimalFormatter.kt
@@ -0,0 +1,38 @@
+package net.gini.android.capture.ui.components.textinput.amount
+
+import net.gini.android.capture.Amount
+import java.math.BigDecimal
+import java.text.DecimalFormat
+import java.text.NumberFormat
+
+class DecimalFormatter(
+    val numberFormat: NumberFormat = NumberFormat.getCurrencyInstance().apply {
+        (this as? DecimalFormat)?.apply {
+            decimalFormatSymbols = decimalFormatSymbols.apply {
+                currencySymbol = ""
+            }
+        }
+    }
+) {
+
+    fun parseAmount(amount: BigDecimal) =  numberFormat.format(amount).trim()
+        .filter { it != '.' && it != ',' }
+        .take(7)
+        .trimStart('0')
+
+    fun textToDigits(text: String): String = text.trim()
+        .filter { it != '.' && it != ',' }
+        .take(7)
+        .trimStart('0')
+
+    fun parseDigits(digits: String): BigDecimal =
+        kotlin.runCatching { BigDecimal(digits).divide(BigDecimal(100)) }
+            .getOrElse { BigDecimal.ZERO }
+
+    fun formatDigits(digits: String): String {
+        // Parse to a decimal with two decimal places
+        val decimal = parseDigits(digits)
+        // Format to a currency string
+        return numberFormat.format(decimal).trim()
+    }
+}
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/textinput/amount/DecimalInputVisualTransformation.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/textinput/amount/DecimalInputVisualTransformation.kt
new file mode 100644
index 0000000000..bd4e436547
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/textinput/amount/DecimalInputVisualTransformation.kt
@@ -0,0 +1,89 @@
+package net.gini.android.capture.ui.components.textinput.amount
+
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.input.OffsetMapping
+import androidx.compose.ui.text.input.TransformedText
+import androidx.compose.ui.text.input.VisualTransformation
+import java.text.DecimalFormatSymbols
+
+class DecimalInputVisualTransformation(
+    private val currencyCode: String,
+    private val isCurrencyCodeDisplay: Boolean,
+    private val decimalFormatter: DecimalFormatter,
+) : VisualTransformation {
+
+    override fun filter(text: AnnotatedString): TransformedText {
+        val source = text.text
+        var formatted = decimalFormatter.formatDigits(source).trim()
+        if (isCurrencyCodeDisplay) {
+            formatted += " $currencyCode"
+        }
+
+        val offsetMapping = CustomOffsetMapping(
+            source = source,
+            formatted = formatted,
+        )
+
+        return TransformedText(AnnotatedString(formatted), offsetMapping)
+    }
+
+    class CustomOffsetMapping(
+        private val formattingSymbols: DecimalFormatSymbols = DecimalFormatSymbols.getInstance(),
+        private val source: String,
+        private val formatted: String,
+    ) : OffsetMapping {
+
+
+        /*
+         *   1       ->  0.01      | 1 -> 4
+         *   12      ->  0.12      | 2 -> 4
+         *   123     ->  1.23      | 3 -> 4
+         *   1234    ->  12.34     | 4 -> 5
+         *   12345   ->  123.45    | 5 -> 6
+         *   123456  ->  1,234.56  | 6 -> 8
+         *   1234567 ->  12,345.67 | 7 -> 9
+         */
+
+        override fun originalToTransformed(offset: Int): Int {
+            val thousandSeparatorCount =
+                formatted.count { it == formattingSymbols.groupingSeparator }
+
+            val lastIndex = when (source.length) {
+                in 1..3 -> formatted.length
+                4 -> 5
+                5 -> 6
+                6 -> 8
+                7 -> 9
+                else -> formatted.length
+            }
+
+            return lastIndex
+        }
+
+        /*
+         *    0.01      ->  1        | 4 -> 1
+         *    0.12      ->  12       | 4 -> 2
+         *    1.23      ->  123      | 4 -> 3
+         *    12.34     ->  1234     | 5 -> 4
+         *    123.45    ->  12345    | 6 -> 5
+         *    1,234.56  ->  123456   | 8 -> 6
+         *    12,345.67 ->  1234567  | 9 -> 7
+         */
+
+
+        override fun transformedToOriginal(offset: Int): Int {
+            val thousandSeparatorCount =
+                formatted.count { it == formattingSymbols.groupingSeparator }
+
+            val lastIndex = when (formatted.length) {
+                in 1..4 -> source.length
+                5 -> 4
+                6 -> 5
+                8 -> 6
+                9 -> 7
+                else -> source.length
+            }
+            return lastIndex
+        }
+    }
+}
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/textinput/amount/GiniAmountTextInput.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/textinput/amount/GiniAmountTextInput.kt
new file mode 100644
index 0000000000..229d6a9894
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/textinput/amount/GiniAmountTextInput.kt
@@ -0,0 +1,101 @@
+package net.gini.android.capture.ui.components.textinput.amount
+
+import android.content.res.Configuration
+import android.util.Log
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.VisualTransformation
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import net.gini.android.capture.ui.components.textinput.GiniTextInput
+import net.gini.android.capture.ui.components.textinput.GiniTextInputColors
+import net.gini.android.capture.ui.theme.GiniTheme
+import java.math.BigDecimal
+import java.text.DecimalFormat
+import java.text.NumberFormat
+
+@Composable
+fun GiniAmountTextInput(
+    amount: BigDecimal,
+    currencyCode: String,
+    label: String,
+    modifier: Modifier = Modifier,
+    onValueChange: (BigDecimal) -> Unit,
+    trailingContent: @Composable () -> Unit = {},
+    enabled: Boolean = true,
+    isError: Boolean = false,
+    decimalFormatter: DecimalFormatter = DecimalFormatter(),
+    colors: GiniTextInputColors = GiniTextInputColors.colors(),
+) {
+    val parsedAmount = decimalFormatter.parseAmount(amount)
+
+    var text by remember { mutableStateOf(parsedAmount) }
+    
+    text = parsedAmount
+
+    GiniTextInput(
+        modifier = modifier,
+        text = text,
+        enabled = enabled,
+        isError = isError,
+        keyboardOptions = KeyboardOptions(
+            keyboardType = KeyboardType.Number,
+            imeAction = ImeAction.Done,
+        ),
+        label = label,
+        onValueChange = {
+            text = decimalFormatter.textToDigits(it) // take only 7 digits
+            onValueChange(decimalFormatter.parseDigits(text))
+        },
+        trailingContent = trailingContent,
+        colors = colors,
+        visualTransformation = DecimalInputVisualTransformation(
+            decimalFormatter = decimalFormatter,
+            currencyCode = currencyCode,
+            isCurrencyCodeDisplay = !enabled,
+        ),
+    )
+}
+
+
+@Preview(showBackground = true)
+@Composable
+private fun GiniTextInputPreviewLight() {
+    GiniTextInputPreview()
+}
+
+@Preview(
+    showBackground = true,
+    uiMode = Configuration.UI_MODE_NIGHT_YES
+)
+@Composable
+private fun GiniTextInputPreviewDark() {
+    GiniTextInputPreview()
+}
+
+@Composable
+private fun GiniTextInputPreview() {
+    GiniTheme {
+        GiniAmountTextInput(
+            modifier = Modifier.padding(16.dp),
+            amount = BigDecimal("1234"),
+            label = "Label Text",
+            trailingContent = { },
+            currencyCode = "EUR",
+            onValueChange = {}
+        )
+    }
+}
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/topbar/GiniTopBar.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/topbar/GiniTopBar.kt
new file mode 100644
index 0000000000..5ec05f9af2
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/topbar/GiniTopBar.kt
@@ -0,0 +1,91 @@
+@file:OptIn(ExperimentalMaterial3Api::class)
+
+package net.gini.android.capture.ui.components.topbar
+
+import android.content.res.Configuration
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.rememberVectorPainter
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import net.gini.android.capture.ui.theme.GiniTheme
+
+@Composable
+fun GiniTopBar(
+    title: String,
+    modifier: Modifier = Modifier,
+    navigationIcon: @Composable () -> Unit = {},
+    actions: @Composable RowScope.() -> Unit = {},
+    colors: GiniTopBarColors = GiniTopBarColors.colors(),
+) {
+    GiniTopBar(
+        modifier = modifier, colors = colors, title = {
+            Text(
+                text = title,
+                style = GiniTheme.typography.headline6,
+            )
+        }, navigationIcon = navigationIcon, actions = actions
+    )
+}
+
+@Composable
+fun GiniTopBar(
+    title: @Composable () -> Unit,
+    navigationIcon: @Composable () -> Unit,
+    actions: @Composable RowScope.() -> Unit,
+    modifier: Modifier = Modifier,
+    colors: GiniTopBarColors = GiniTopBarColors.colors(),
+) {
+    TopAppBar(
+        modifier = modifier, colors = with(colors) {
+            TopAppBarDefaults.topAppBarColors(
+                containerColor = containerColor,
+                titleContentColor = contentColor,
+                navigationIconContentColor = contentColor,
+                actionIconContentColor = contentColor,
+            )
+        }, title = title, navigationIcon = navigationIcon, actions = actions
+    )
+}
+
+
+@Preview
+@Composable
+private fun GiniTopBarPreviewLight() {
+    GiniTopBarPreview()
+}
+
+@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
+@Composable
+private fun GiniTopBarPreviewDark() {
+    GiniTopBarPreview()
+}
+
+@Composable
+private fun GiniTopBarPreview() {
+    GiniTheme {
+        GiniTopBar(title = "Title", navigationIcon = {
+            Icon(
+                modifier = Modifier.padding(16.dp),
+                painter = rememberVectorPainter(image = Icons.AutoMirrored.Default.ArrowBack),
+                contentDescription = null,
+            )
+        }, actions = {
+            Icon(
+                modifier = Modifier.padding(16.dp),
+                painter = painterResource(net.gini.android.capture.R.drawable.gc_help_icon),
+                contentDescription = null,
+            )
+        })
+    }
+}
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/topbar/GiniTopBarColors.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/topbar/GiniTopBarColors.kt
new file mode 100644
index 0000000000..bac53b3fa8
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/components/topbar/GiniTopBarColors.kt
@@ -0,0 +1,30 @@
+package net.gini.android.capture.ui.components.topbar
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.graphics.Color
+import net.gini.android.capture.ui.theme.GiniTheme
+
+@Immutable
+data class GiniTopBarColors(
+    val containerColor: Color = Color.Unspecified,
+    val contentColor: Color = Color.Unspecified,
+    val navigationContentColor: Color = Color.Unspecified,
+    val actionContentColor: Color = Color.Unspecified,
+) {
+
+    companion object {
+        @Composable
+        fun colors(
+            containerColor: Color = GiniTheme.colorScheme.topAppBar.container,
+            contentColor: Color = GiniTheme.colorScheme.text.primary,
+            navigationContentColor: Color = GiniTheme.colorScheme.topAppBar.icon.navigation,
+            actionContentColor: Color = GiniTheme.colorScheme.topAppBar.icon.action,
+        ) = GiniTopBarColors(
+            containerColor = containerColor,
+            contentColor = contentColor,
+            navigationContentColor = navigationContentColor,
+            actionContentColor = actionContentColor,
+        )
+    }
+}
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/GiniTheme.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/GiniTheme.kt
new file mode 100644
index 0000000000..a63974838b
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/GiniTheme.kt
@@ -0,0 +1,80 @@
+package net.gini.android.capture.ui.theme
+
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.platform.LocalContext
+import net.gini.android.capture.ui.theme.colors.GiniColorPrimitives
+import net.gini.android.capture.ui.theme.colors.GiniColorScheme
+import net.gini.android.capture.ui.theme.colors.giniDarkColorScheme
+import net.gini.android.capture.ui.theme.colors.giniLightColorScheme
+import net.gini.android.capture.ui.theme.typography.GiniTypography
+import net.gini.android.capture.ui.theme.typography.extractGiniTypography
+
+internal val LocalGiniColors = staticCompositionLocalOf {
+    GiniColorScheme()
+}
+internal val LocalGiniTypography = staticCompositionLocalOf {
+    GiniTypography()
+}
+
+@Composable
+fun GiniTheme(
+    content: @Composable () -> Unit
+) {
+    val context = LocalContext.current
+    val giniPrimitives =
+        remember { GiniColorPrimitives.buildColorPrimitivesBasedOnResources(context) }
+
+    val colors = if (isSystemInDarkTheme()) {
+        giniDarkColorScheme(giniPrimitives)
+    } else {
+        giniLightColorScheme(giniPrimitives)
+    }
+
+    val typography = extractGiniTypography()
+
+    CompositionLocalProvider(
+        LocalGiniTypography provides typography,
+        LocalGiniColors provides colors
+    ) {
+        MaterialTheme(
+            /* colors = ... */
+            content = content,
+            colorScheme = giniColorSchemeBridge(giniPrimitives),
+            typography = MaterialTheme.typography.copy()
+        )
+    }
+}
+
+@Composable
+private fun giniColorSchemeBridge(
+    giniColorPrimitives: GiniColorPrimitives,
+    isLight: Boolean = !isSystemInDarkTheme()
+) = with(giniColorPrimitives) {
+    MaterialTheme.colorScheme.copy(
+        primary = accent01,
+        onPrimary = if (isLight) light01 else light01,
+        background = if (isLight) light02 else dark01,
+        onBackground = if (isLight) dark02 else light01,
+        surface = if (isLight) light01 else dark02,
+        onSurface = if (isLight) dark02 else light02,
+        onSurfaceVariant = if (isLight) dark02 else light02,
+        surfaceVariant = if (isLight) light01 else dark02,
+        inverseOnSurface = if (isLight) dark02 else light02,
+    )
+}
+
+object GiniTheme {
+
+    val typography: GiniTypography
+        @Composable
+        get() = LocalGiniTypography.current
+
+    val colorScheme: GiniColorScheme
+        @Composable
+        get() = LocalGiniColors.current
+}
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/colors/GiniColorPalette.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/colors/GiniColorPalette.kt
new file mode 100644
index 0000000000..19500ad8f9
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/colors/GiniColorPalette.kt
@@ -0,0 +1,424 @@
+package net.gini.android.capture.ui.theme.colors
+
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.graphics.Color
+import net.gini.android.capture.ui.theme.colors.GiniColorScheme.Toggles.Thumb
+import net.gini.android.capture.ui.theme.colors.GiniColorScheme.Toggles.Track
+
+/**
+ * Color scheme of Gini.
+ * All colors are [Color.Unspecified] by default
+ * Represents a Figma color variables and structure.
+ */
+@Immutable
+data class GiniColorScheme(
+    val background: Background = Background(),
+    val bottomBar: BottomBar = BottomBar(),
+    val topAppBar: TopAppBar = TopAppBar(),
+    val placeholder: Placeholder = Placeholder(),
+    val text: Text = Text(),
+    val card: Card = Card(),
+    val badge: Badge = Badge(),
+    val button: Button = Button(),
+    val buttonOutlined: ButtonOutlined = ButtonOutlined(),
+    val textField: TextField = TextField(),
+    val toggles: Toggles = Toggles(),
+    val dialogs: Dialogs = Dialogs(),
+    val icons: Icons = Icons(),
+    val datePicker: DatePicker = DatePicker(),
+) {
+
+    @Immutable
+    data class Background(
+        val primary: Color = Color.Unspecified,
+    )
+
+    @Immutable
+    data class BottomBar(
+        val container: Color = Color.Unspecified,
+        val border: Color = Color.Unspecified,
+    )
+
+    @Immutable
+    data class TopAppBar(
+        val container: Color = Color.Unspecified,
+        val icon: Icon = Icon(),
+    ) {
+        @Immutable
+        data class Icon(
+            val action: Color = Color.Unspecified,
+            val navigation: Color = Color.Unspecified,
+        )
+    }
+
+    @Immutable
+    data class Placeholder(
+        val background: Color = Color.Unspecified,
+        val tint: Color = Color.Unspecified,
+    )
+
+    @Immutable
+    data class Text(
+        val primary: Color = Color.Unspecified,
+        val secondary: Color = Color.Unspecified,
+        val tertiary: Color = Color.Unspecified,
+        val accent: Color = Color.Unspecified,
+        val success: Color = Color.Unspecified,
+    )
+
+    @Immutable
+    data class Card(
+        val container: Color = Color.Unspecified,
+        val containerSuccess: Color = Color.Unspecified,
+        val contentSuccess: Color = Color.Unspecified,
+        val containerWarning: Color = Color.Unspecified,
+        val contentWarning: Color = Color.Unspecified,
+        val containerError: Color = Color.Unspecified,
+        val contentError: Color = Color.Unspecified,
+    )
+
+    @Immutable
+    data class Badge(
+        val container: Color = Color.Unspecified,
+        val content: Color = Color.Unspecified,
+    )
+
+    @Immutable
+    data class Button(
+        val container: Color = Color.Unspecified,
+        val containerLoading: Color = Color.Unspecified,
+        val content: Color = Color.Unspecified,
+    )
+
+    @Immutable
+    data class ButtonOutlined(
+        val container: Color = Color.Unspecified,
+        val content: Color = Color.Unspecified,
+    )
+
+    @Immutable
+    data class TextField(
+        val container: Color = Color.Unspecified,
+        val text: Text = Text(),
+        val label: Label = Label(),
+        val indicator: Indicator = Indicator(),
+        val cursor: Cursor = Cursor(),
+        val content: Content = Content()
+    ) {
+        @Immutable
+        data class Text(
+            val focused: Color = Color.Unspecified,
+            val unfocused: Color = Color.Unspecified,
+            val disabled: Color = Color.Unspecified,
+            val error: Color = Color.Unspecified,
+        )
+
+        @Immutable
+        data class Label(
+            val focused: Color = Color.Unspecified,
+            val unfocused: Color = Color.Unspecified,
+            val disabled: Color = Color.Unspecified,
+            val error: Color = Color.Unspecified,
+        )
+
+        @Immutable
+        data class Indicator(
+            val focused: Color = Color.Unspecified,
+            val unfocused: Color = Color.Unspecified,
+            val disabled: Color = Color.Unspecified,
+            val error: Color = Color.Unspecified,
+        )
+
+        @Immutable
+        data class Cursor(
+            val enabled: Color = Color.Unspecified,
+            val error: Color = Color.Unspecified,
+        )
+
+        @Immutable
+        data class Content(
+            val trailing: Color = Color.Unspecified,
+        )
+    }
+
+    @Immutable
+    data class Toggles(
+        val thumb: Thumb = Thumb(),
+        val track: Track = Track()
+    ) {
+        @Immutable
+        data class Thumb(
+            val selected: Color = Color.Unspecified,
+            val unselected: Color = Color.Unspecified,
+        )
+
+        @Immutable
+        data class Track(
+            val selected: Color = Color.Unspecified,
+            val unselected: Color = Color.Unspecified,
+        )
+    }
+
+    @Immutable
+    data class Dialogs(
+        val container: Color = Color.Unspecified,
+        val text: Color = Color.Unspecified,
+        val labelText: Color = Color.Unspecified
+    )
+
+    @Immutable
+    data class Icons(
+        val secondary: Color = Color.Unspecified,
+    )
+
+    @Immutable
+    data class DatePicker(
+        val container: Color = Color.Unspecified,
+        val divider: Color = Color.Unspecified,
+        val icon: Color = Color.Unspecified,
+
+        val text: Text = Text(),
+        val date: Date = Date(),
+    ) {
+        @Immutable
+        data class Text(
+            val primary: Color = Color.Unspecified,
+            val secondary: Color = Color.Unspecified,
+            val accent: Color = Color.Unspecified,
+        )
+
+        @Immutable
+        data class Date(
+            val containerFocused: Color = Color.Unspecified,
+            val containerOutlined: Color = Color.Unspecified,
+            val contentFocused: Color = Color.Unspecified,
+            val contentOutlined: Color = Color.Unspecified,
+        )
+    }
+}
+
+/**
+ * Created a light color scheme based on primitives.
+ */
+internal fun giniLightColorScheme(
+    giniColorPrimitives: GiniColorPrimitives = GiniColorPrimitives()
+) = with(giniColorPrimitives) {
+    GiniColorScheme(
+        background = GiniColorScheme.Background(primary = light02),
+        bottomBar = GiniColorScheme.BottomBar(
+            container = light01,
+            border = light03
+        ),
+        topAppBar = GiniColorScheme.TopAppBar(
+            container = light01,
+            icon = GiniColorScheme.TopAppBar.Icon(
+                action = dark01,
+                navigation = dark01
+            )
+        ),
+        placeholder = GiniColorScheme.Placeholder(
+            background = light02,
+            tint = dark06
+        ),
+        text = GiniColorScheme.Text(
+            primary = dark02,
+            secondary = dark06,
+            tertiary = light06,
+            accent = accent01,
+            success = success01
+        ),
+        card = GiniColorScheme.Card(
+            container = light01,
+            containerSuccess = success04,
+            contentSuccess = success01,
+            containerWarning = warning04,
+            contentWarning = warning05,
+            containerError = error04,
+            contentError = error01
+        ),
+        badge = GiniColorScheme.Badge(
+            container = success01,
+            content = light01
+        ),
+        button = GiniColorScheme.Button(
+            container = accent01,
+            containerLoading = accent01.copy(alpha = 0.24f),
+            content = light01
+        ),
+        buttonOutlined = GiniColorScheme.ButtonOutlined(
+            container = light04,
+            content = dark02
+        ),
+        textField = GiniColorScheme.TextField(
+            container = light01,
+            text = GiniColorScheme.TextField.Text(
+                focused = dark02,
+                unfocused = dark02,
+                disabled = dark02,
+                error = error02
+            ), label = GiniColorScheme.TextField.Label(
+                focused = accent01,
+                unfocused = dark06,
+                disabled = dark06,
+                error = error02
+            ), indicator = GiniColorScheme.TextField.Indicator(
+                focused = accent01,
+                unfocused = light03,
+                disabled = light01,
+                error = error02
+            ), cursor = GiniColorScheme.TextField.Cursor(
+                enabled = accent01,
+                error = error02
+            ), content = GiniColorScheme.TextField.Content(
+                trailing = dark06
+            )
+        ),
+        toggles = GiniColorScheme.Toggles(
+            thumb = Thumb(
+                selected = light01,
+                unselected = light01
+            ), track = Track(
+                selected = accent01,
+                unselected = light04
+            )
+        ),
+        dialogs = GiniColorScheme.Dialogs(
+            container = light03,
+            text = dark01,
+            labelText = accent01
+        ),
+        icons = GiniColorScheme.Icons(secondary = light06),
+        datePicker = GiniColorScheme.DatePicker(
+            container = light01,
+            divider = light03,
+            icon = dark01,
+            text = GiniColorScheme.DatePicker.Text(
+                primary = dark02,
+                secondary = dark06,
+                accent = accent01
+            ),
+            date = GiniColorScheme.DatePicker.Date(
+                containerFocused = accent01,
+                containerOutlined = accent01,
+                contentFocused = light01,
+                contentOutlined = accent01
+            )
+        )
+
+    )
+}
+
+/**
+ * Created a dark color scheme based on primitives.
+ */
+internal fun giniDarkColorScheme(
+    giniColorPrimitives: GiniColorPrimitives = GiniColorPrimitives()
+) = with(giniColorPrimitives) {
+    GiniColorScheme(
+        background = GiniColorScheme.Background(primary = dark01),
+        bottomBar = GiniColorScheme.BottomBar(
+            container = dark02,
+            border = dark03
+        ),
+        topAppBar = GiniColorScheme.TopAppBar(
+            container = dark02,
+            icon = GiniColorScheme.TopAppBar.Icon(
+                action = light01,
+                navigation = light01
+            )
+        ),
+        placeholder = GiniColorScheme.Placeholder(
+            background = dark04,
+            tint = light06
+        ),
+        text = GiniColorScheme.Text(
+            primary = light01,
+            secondary = light06,
+            tertiary = dark06,
+            accent = accent01,
+            success = success01
+        ),
+        card = GiniColorScheme.Card(
+            container = dark02,
+            containerSuccess = success04,
+            contentSuccess = success01,
+            containerWarning = warning04,
+            contentWarning = warning05,
+            containerError = error04,
+            contentError = error01
+        ),
+        badge = GiniColorScheme.Badge(
+            container = success01,
+            content = light01
+        ),
+        button = GiniColorScheme.Button(
+            container = accent01,
+            containerLoading = accent01.copy(alpha = 0.24f),
+            content = light01
+        ),
+        buttonOutlined = GiniColorScheme.ButtonOutlined(
+            container = dark04,
+            content = light01
+        ),
+        textField = GiniColorScheme.TextField(
+            container = dark02,
+            text = GiniColorScheme.TextField.Text(
+                focused = light01,
+                unfocused = light01,
+                disabled = light01,
+                error = error02
+            ),
+            label = GiniColorScheme.TextField.Label(
+                focused = accent01,
+                unfocused = light06,
+                disabled = light06,
+                error = error02
+            ),
+            indicator = GiniColorScheme.TextField.Indicator(
+                focused = accent01,
+                unfocused = dark03,
+                disabled = dark02,
+                error = error02
+            ),
+            cursor = GiniColorScheme.TextField.Cursor(
+                enabled = accent01,
+                error = error02
+            ),
+            content = GiniColorScheme.TextField.Content(
+                trailing = light06
+            )
+        ),
+        toggles = GiniColorScheme.Toggles(
+            thumb = Thumb(
+                selected = light01,
+                unselected = light01
+            ), track = Track(
+                selected = accent01,
+                unselected = dark04
+            )
+        ),
+        dialogs = GiniColorScheme.Dialogs(
+            container = dark03,
+            text = light01,
+            labelText = accent01
+        ),
+        icons = GiniColorScheme.Icons(secondary = dark06),
+        datePicker = GiniColorScheme.DatePicker(
+            container = dark03,
+            divider = dark04,
+            icon = light01,
+            text = GiniColorScheme.DatePicker.Text(
+                primary = light01,
+                secondary = light06,
+                accent = accent01
+            ),
+            date = GiniColorScheme.DatePicker.Date(
+                containerFocused = accent01,
+                containerOutlined = accent01,
+                contentFocused = light01,
+                contentOutlined = accent01
+            )
+        )
+    )
+}
+
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/colors/GiniColorPrimirives.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/colors/GiniColorPrimirives.kt
new file mode 100644
index 0000000000..42cc87d6cf
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/colors/GiniColorPrimirives.kt
@@ -0,0 +1,101 @@
+package net.gini.android.capture.ui.theme.colors
+
+import android.content.Context
+import androidx.compose.ui.graphics.Color
+import net.gini.android.capture.R
+
+/**
+ * Color primitives of Gini based on Figma.
+ *
+ * Create a new instance of this class carefully because it contains hardcoded values as default.
+ *
+ * Use [GiniColorPrimitives.buildColorPrimitivesBasedOnResources] to create a bridge between XML
+ * resource colors and this class
+ */
+data class GiniColorPrimitives(
+    val accent01: Color = Color(0xFF0A84FF),
+    val accent02: Color = Color(0xFF3193FD),
+    val accent03: Color = Color(0xFF62ACFB),
+    val accent04: Color = Color(0xFF93C4F9),
+    val accent05: Color = Color(0xFFC4DDF7),
+
+    val dark01: Color = Color(0xFF000000),
+    val dark02: Color = Color(0xFF121212),
+    val dark03: Color = Color(0xFF313131),
+    val dark04: Color = Color(0xFF4A4A4A),
+    val dark05: Color = Color(0xFF626262),
+    val dark06: Color = Color(0xFF7A7A7A),
+
+    val light01: Color = Color(0xFFFFFFFF),
+    val light02: Color = Color(0xFFF2F2F2),
+    val light03: Color = Color(0xFFE5E5E5),
+    val light04: Color = Color(0xFFD9D9D9),
+    val light05: Color = Color(0xFFCCCCCC),
+    val light06: Color = Color(0xFFBFBFBF),
+
+    val success01: Color = Color(0xFF09B523),
+    val success02: Color = Color(0xFF32D74B),
+    val success03: Color = Color(0xFFD0ECD4),
+    val success04: Color = Color(0xFFDEEEE1),
+    val success05: Color = Color(0xFF048016),
+
+    val error01: Color = Color(0xFFD9190E),
+    val error02: Color = Color(0xFFFF453A),
+    val error03: Color = Color(0xFFECD0D0),
+    val error04: Color = Color(0xFFEEDEDE),
+    val error05: Color = Color(0xFF830801),
+
+    val warning01: Color = Color(0xFFD9A00E),
+    val warning02: Color = Color(0xFFFFC73A),
+    val warning03: Color = Color(0xFFECE4D0),
+    val warning04: Color = Color(0xFFEEEADE),
+    val warning05: Color = Color(0xFFA17503),
+) {
+    companion object {
+        /**
+         * Bridge between old way of defining colors by overridden resources and Compose
+         *
+         * This function will define color primitives based on resources value at res/colors.xml
+         */
+        internal fun buildColorPrimitivesBasedOnResources(context: Context) = GiniColorPrimitives(
+            accent01 = Color(context.getColor(R.color.gc_accent_01)),
+            accent02 = Color(context.getColor(R.color.gc_accent_02)),
+            accent03 = Color(context.getColor(R.color.gc_accent_03)),
+            accent04 = Color(context.getColor(R.color.gc_accent_04)),
+            accent05 = Color(context.getColor(R.color.gc_accent_05)),
+
+            dark01 = Color(context.getColor(R.color.gc_dark_01)),
+            dark02 = Color(context.getColor(R.color.gc_dark_02)),
+            dark03 = Color(context.getColor(R.color.gc_dark_03)),
+            dark04 = Color(context.getColor(R.color.gc_dark_04)),
+            dark05 = Color(context.getColor(R.color.gc_dark_05)),
+            dark06 = Color(context.getColor(R.color.gc_dark_06)),
+
+            light01 = Color(context.getColor(R.color.gc_light_01)),
+            light02 = Color(context.getColor(R.color.gc_light_02)),
+            light03 = Color(context.getColor(R.color.gc_light_03)),
+            light04 = Color(context.getColor(R.color.gc_light_04)),
+            light05 = Color(context.getColor(R.color.gc_light_05)),
+            light06 = Color(context.getColor(R.color.gc_light_06)),
+
+            success01 = Color(context.getColor(R.color.gc_success_01)),
+            success02 = Color(context.getColor(R.color.gc_success_02)),
+            success03 = Color(context.getColor(R.color.gc_success_03)),
+            success04 = Color(context.getColor(R.color.gc_success_04)),
+            success05 = Color(context.getColor(R.color.gc_success_05)),
+
+            error01 = Color(context.getColor(R.color.gc_error_01)),
+            error02 = Color(context.getColor(R.color.gc_error_02)),
+            error03 = Color(context.getColor(R.color.gc_error_03)),
+            error04 = Color(context.getColor(R.color.gc_error_04)),
+            error05 = Color(context.getColor(R.color.gc_error_05)),
+
+            warning01 = Color(context.getColor(R.color.gc_warning_01)),
+            warning02 = Color(context.getColor(R.color.gc_warning_02)),
+            warning03 = Color(context.getColor(R.color.gc_warning_03)),
+            warning04 = Color(context.getColor(R.color.gc_warning_04)),
+        )
+    }
+}
+
+
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/modifier/Width.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/modifier/Width.kt
new file mode 100644
index 0000000000..d471681906
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/modifier/Width.kt
@@ -0,0 +1,30 @@
+package net.gini.android.capture.ui.theme.modifier
+
+import android.content.res.Configuration
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.unit.max
+import net.gini.android.capture.R
+
+@Composable
+fun Modifier.tabletMaxWidth(): Modifier {
+    return if (isTablet()) {
+        widthIn(max = dimensionResource(id = R.dimen.gc_tablet_width))
+    } else {
+        fillMaxWidth()
+    }
+}
+
+@Composable
+private fun isTablet(): Boolean {
+    val configuration = LocalConfiguration.current
+    return if (configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) {
+        configuration.screenWidthDp > 840
+    } else {
+        configuration.screenWidthDp > 600
+    }
+}
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/typography/GiniTypography.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/typography/GiniTypography.kt
new file mode 100644
index 0000000000..e15102324b
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/typography/GiniTypography.kt
@@ -0,0 +1,45 @@
+package net.gini.android.capture.ui.theme.typography
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import net.gini.android.capture.R
+
+
+@Immutable
+data class GiniTypography(
+    val headline1: TextStyle = TextStyle.Default,
+    val headline2: TextStyle = TextStyle.Default,
+    val headline3: TextStyle = TextStyle.Default,
+    val headline4: TextStyle = TextStyle.Default,
+    val headline5: TextStyle = TextStyle.Default,
+    val headline6: TextStyle = TextStyle.Default,
+    val body1: TextStyle = TextStyle.Default,
+    val body2: TextStyle = TextStyle.Default,
+    val subtitle1: TextStyle = TextStyle.Default,
+    val subtitle2: TextStyle = TextStyle.Default,
+    val button: TextStyle = TextStyle.Default,
+    val caption1: TextStyle = TextStyle.Default,
+    val overline: TextStyle = TextStyle.Default,
+)
+
+fun TextStyle.bold() = this.copy(fontWeight = FontWeight.Bold)
+
+@Composable
+fun extractGiniTypography() = GiniTypography(
+    // https://material.io/blog/migrating-material-3
+    headline1 = textStyleFromTextAppearance(R.style.Root_GiniCaptureTheme_Typography_Headline1),
+    headline2 = textStyleFromTextAppearance(R.style.Root_GiniCaptureTheme_Typography_Headline2),
+    headline3 = textStyleFromTextAppearance(R.style.Root_GiniCaptureTheme_Typography_Headline3),
+    headline4 = textStyleFromTextAppearance(R.style.Root_GiniCaptureTheme_Typography_Headline4),
+    headline5 = textStyleFromTextAppearance(R.style.Root_GiniCaptureTheme_Typography_Headline5),
+    headline6 = textStyleFromTextAppearance(R.style.Root_GiniCaptureTheme_Typography_Headline6),
+    body1 = textStyleFromTextAppearance(R.style.Root_GiniCaptureTheme_Typography_Body1),
+    body2 = textStyleFromTextAppearance(R.style.Root_GiniCaptureTheme_Typography_Body2),
+    subtitle1 = textStyleFromTextAppearance(R.style.Root_GiniCaptureTheme_Typography_Subtitle1),
+    subtitle2 = textStyleFromTextAppearance(R.style.Root_GiniCaptureTheme_Typography_Subtitle2),
+    button = textStyleFromTextAppearance(R.style.Root_GiniCaptureTheme_Typography_Button),
+    caption1 = textStyleFromTextAppearance(R.style.Root_GiniCaptureTheme_Typography_Caption1),
+    overline = textStyleFromTextAppearance(R.style.Root_GiniCaptureTheme_Typography_Overline),
+)
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/typography/TypographyToTextStyleBridge.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/typography/TypographyToTextStyleBridge.kt
new file mode 100644
index 0000000000..1392aad4da
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/typography/TypographyToTextStyleBridge.kt
@@ -0,0 +1,294 @@
+package net.gini.android.capture.ui.theme.typography
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.res.Resources
+import android.content.res.TypedArray
+import android.graphics.Typeface
+import android.os.Build
+import android.util.TypedValue
+import androidx.annotation.AttrRes
+import androidx.annotation.RequiresApi
+import androidx.annotation.StyleRes
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Shadow
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.font.toFontFamily
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.em
+import androidx.compose.ui.unit.sp
+import androidx.core.content.res.FontResourcesParserCompat
+import androidx.core.content.res.getColorOrThrow
+import androidx.core.content.res.use
+import com.google.android.material.composethemeadapter3.R
+import kotlin.concurrent.getOrSet
+
+@Composable
+fun textStyleFromAttribute(
+    @AttrRes attr: Int,
+    density: Density = Density(LocalContext.current),
+    setTextColors: Boolean = true
+): TextStyle {
+    return textStyleFromTextAppearance(
+        getResourceFromAttr(LocalContext.current, attr),
+        density,
+        setTextColors
+    )
+}
+
+@Composable
+fun textStyleFromTextAppearance(
+    @StyleRes id: Int,
+    density: Density = Density(LocalContext.current),
+    setTextColors: Boolean = true
+): TextStyle {
+    return LocalContext.current.obtainStyledAttributes(
+        id,
+        R.styleable.ComposeThemeAdapterTextAppearance
+    ).use { a ->
+        val textStyle =
+            a.getInt(R.styleable.ComposeThemeAdapterTextAppearance_android_textStyle, -1)
+        val textFontWeight =
+            a.getInt(R.styleable.ComposeThemeAdapterTextAppearance_android_textFontWeight, -1)
+        val typeface = a.getInt(R.styleable.ComposeThemeAdapterTextAppearance_android_typeface, -1)
+
+        // TODO read and expand android:fontVariationSettings.
+        // Variable fonts are not supported in Compose yet
+
+        // FYI, this only works with static font files in assets
+        val fontFamily: FontFamilyWithWeight? = a.getFontFamilyOrNull(
+            R.styleable.ComposeThemeAdapterTextAppearance_fontFamily
+        ) ?: a.getFontFamilyOrNull(R.styleable.ComposeThemeAdapterTextAppearance_android_fontFamily)
+
+        TextStyle(
+            fontSize = a.getTextUnit(
+                R.styleable.ComposeThemeAdapterTextAppearance_android_textSize,
+                density
+            ),
+            lineHeight = run {
+                a.getTextUnitOrNull(
+                    R.styleable.ComposeThemeAdapterTextAppearance_lineHeight,
+                    density
+                )
+                    ?: a.getTextUnitOrNull(
+                        R.styleable.ComposeThemeAdapterTextAppearance_android_lineHeight,
+                        density
+                    )
+                    ?: TextUnit.Unspecified
+            },
+            fontFamily = when {
+                fontFamily != null -> fontFamily.fontFamily
+                // Values below are from frameworks/base attrs.xml
+                typeface == 1 -> FontFamily.SansSerif
+                typeface == 2 -> FontFamily.Serif
+                typeface == 3 -> FontFamily.Monospace
+                else -> null
+            },
+            fontStyle = when {
+                (textStyle and Typeface.ITALIC) != 0 -> FontStyle.Italic
+                else -> FontStyle.Normal
+            },
+            fontWeight = when {
+                textFontWeight in 0..149 -> FontWeight.W100
+                textFontWeight in 150..249 -> FontWeight.W200
+                textFontWeight in 250..349 -> FontWeight.W300
+                textFontWeight in 350..449 -> FontWeight.W400
+                textFontWeight in 450..549 -> FontWeight.W500
+                textFontWeight in 550..649 -> FontWeight.W600
+                textFontWeight in 650..749 -> FontWeight.W700
+                textFontWeight in 750..849 -> FontWeight.W800
+                textFontWeight in 850..999 -> FontWeight.W900
+                // Else, check the text style for bold
+                (textStyle and Typeface.BOLD) != 0 -> FontWeight.Bold
+                // Else, the font family might have an implicit weight (san-serif-light, etc)
+                fontFamily != null -> fontFamily.weight
+                else -> null
+            },
+            fontFeatureSettings = a.getString(R.styleable.ComposeThemeAdapterTextAppearance_android_fontFeatureSettings),
+            shadow = run {
+                val shadowColor =
+                    a.getComposeColor(R.styleable.ComposeThemeAdapterTextAppearance_android_shadowColor)
+                if (shadowColor != Color.Unspecified) {
+                    val dx = a.getFloat(
+                        R.styleable.ComposeThemeAdapterTextAppearance_android_shadowDx,
+                        0f
+                    )
+                    val dy = a.getFloat(
+                        R.styleable.ComposeThemeAdapterTextAppearance_android_shadowDy,
+                        0f
+                    )
+                    val rad = a.getFloat(
+                        R.styleable.ComposeThemeAdapterTextAppearance_android_shadowRadius,
+                        0f
+                    )
+                    Shadow(color = shadowColor, offset = Offset(dx, dy), blurRadius = rad)
+                } else null
+            },
+            letterSpacing = when {
+                a.hasValue(R.styleable.ComposeThemeAdapterTextAppearance_android_letterSpacing) -> {
+                    a.getFloat(
+                        R.styleable.ComposeThemeAdapterTextAppearance_android_letterSpacing,
+                        0f
+                    ).em
+                }
+                // FIXME: Normally we'd use TextUnit.Unspecified,
+                // but this can cause a crash due to mismatched Sp and Em TextUnits
+                // https://issuetracker.google.com/issues/182881244
+                else -> 0.em
+            }
+        )
+    }
+}
+
+private fun getResourceFromAttr(context: Context, @AttrRes attr: Int): Int {
+    val typedValue = TypedValue()
+    context.theme.resolveAttribute(attr, typedValue, true)
+    return typedValue.data
+}
+
+private val tempTypedValue = ThreadLocal<TypedValue>()
+
+internal fun TypedArray.getComposeColor(
+    index: Int,
+    fallbackColor: Color = Color.Unspecified
+): Color = if (hasValue(index)) Color(getColorOrThrow(index)) else fallbackColor
+
+/**
+ * Returns the given index as a [FontFamily] and [FontWeight],
+ * or `null` if the value can not be coerced to a [FontFamily].
+ *
+ * @param index index of attribute to retrieve.
+ */
+internal fun TypedArray.getFontFamilyOrNull(index: Int): FontFamilyWithWeight? {
+    val tv = tempTypedValue.getOrSet(::TypedValue)
+    if (getValue(index, tv) && tv.type == TypedValue.TYPE_STRING) {
+        return when (tv.string) {
+            "sans-serif" -> FontFamilyWithWeight(FontFamily.SansSerif)
+            "sans-serif-thin" -> FontFamilyWithWeight(FontFamily.SansSerif, FontWeight.Thin)
+            "sans-serif-light" -> FontFamilyWithWeight(FontFamily.SansSerif, FontWeight.Light)
+            "sans-serif-medium" -> FontFamilyWithWeight(FontFamily.SansSerif, FontWeight.Medium)
+            "sans-serif-black" -> FontFamilyWithWeight(FontFamily.SansSerif, FontWeight.Black)
+            "serif" -> FontFamilyWithWeight(FontFamily.Serif)
+            "cursive" -> FontFamilyWithWeight(FontFamily.Cursive)
+            "monospace" -> FontFamilyWithWeight(FontFamily.Monospace)
+            // TODO: Compose does not expose a FontFamily for all strings yet
+            else -> {
+                // If there's a resource ID and the string starts with res/,
+                // it's probably a @font resource
+                if (tv.resourceId != 0 && tv.string.startsWith("res/")) {
+                    // If we're running on API 23+ and the resource is an XML, we can parse
+                    // the fonts into a full FontFamily.
+                    if (Build.VERSION.SDK_INT >= 23 && tv.string.endsWith(".xml")) {
+                        resources.parseXmlFontFamily(tv.resourceId)?.let(::FontFamilyWithWeight)
+                    } else {
+                        // Otherwise we just load it as a single font
+                        FontFamilyWithWeight(Font(tv.resourceId).toFontFamily())
+                    }
+                } else null
+            }
+        }
+    }
+    return null
+}
+
+@SuppressLint("RestrictedApi") // FontResourcesParserCompat.*
+@RequiresApi(23) // XML font families with >1 fonts are only supported on API 23+
+private fun Resources.parseXmlFontFamily(resourceId: Int): FontFamily? {
+    val parser = getXml(resourceId)
+
+    // Can't use {} since XmlResourceParser is AutoCloseable, not Closeable
+    @Suppress("ConvertTryFinallyToUseCall")
+    try {
+        val result = FontResourcesParserCompat.parse(parser, this)
+        if (result is FontResourcesParserCompat.FontFamilyFilesResourceEntry) {
+            val fonts = result.entries.map { font ->
+                Font(
+                    resId = font.resourceId,
+                    weight = fontWeightOf(font.weight),
+                    style = if (font.isItalic) FontStyle.Italic else FontStyle.Normal
+                )
+            }
+            return FontFamily(fonts)
+        }
+    } finally {
+        parser.close()
+    }
+    return null
+}
+
+private fun fontWeightOf(weight: Int): FontWeight = when (weight) {
+    in 0..149 -> FontWeight.W100
+    in 150..249 -> FontWeight.W200
+    in 250..349 -> FontWeight.W300
+    in 350..449 -> FontWeight.W400
+    in 450..549 -> FontWeight.W500
+    in 550..649 -> FontWeight.W600
+    in 650..749 -> FontWeight.W700
+    in 750..849 -> FontWeight.W800
+    in 850..999 -> FontWeight.W900
+    // Else, we use the 'normal' weight
+    else -> FontWeight.W400
+}
+
+internal data class FontFamilyWithWeight(
+    val fontFamily: FontFamily,
+    val weight: FontWeight = FontWeight.Normal
+)
+
+/**
+ * Returns the given index as a [TextUnit], or [fallback] if the value can not be coerced to
+ * a [TextUnit].
+ *
+ * @param index index of attribute to retrieve.
+ * @param density the current display density.
+ * @param fallback Value to return if the attribute is not defined or cannot be coerced to
+ * a [TextUnit].
+ */
+internal fun TypedArray.getTextUnit(
+    index: Int,
+    density: Density,
+    fallback: TextUnit = TextUnit.Unspecified
+): TextUnit = getTextUnitOrNull(index, density) ?: fallback
+
+/**
+ * Returns the given index as a [TextUnit], or `null` if the value can not be coerced to
+ * a [TextUnit].
+ *
+ * @param index index of attribute to retrieve.
+ * @param density the current display density.
+ */
+internal fun TypedArray.getTextUnitOrNull(
+    index: Int,
+    density: Density
+): TextUnit? {
+    val tv = tempTypedValue.getOrSet { TypedValue() }
+    if (getValue(index, tv) && tv.type == TypedValue.TYPE_DIMENSION) {
+        return when (tv.complexUnitCompat) {
+            // For SP values, we convert the value directly to an TextUnit.Sp
+            TypedValue.COMPLEX_UNIT_SP -> TypedValue.complexToFloat(tv.data).sp
+            // For DIP values, we convert the value to an TextUnit.Em (roughly equivalent)
+            TypedValue.COMPLEX_UNIT_DIP -> TypedValue.complexToFloat(tv.data).em
+            // For another other types, we let the TypedArray flatten to a px value, and
+            // we convert it to an Sp based on the current density
+            else -> with(density) { getDimension(index, 0f).toSp() }
+        }
+    }
+    return null
+}
+
+/**
+ * A workaround since [TypedValue.getComplexUnit] is API 22+
+ */
+private inline val TypedValue.complexUnitCompat
+    get() = when {
+        Build.VERSION.SDK_INT > 22 -> complexUnit
+        else -> TypedValue.COMPLEX_UNIT_MASK and (data shr TypedValue.COMPLEX_UNIT_SHIFT)
+    }
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/util/recyclerview/SnappedItemChangeRecyclerViewListener.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/util/recyclerview/SnappedItemChangeRecyclerViewListener.kt
new file mode 100644
index 0000000000..652a1b74bb
--- /dev/null
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/util/recyclerview/SnappedItemChangeRecyclerViewListener.kt
@@ -0,0 +1,58 @@
+package net.gini.android.capture.util.recyclerview
+
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.SnapHelper
+
+internal class SnappedItemChangeRecyclerViewListener(
+    private val snapHelper: SnapHelper?,
+    private val onItemChanged: (pos: Int) -> Unit,
+) : RecyclerView.OnScrollListener() {
+
+    private var lastPosition = POS_UNKNOWN
+    private var skipNextEventDetection = false
+
+    fun skipNextEventDetection() {
+        skipNextEventDetection = true
+    }
+
+    override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+        super.onScrollStateChanged(recyclerView, newState)
+
+        if (snapHelper == null) return
+
+        if (newState == RecyclerView.SCROLL_STATE_IDLE) {
+
+            if (skipNextEventDetection) {
+                // We need to post action because recycler view need a time to finish scrolling
+                recyclerView.post {
+                    skipNextEventDetection = false
+                }
+                return
+            }
+
+            val layoutManager = recyclerView.layoutManager
+                ?: return // skip if no Layout Manager attached
+
+            val snappedView: View = snapHelper.findSnapView(layoutManager)
+                ?: return // skip if no view found
+
+            val position: Int = recyclerView.getChildAdapterPosition(snappedView)
+
+            // skip if position wasn't changed
+            if (lastPosition == position) return
+
+            onItemChanged(position)
+
+            lastPosition = position
+        }
+    }
+
+    override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+        super.onScrolled(recyclerView, dx, dy)
+    }
+
+    companion object {
+        private const val POS_UNKNOWN = -1
+    }
+}
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_action_bar_back.png b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_action_bar_back.png
deleted file mode 100644
index bd82086f24..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_action_bar_back.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_action_bar_back.webp b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_action_bar_back.webp
new file mode 100644
index 0000000000..0584a29ae1
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_action_bar_back.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_camera_flash_off.png b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_camera_flash_off.png
deleted file mode 100644
index 50d210dfc2..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_camera_flash_off.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_camera_flash_off.webp b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_camera_flash_off.webp
new file mode 100644
index 0000000000..af1f5a5bc3
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_camera_flash_off.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_camera_flash_on.png b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_camera_flash_on.png
deleted file mode 100644
index d56f344ce8..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_camera_flash_on.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_camera_flash_on.webp b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_camera_flash_on.webp
new file mode 100644
index 0000000000..42fdc8d7e9
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_camera_flash_on.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_camera_focus_indicator.png b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_camera_focus_indicator.png
deleted file mode 100644
index 472328ffc9..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_camera_focus_indicator.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_camera_focus_indicator.webp b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_camera_focus_indicator.webp
new file mode 100644
index 0000000000..fde229381d
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_camera_focus_indicator.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_close.png b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_close.png
deleted file mode 100644
index 701b36b2f2..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_close.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_close.webp b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_close.webp
new file mode 100644
index 0000000000..518eea977b
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_close.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_file_import_section_1_illustration.png b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_file_import_section_1_illustration.png
deleted file mode 100644
index e3ed26d219..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_file_import_section_1_illustration.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_file_import_section_1_illustration.webp b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_file_import_section_1_illustration.webp
new file mode 100644
index 0000000000..7b9839635b
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_file_import_section_1_illustration.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_file_import_section_2_illustration.png b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_file_import_section_2_illustration.png
deleted file mode 100644
index 2002456d53..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_file_import_section_2_illustration.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_file_import_section_2_illustration.webp b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_file_import_section_2_illustration.webp
new file mode 100644
index 0000000000..596f58eceb
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_file_import_section_2_illustration.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_forward_icon.png b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_forward_icon.png
deleted file mode 100644
index b0e160d6b0..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_forward_icon.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_forward_icon.webp b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_forward_icon.webp
new file mode 100644
index 0000000000..aaad049e60
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_forward_icon.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_onboarding_align_corners.png b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_onboarding_align_corners.png
deleted file mode 100644
index 6b9ef4e92b..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_onboarding_align_corners.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_onboarding_align_corners.webp b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_onboarding_align_corners.webp
new file mode 100644
index 0000000000..ce308740ba
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_onboarding_align_corners.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_onboarding_lighting.png b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_onboarding_lighting.png
deleted file mode 100644
index 6263844c25..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_onboarding_lighting.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_onboarding_lighting.webp b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_onboarding_lighting.webp
new file mode 100644
index 0000000000..edbdee2f77
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_onboarding_lighting.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_onboarding_multipage.png b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_onboarding_multipage.png
deleted file mode 100644
index 81444809c6..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_onboarding_multipage.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_onboarding_multipage.webp b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_onboarding_multipage.webp
new file mode 100644
index 0000000000..d1dc310646
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_onboarding_multipage.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_onboarding_qr_code.png b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_onboarding_qr_code.png
deleted file mode 100644
index e3b21b991c..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_onboarding_qr_code.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_onboarding_qr_code.webp b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_onboarding_qr_code.webp
new file mode 100644
index 0000000000..824089dd39
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_onboarding_qr_code.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_photo_tip_align.png b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_photo_tip_align.png
deleted file mode 100644
index 82e7663f0b..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_photo_tip_align.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_photo_tip_align.webp b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_photo_tip_align.webp
new file mode 100644
index 0000000000..3c1babf57f
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_photo_tip_align.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_photo_tip_flat.png b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_photo_tip_flat.png
deleted file mode 100644
index 3fdc8c88a4..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_photo_tip_flat.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_photo_tip_flat.webp b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_photo_tip_flat.webp
new file mode 100644
index 0000000000..42ccb766d6
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_photo_tip_flat.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_photo_tip_multipage.png b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_photo_tip_multipage.png
deleted file mode 100644
index 8357f0b368..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_photo_tip_multipage.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_photo_tip_multipage.webp b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_photo_tip_multipage.webp
new file mode 100644
index 0000000000..576eade7b6
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-hdpi/gc_photo_tip_multipage.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_action_bar_back.png b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_action_bar_back.png
deleted file mode 100644
index 2b88069c9a..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_action_bar_back.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_action_bar_back.webp b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_action_bar_back.webp
new file mode 100644
index 0000000000..ceeca2c433
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_action_bar_back.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_camera_flash_off.png b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_camera_flash_off.png
deleted file mode 100644
index 92a31cb5b7..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_camera_flash_off.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_camera_flash_off.webp b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_camera_flash_off.webp
new file mode 100644
index 0000000000..900f68776f
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_camera_flash_off.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_camera_flash_on.png b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_camera_flash_on.png
deleted file mode 100644
index 0da90d8506..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_camera_flash_on.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_camera_flash_on.webp b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_camera_flash_on.webp
new file mode 100644
index 0000000000..7b990dae3f
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_camera_flash_on.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_camera_focus_indicator.png b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_camera_focus_indicator.png
deleted file mode 100644
index 6f01c73a92..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_camera_focus_indicator.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_camera_focus_indicator.webp b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_camera_focus_indicator.webp
new file mode 100644
index 0000000000..f807aedd86
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_camera_focus_indicator.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_close.png b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_close.png
deleted file mode 100644
index 872757b1e0..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_close.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_close.webp b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_close.webp
new file mode 100644
index 0000000000..6dd0463e38
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_close.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_file_import_section_1_illustration.png b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_file_import_section_1_illustration.png
deleted file mode 100644
index d5b8a57e83..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_file_import_section_1_illustration.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_file_import_section_1_illustration.webp b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_file_import_section_1_illustration.webp
new file mode 100644
index 0000000000..f5eb9e4a97
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_file_import_section_1_illustration.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_file_import_section_2_illustration.png b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_file_import_section_2_illustration.png
deleted file mode 100644
index c2df16087f..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_file_import_section_2_illustration.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_file_import_section_2_illustration.webp b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_file_import_section_2_illustration.webp
new file mode 100644
index 0000000000..9f231e2128
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_file_import_section_2_illustration.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_forward_icon.png b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_forward_icon.png
deleted file mode 100644
index 9cf49c36e8..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_forward_icon.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_forward_icon.webp b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_forward_icon.webp
new file mode 100644
index 0000000000..21d837fa8e
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_forward_icon.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_onboarding_align_corners.png b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_onboarding_align_corners.png
deleted file mode 100644
index f836e67e6f..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_onboarding_align_corners.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_onboarding_align_corners.webp b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_onboarding_align_corners.webp
new file mode 100644
index 0000000000..88b6e1c4ad
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_onboarding_align_corners.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_onboarding_lighting.png b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_onboarding_lighting.png
deleted file mode 100644
index d0316fe4b1..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_onboarding_lighting.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_onboarding_lighting.webp b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_onboarding_lighting.webp
new file mode 100644
index 0000000000..512bd6d351
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_onboarding_lighting.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_onboarding_multipage.png b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_onboarding_multipage.png
deleted file mode 100644
index a39d6ed1fd..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_onboarding_multipage.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_onboarding_multipage.webp b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_onboarding_multipage.webp
new file mode 100644
index 0000000000..29d05dfcaa
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_onboarding_multipage.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_onboarding_qr_code.png b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_onboarding_qr_code.png
deleted file mode 100644
index 22d2d15e90..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_onboarding_qr_code.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_onboarding_qr_code.webp b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_onboarding_qr_code.webp
new file mode 100644
index 0000000000..a8d67223ba
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_onboarding_qr_code.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_photo_tip_align.png b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_photo_tip_align.png
deleted file mode 100644
index f83f62d6a5..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_photo_tip_align.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_photo_tip_align.webp b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_photo_tip_align.webp
new file mode 100644
index 0000000000..828b5a7ff7
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_photo_tip_align.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_photo_tip_flat.png b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_photo_tip_flat.png
deleted file mode 100644
index 138acdc583..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_photo_tip_flat.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_photo_tip_flat.webp b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_photo_tip_flat.webp
new file mode 100644
index 0000000000..f192216779
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_photo_tip_flat.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_photo_tip_multipage.png b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_photo_tip_multipage.png
deleted file mode 100644
index b5702246bb..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_photo_tip_multipage.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_photo_tip_multipage.webp b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_photo_tip_multipage.webp
new file mode 100644
index 0000000000..55742c432c
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-mdpi/gc_photo_tip_multipage.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_file_import_section_1_illustration.png b/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_file_import_section_1_illustration.png
deleted file mode 100644
index 19b9b5a6e0..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_file_import_section_1_illustration.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_file_import_section_1_illustration.webp b/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_file_import_section_1_illustration.webp
new file mode 100644
index 0000000000..c41058d572
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_file_import_section_1_illustration.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_file_import_section_2_illustration.png b/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_file_import_section_2_illustration.png
deleted file mode 100644
index b11f4c7afc..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_file_import_section_2_illustration.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_file_import_section_2_illustration.webp b/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_file_import_section_2_illustration.webp
new file mode 100644
index 0000000000..f69fe786c4
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_file_import_section_2_illustration.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_onboarding_align_corners.png b/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_onboarding_align_corners.png
deleted file mode 100644
index efe5f55875..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_onboarding_align_corners.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_onboarding_align_corners.webp b/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_onboarding_align_corners.webp
new file mode 100644
index 0000000000..8d88078551
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_onboarding_align_corners.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_onboarding_lighting.png b/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_onboarding_lighting.png
deleted file mode 100644
index c7df1c74ba..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_onboarding_lighting.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_onboarding_lighting.webp b/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_onboarding_lighting.webp
new file mode 100644
index 0000000000..0461df881c
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_onboarding_lighting.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_onboarding_multipage.png b/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_onboarding_multipage.png
deleted file mode 100644
index 8653b62bf4..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_onboarding_multipage.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_onboarding_multipage.webp b/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_onboarding_multipage.webp
new file mode 100644
index 0000000000..e322b5b4db
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_onboarding_multipage.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_onboarding_qr_code.png b/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_onboarding_qr_code.png
deleted file mode 100644
index 68071d5432..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_onboarding_qr_code.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_onboarding_qr_code.webp b/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_onboarding_qr_code.webp
new file mode 100644
index 0000000000..57c1a53248
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_onboarding_qr_code.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_photo_tip_align.png b/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_photo_tip_align.png
deleted file mode 100644
index 9bbf7ccd59..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_photo_tip_align.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_photo_tip_align.webp b/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_photo_tip_align.webp
new file mode 100644
index 0000000000..c27a8b4634
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_photo_tip_align.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_photo_tip_flat.png b/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_photo_tip_flat.png
deleted file mode 100644
index 8e287bd335..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_photo_tip_flat.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_photo_tip_flat.webp b/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_photo_tip_flat.webp
new file mode 100644
index 0000000000..8491ae1a2b
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_photo_tip_flat.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_photo_tip_multipage.png b/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_photo_tip_multipage.png
deleted file mode 100644
index 013bf3a920..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_photo_tip_multipage.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_photo_tip_multipage.webp b/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_photo_tip_multipage.webp
new file mode 100644
index 0000000000..a5db3c594f
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-hdpi/gc_photo_tip_multipage.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_onboarding_align_corners.png b/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_onboarding_align_corners.png
deleted file mode 100644
index 6b6fde5a5b..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_onboarding_align_corners.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_onboarding_align_corners.webp b/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_onboarding_align_corners.webp
new file mode 100644
index 0000000000..c986533914
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_onboarding_align_corners.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_onboarding_multipage.png b/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_onboarding_multipage.png
deleted file mode 100644
index e173866f0e..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_onboarding_multipage.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_onboarding_multipage.webp b/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_onboarding_multipage.webp
new file mode 100644
index 0000000000..934f94fc54
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_onboarding_multipage.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_onboarding_qr_code.png b/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_onboarding_qr_code.png
deleted file mode 100644
index 6ee73a8417..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_onboarding_qr_code.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_onboarding_qr_code.webp b/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_onboarding_qr_code.webp
new file mode 100644
index 0000000000..1f184bfd34
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_onboarding_qr_code.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_photo_tip_align.png b/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_photo_tip_align.png
deleted file mode 100644
index e226a96ffe..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_photo_tip_align.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_photo_tip_align.webp b/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_photo_tip_align.webp
new file mode 100644
index 0000000000..74fbb66df0
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_photo_tip_align.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_photo_tip_flat.png b/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_photo_tip_flat.png
deleted file mode 100644
index 072dc60f30..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_photo_tip_flat.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_photo_tip_flat.webp b/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_photo_tip_flat.webp
new file mode 100644
index 0000000000..e1dcb6e15e
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_photo_tip_flat.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_photo_tip_multipage.png b/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_photo_tip_multipage.png
deleted file mode 100644
index f5ce176d1c..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_photo_tip_multipage.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_photo_tip_multipage.webp b/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_photo_tip_multipage.webp
new file mode 100644
index 0000000000..9c1ac46913
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-ldpi/gc_photo_tip_multipage.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_file_import_section_1_illustration.png b/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_file_import_section_1_illustration.png
deleted file mode 100644
index f1500775f5..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_file_import_section_1_illustration.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_file_import_section_1_illustration.webp b/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_file_import_section_1_illustration.webp
new file mode 100644
index 0000000000..ba659ed77f
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_file_import_section_1_illustration.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_file_import_section_2_illustration.png b/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_file_import_section_2_illustration.png
deleted file mode 100644
index 830afb39ae..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_file_import_section_2_illustration.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_file_import_section_2_illustration.webp b/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_file_import_section_2_illustration.webp
new file mode 100644
index 0000000000..30e29ebd7a
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_file_import_section_2_illustration.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_onboarding_align_corners.png b/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_onboarding_align_corners.png
deleted file mode 100644
index 344465462b..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_onboarding_align_corners.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_onboarding_align_corners.webp b/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_onboarding_align_corners.webp
new file mode 100644
index 0000000000..20e08f2dab
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_onboarding_align_corners.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_onboarding_lighting.png b/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_onboarding_lighting.png
deleted file mode 100644
index cc8fd44ab5..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_onboarding_lighting.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_onboarding_lighting.webp b/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_onboarding_lighting.webp
new file mode 100644
index 0000000000..32c2f0cf04
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_onboarding_lighting.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_onboarding_multipage.png b/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_onboarding_multipage.png
deleted file mode 100644
index 63844da535..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_onboarding_multipage.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_onboarding_multipage.webp b/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_onboarding_multipage.webp
new file mode 100644
index 0000000000..5c3390b839
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_onboarding_multipage.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_onboarding_qr_code.png b/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_onboarding_qr_code.png
deleted file mode 100644
index c39e92b3cb..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_onboarding_qr_code.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_onboarding_qr_code.webp b/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_onboarding_qr_code.webp
new file mode 100644
index 0000000000..fae235e984
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_onboarding_qr_code.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_photo_tip_align.png b/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_photo_tip_align.png
deleted file mode 100644
index f3fb800e3a..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_photo_tip_align.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_photo_tip_align.webp b/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_photo_tip_align.webp
new file mode 100644
index 0000000000..6aad5ffe03
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_photo_tip_align.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_photo_tip_flat.png b/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_photo_tip_flat.png
deleted file mode 100644
index 9f37a7f987..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_photo_tip_flat.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_photo_tip_flat.webp b/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_photo_tip_flat.webp
new file mode 100644
index 0000000000..b15fae473d
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_photo_tip_flat.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_photo_tip_multipage.png b/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_photo_tip_multipage.png
deleted file mode 100644
index 3c7985b7d1..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_photo_tip_multipage.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_photo_tip_multipage.webp b/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_photo_tip_multipage.webp
new file mode 100644
index 0000000000..4eecc01cd9
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-mdpi/gc_photo_tip_multipage.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_file_import_section_1_illustration.png b/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_file_import_section_1_illustration.png
deleted file mode 100644
index d13aa0dfcb..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_file_import_section_1_illustration.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_file_import_section_1_illustration.webp b/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_file_import_section_1_illustration.webp
new file mode 100644
index 0000000000..7d3e2f7daa
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_file_import_section_1_illustration.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_file_import_section_2_illustration.png b/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_file_import_section_2_illustration.png
deleted file mode 100644
index b905ebc58e..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_file_import_section_2_illustration.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_file_import_section_2_illustration.webp b/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_file_import_section_2_illustration.webp
new file mode 100644
index 0000000000..c7295f5586
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_file_import_section_2_illustration.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_onboarding_align_corners.png b/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_onboarding_align_corners.png
deleted file mode 100644
index 50eac470bd..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_onboarding_align_corners.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_onboarding_align_corners.webp b/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_onboarding_align_corners.webp
new file mode 100644
index 0000000000..16bcaaf265
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_onboarding_align_corners.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_onboarding_lighting.png b/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_onboarding_lighting.png
deleted file mode 100644
index 3b3094c52a..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_onboarding_lighting.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_onboarding_lighting.webp b/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_onboarding_lighting.webp
new file mode 100644
index 0000000000..440be8e55b
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_onboarding_lighting.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_onboarding_multipage.png b/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_onboarding_multipage.png
deleted file mode 100644
index 8ee777333c..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_onboarding_multipage.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_onboarding_multipage.webp b/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_onboarding_multipage.webp
new file mode 100644
index 0000000000..aa6918ba6e
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_onboarding_multipage.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_onboarding_qr_code.png b/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_onboarding_qr_code.png
deleted file mode 100644
index 902dc7bb17..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_onboarding_qr_code.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_onboarding_qr_code.webp b/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_onboarding_qr_code.webp
new file mode 100644
index 0000000000..740133f94b
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_onboarding_qr_code.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_photo_tip_align.png b/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_photo_tip_align.png
deleted file mode 100644
index 1a16f871bc..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_photo_tip_align.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_photo_tip_align.webp b/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_photo_tip_align.webp
new file mode 100644
index 0000000000..f024b07c83
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_photo_tip_align.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_photo_tip_flat.png b/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_photo_tip_flat.png
deleted file mode 100644
index e67f38dfd4..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_photo_tip_flat.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_photo_tip_flat.webp b/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_photo_tip_flat.webp
new file mode 100644
index 0000000000..7a70c88f88
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_photo_tip_flat.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_photo_tip_multipage.png b/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_photo_tip_multipage.png
deleted file mode 100644
index 18d52b49f2..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_photo_tip_multipage.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_photo_tip_multipage.webp b/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_photo_tip_multipage.webp
new file mode 100644
index 0000000000..0b995ebf19
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-xhdpi/gc_photo_tip_multipage.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_file_import_section_1_illustration.png b/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_file_import_section_1_illustration.png
deleted file mode 100644
index d50ede3e4d..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_file_import_section_1_illustration.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_file_import_section_1_illustration.webp b/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_file_import_section_1_illustration.webp
new file mode 100644
index 0000000000..bf6332960b
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_file_import_section_1_illustration.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_file_import_section_2_illustration.png b/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_file_import_section_2_illustration.png
deleted file mode 100644
index 4eebe1f897..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_file_import_section_2_illustration.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_file_import_section_2_illustration.webp b/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_file_import_section_2_illustration.webp
new file mode 100644
index 0000000000..a27d8fd1ce
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_file_import_section_2_illustration.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_onboarding_align_corners.png b/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_onboarding_align_corners.png
deleted file mode 100644
index ecb093e8a9..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_onboarding_align_corners.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_onboarding_align_corners.webp b/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_onboarding_align_corners.webp
new file mode 100644
index 0000000000..5345a58c78
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_onboarding_align_corners.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_onboarding_lighting.png b/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_onboarding_lighting.png
deleted file mode 100644
index 43092b0706..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_onboarding_lighting.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_onboarding_lighting.webp b/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_onboarding_lighting.webp
new file mode 100644
index 0000000000..1eba496982
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_onboarding_lighting.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_onboarding_multipage.png b/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_onboarding_multipage.png
deleted file mode 100644
index 4218e26139..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_onboarding_multipage.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_onboarding_multipage.webp b/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_onboarding_multipage.webp
new file mode 100644
index 0000000000..474309f6e7
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_onboarding_multipage.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_onboarding_qr_code.png b/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_onboarding_qr_code.png
deleted file mode 100644
index d1ad5f3d22..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_onboarding_qr_code.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_onboarding_qr_code.webp b/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_onboarding_qr_code.webp
new file mode 100644
index 0000000000..f21e945d6e
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_onboarding_qr_code.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_photo_tip_align.png b/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_photo_tip_align.png
deleted file mode 100644
index 77ccfeedbc..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_photo_tip_align.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_photo_tip_align.webp b/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_photo_tip_align.webp
new file mode 100644
index 0000000000..246a159420
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_photo_tip_align.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_photo_tip_flat.png b/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_photo_tip_flat.png
deleted file mode 100644
index 9b4f27ba14..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_photo_tip_flat.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_photo_tip_flat.webp b/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_photo_tip_flat.webp
new file mode 100644
index 0000000000..87c112e022
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_photo_tip_flat.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_photo_tip_multipage.png b/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_photo_tip_multipage.png
deleted file mode 100644
index 4b476648e6..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_photo_tip_multipage.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_photo_tip_multipage.webp b/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_photo_tip_multipage.webp
new file mode 100644
index 0000000000..91601cdcb8
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-xxhdpi/gc_photo_tip_multipage.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_file_import_section_1_illustration.png b/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_file_import_section_1_illustration.png
deleted file mode 100644
index c4b5ccecea..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_file_import_section_1_illustration.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_file_import_section_1_illustration.webp b/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_file_import_section_1_illustration.webp
new file mode 100644
index 0000000000..3a9a22c9e2
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_file_import_section_1_illustration.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_file_import_section_2_illustration.png b/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_file_import_section_2_illustration.png
deleted file mode 100644
index 23e682b4a3..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_file_import_section_2_illustration.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_file_import_section_2_illustration.webp b/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_file_import_section_2_illustration.webp
new file mode 100644
index 0000000000..027c85d18c
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_file_import_section_2_illustration.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_onboarding_align_corners.png b/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_onboarding_align_corners.png
deleted file mode 100644
index f789894dbc..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_onboarding_align_corners.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_onboarding_align_corners.webp b/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_onboarding_align_corners.webp
new file mode 100644
index 0000000000..7747ea28e3
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_onboarding_align_corners.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_onboarding_lighting.png b/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_onboarding_lighting.png
deleted file mode 100644
index 43092b0706..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_onboarding_lighting.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_onboarding_lighting.webp b/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_onboarding_lighting.webp
new file mode 100644
index 0000000000..1eba496982
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_onboarding_lighting.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_onboarding_multipage.png b/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_onboarding_multipage.png
deleted file mode 100644
index 4d33377c71..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_onboarding_multipage.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_onboarding_multipage.webp b/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_onboarding_multipage.webp
new file mode 100644
index 0000000000..c45a1f183c
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_onboarding_multipage.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_onboarding_qr_code.png b/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_onboarding_qr_code.png
deleted file mode 100644
index 58a8be3feb..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_onboarding_qr_code.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_onboarding_qr_code.webp b/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_onboarding_qr_code.webp
new file mode 100644
index 0000000000..01cad39fe3
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_onboarding_qr_code.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_photo_tip_align.png b/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_photo_tip_align.png
deleted file mode 100644
index eb6fefa27f..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_photo_tip_align.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_photo_tip_align.webp b/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_photo_tip_align.webp
new file mode 100644
index 0000000000..5f033debaa
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_photo_tip_align.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_photo_tip_flat.png b/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_photo_tip_flat.png
deleted file mode 100644
index fc27bb2571..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_photo_tip_flat.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_photo_tip_flat.webp b/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_photo_tip_flat.webp
new file mode 100644
index 0000000000..97ff9abbe4
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_photo_tip_flat.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_photo_tip_multipage.png b/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_photo_tip_multipage.png
deleted file mode 100644
index 31483ee9cd..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_photo_tip_multipage.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_photo_tip_multipage.webp b/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_photo_tip_multipage.webp
new file mode 100644
index 0000000000..8190acf687
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-night-xxxhdpi/gc_photo_tip_multipage.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_action_bar_back.png b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_action_bar_back.png
deleted file mode 100644
index 69192b5c6a..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_action_bar_back.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_action_bar_back.webp b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_action_bar_back.webp
new file mode 100644
index 0000000000..93aeb72e00
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_action_bar_back.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_camera_flash_off.png b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_camera_flash_off.png
deleted file mode 100644
index 834c75545e..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_camera_flash_off.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_camera_flash_off.webp b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_camera_flash_off.webp
new file mode 100644
index 0000000000..edd481f227
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_camera_flash_off.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_camera_flash_on.png b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_camera_flash_on.png
deleted file mode 100644
index ab3a164df1..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_camera_flash_on.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_camera_flash_on.webp b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_camera_flash_on.webp
new file mode 100644
index 0000000000..9c9abbd6c1
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_camera_flash_on.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_camera_focus_indicator.png b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_camera_focus_indicator.png
deleted file mode 100644
index fbdfc5b7b9..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_camera_focus_indicator.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_camera_focus_indicator.webp b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_camera_focus_indicator.webp
new file mode 100644
index 0000000000..a798d0ecf8
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_camera_focus_indicator.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_close.png b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_close.png
deleted file mode 100644
index f62c26a6bf..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_close.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_close.webp b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_close.webp
new file mode 100644
index 0000000000..4691568ada
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_close.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_file_import_section_1_illustration.png b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_file_import_section_1_illustration.png
deleted file mode 100644
index 554c0069a4..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_file_import_section_1_illustration.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_file_import_section_1_illustration.webp b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_file_import_section_1_illustration.webp
new file mode 100644
index 0000000000..919bf80c96
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_file_import_section_1_illustration.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_file_import_section_2_illustration.png b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_file_import_section_2_illustration.png
deleted file mode 100644
index 43550140af..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_file_import_section_2_illustration.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_file_import_section_2_illustration.webp b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_file_import_section_2_illustration.webp
new file mode 100644
index 0000000000..8350f8a918
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_file_import_section_2_illustration.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_forward_icon.png b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_forward_icon.png
deleted file mode 100644
index 64d8a44b2c..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_forward_icon.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_forward_icon.webp b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_forward_icon.webp
new file mode 100644
index 0000000000..7841814c20
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_forward_icon.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_onboarding_align_corners.png b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_onboarding_align_corners.png
deleted file mode 100644
index 291e0840e7..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_onboarding_align_corners.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_onboarding_align_corners.webp b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_onboarding_align_corners.webp
new file mode 100644
index 0000000000..423676e159
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_onboarding_align_corners.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_onboarding_lighting.png b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_onboarding_lighting.png
deleted file mode 100644
index f8c8e60698..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_onboarding_lighting.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_onboarding_lighting.webp b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_onboarding_lighting.webp
new file mode 100644
index 0000000000..2e82fbb06b
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_onboarding_lighting.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_onboarding_multipage.png b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_onboarding_multipage.png
deleted file mode 100644
index 740029cb7d..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_onboarding_multipage.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_onboarding_multipage.webp b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_onboarding_multipage.webp
new file mode 100644
index 0000000000..2d4545f124
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_onboarding_multipage.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_onboarding_qr_code.png b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_onboarding_qr_code.png
deleted file mode 100644
index 98257bc669..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_onboarding_qr_code.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_onboarding_qr_code.webp b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_onboarding_qr_code.webp
new file mode 100644
index 0000000000..92e83a23a6
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_onboarding_qr_code.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_photo_tip_align.png b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_photo_tip_align.png
deleted file mode 100644
index 77db07d593..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_photo_tip_align.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_photo_tip_align.webp b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_photo_tip_align.webp
new file mode 100644
index 0000000000..b0b1931c65
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_photo_tip_align.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_photo_tip_flat.png b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_photo_tip_flat.png
deleted file mode 100644
index 4475274e49..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_photo_tip_flat.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_photo_tip_flat.webp b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_photo_tip_flat.webp
new file mode 100644
index 0000000000..fb1c0f957f
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_photo_tip_flat.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_photo_tip_multipage.png b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_photo_tip_multipage.png
deleted file mode 100644
index 0587c6a40a..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_photo_tip_multipage.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_photo_tip_multipage.webp b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_photo_tip_multipage.webp
new file mode 100644
index 0000000000..3f3fb486ef
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xhdpi/gc_photo_tip_multipage.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_action_bar_back.png b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_action_bar_back.png
deleted file mode 100644
index 5e0c0bd6f2..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_action_bar_back.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_action_bar_back.webp b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_action_bar_back.webp
new file mode 100644
index 0000000000..ac459dc834
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_action_bar_back.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_camera_flash_off.png b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_camera_flash_off.png
deleted file mode 100644
index 4e0b31bde2..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_camera_flash_off.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_camera_flash_off.webp b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_camera_flash_off.webp
new file mode 100644
index 0000000000..eaef0567a9
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_camera_flash_off.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_camera_flash_on.png b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_camera_flash_on.png
deleted file mode 100644
index 8d9a99fd9c..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_camera_flash_on.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_camera_flash_on.webp b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_camera_flash_on.webp
new file mode 100644
index 0000000000..98a63c064a
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_camera_flash_on.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_camera_focus_indicator.png b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_camera_focus_indicator.png
deleted file mode 100644
index 1d6de0b0f7..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_camera_focus_indicator.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_camera_focus_indicator.webp b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_camera_focus_indicator.webp
new file mode 100644
index 0000000000..8d979acb7d
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_camera_focus_indicator.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_close.png b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_close.png
deleted file mode 100644
index b0eec4bbc9..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_close.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_close.webp b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_close.webp
new file mode 100644
index 0000000000..9857d78739
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_close.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_file_import_section_1_illustration.png b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_file_import_section_1_illustration.png
deleted file mode 100644
index d3483c5e90..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_file_import_section_1_illustration.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_file_import_section_1_illustration.webp b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_file_import_section_1_illustration.webp
new file mode 100644
index 0000000000..295234febb
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_file_import_section_1_illustration.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_file_import_section_2_illustration.png b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_file_import_section_2_illustration.png
deleted file mode 100644
index e933f955ed..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_file_import_section_2_illustration.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_file_import_section_2_illustration.webp b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_file_import_section_2_illustration.webp
new file mode 100644
index 0000000000..42e11c73d6
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_file_import_section_2_illustration.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_forward_icon.png b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_forward_icon.png
deleted file mode 100644
index e432f74089..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_forward_icon.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_forward_icon.webp b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_forward_icon.webp
new file mode 100644
index 0000000000..2666066546
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_forward_icon.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_onboarding_align_corners.png b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_onboarding_align_corners.png
deleted file mode 100644
index 9c37235551..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_onboarding_align_corners.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_onboarding_align_corners.webp b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_onboarding_align_corners.webp
new file mode 100644
index 0000000000..5b53bac80e
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_onboarding_align_corners.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_onboarding_lighting.png b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_onboarding_lighting.png
deleted file mode 100644
index 40a11fe502..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_onboarding_lighting.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_onboarding_lighting.webp b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_onboarding_lighting.webp
new file mode 100644
index 0000000000..e329153df4
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_onboarding_lighting.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_onboarding_multipage.png b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_onboarding_multipage.png
deleted file mode 100644
index 24210fb71b..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_onboarding_multipage.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_onboarding_multipage.webp b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_onboarding_multipage.webp
new file mode 100644
index 0000000000..cb11045d4e
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_onboarding_multipage.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_onboarding_qr_code.png b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_onboarding_qr_code.png
deleted file mode 100644
index f451e7fd36..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_onboarding_qr_code.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_onboarding_qr_code.webp b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_onboarding_qr_code.webp
new file mode 100644
index 0000000000..54b7d44190
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_onboarding_qr_code.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_photo_tip_align.png b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_photo_tip_align.png
deleted file mode 100644
index 2a8689346c..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_photo_tip_align.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_photo_tip_align.webp b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_photo_tip_align.webp
new file mode 100644
index 0000000000..c5ad4fe264
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_photo_tip_align.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_photo_tip_flat.png b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_photo_tip_flat.png
deleted file mode 100644
index c76c2d4c6c..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_photo_tip_flat.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_photo_tip_flat.webp b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_photo_tip_flat.webp
new file mode 100644
index 0000000000..3e91cb61d5
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_photo_tip_flat.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_photo_tip_multipage.png b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_photo_tip_multipage.png
deleted file mode 100644
index 1b6fbded61..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_photo_tip_multipage.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_photo_tip_multipage.webp b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_photo_tip_multipage.webp
new file mode 100644
index 0000000000..b961df6a4e
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxhdpi/gc_photo_tip_multipage.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_action_bar_back.png b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_action_bar_back.png
deleted file mode 100644
index 9cc7df577f..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_action_bar_back.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_action_bar_back.webp b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_action_bar_back.webp
new file mode 100644
index 0000000000..db3fc66c57
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_action_bar_back.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_camera_flash_off.png b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_camera_flash_off.png
deleted file mode 100644
index 788ca84e6c..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_camera_flash_off.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_camera_flash_off.webp b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_camera_flash_off.webp
new file mode 100644
index 0000000000..48453e8177
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_camera_flash_off.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_camera_flash_on.png b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_camera_flash_on.png
deleted file mode 100644
index 1c16f2a1b3..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_camera_flash_on.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_camera_flash_on.webp b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_camera_flash_on.webp
new file mode 100644
index 0000000000..6009ed74ae
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_camera_flash_on.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_camera_focus_indicator.png b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_camera_focus_indicator.png
deleted file mode 100644
index f0ce1961cd..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_camera_focus_indicator.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_camera_focus_indicator.webp b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_camera_focus_indicator.webp
new file mode 100644
index 0000000000..a4f9b1b646
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_camera_focus_indicator.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_close.png b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_close.png
deleted file mode 100644
index 3e55a721a1..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_close.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_close.webp b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_close.webp
new file mode 100644
index 0000000000..2b23c0293c
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_close.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_file_import_section_1_illustration.png b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_file_import_section_1_illustration.png
deleted file mode 100644
index 1bdb12c92f..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_file_import_section_1_illustration.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_file_import_section_1_illustration.webp b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_file_import_section_1_illustration.webp
new file mode 100644
index 0000000000..e755e86d6f
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_file_import_section_1_illustration.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_file_import_section_2_illustration.png b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_file_import_section_2_illustration.png
deleted file mode 100644
index 8f34e5a09a..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_file_import_section_2_illustration.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_file_import_section_2_illustration.webp b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_file_import_section_2_illustration.webp
new file mode 100644
index 0000000000..6f51f4c992
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_file_import_section_2_illustration.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_forward_icon.png b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_forward_icon.png
deleted file mode 100644
index 94094b3086..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_forward_icon.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_forward_icon.webp b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_forward_icon.webp
new file mode 100644
index 0000000000..8176987a8f
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_forward_icon.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_onboarding_align_corners.png b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_onboarding_align_corners.png
deleted file mode 100644
index df57b689a3..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_onboarding_align_corners.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_onboarding_align_corners.webp b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_onboarding_align_corners.webp
new file mode 100644
index 0000000000..617756ae27
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_onboarding_align_corners.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_onboarding_lighting.png b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_onboarding_lighting.png
deleted file mode 100644
index 40a11fe502..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_onboarding_lighting.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_onboarding_lighting.webp b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_onboarding_lighting.webp
new file mode 100644
index 0000000000..e329153df4
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_onboarding_lighting.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_onboarding_multipage.png b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_onboarding_multipage.png
deleted file mode 100644
index 11ae45568c..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_onboarding_multipage.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_onboarding_multipage.webp b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_onboarding_multipage.webp
new file mode 100644
index 0000000000..bbe7f6522a
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_onboarding_multipage.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_onboarding_qr_code.png b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_onboarding_qr_code.png
deleted file mode 100644
index 6a7a3dc211..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_onboarding_qr_code.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_onboarding_qr_code.webp b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_onboarding_qr_code.webp
new file mode 100644
index 0000000000..7713f3af97
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_onboarding_qr_code.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_photo_tip_align.png b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_photo_tip_align.png
deleted file mode 100644
index 2b00db7a83..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_photo_tip_align.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_photo_tip_align.webp b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_photo_tip_align.webp
new file mode 100644
index 0000000000..a10d8f39f2
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_photo_tip_align.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_photo_tip_flat.png b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_photo_tip_flat.png
deleted file mode 100644
index 316bba8432..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_photo_tip_flat.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_photo_tip_flat.webp b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_photo_tip_flat.webp
new file mode 100644
index 0000000000..024d4c404f
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_photo_tip_flat.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_photo_tip_multipage.png b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_photo_tip_multipage.png
deleted file mode 100644
index bb6bd0bcd9..0000000000
Binary files a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_photo_tip_multipage.png and /dev/null differ
diff --git a/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_photo_tip_multipage.webp b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_photo_tip_multipage.webp
new file mode 100644
index 0000000000..7a38d17eca
Binary files /dev/null and b/capture-sdk/sdk/src/main/res/drawable-xxxhdpi/gc_photo_tip_multipage.webp differ
diff --git a/capture-sdk/sdk/src/main/res/drawable/gc_photo_picker_app_icon.xml b/capture-sdk/sdk/src/main/res/drawable/gc_photo_picker_app_icon.xml
new file mode 100644
index 0000000000..b0b85b2c1d
--- /dev/null
+++ b/capture-sdk/sdk/src/main/res/drawable/gc_photo_picker_app_icon.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="M24,24m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"
+      android:fillColor="#5BAAC9"/>
+  <path
+      android:pathData="M31,15H17C15.895,15 15,15.895 15,17V31C15,32.105 15.895,33 17,33H31C32.105,33 33,32.105 33,31V17C33,15.895 32.105,15 31,15Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#FAFAFA"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M20.5,22C21.328,22 22,21.328 22,20.5C22,19.672 21.328,19 20.5,19C19.672,19 19,19.672 19,20.5C19,21.328 19.672,22 20.5,22Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#FAFAFA"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M33,27L28,22L17,33"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#FAFAFA"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/capture-sdk/sdk/src/main/res/layout-sw600dp-land/gc_fragment_camera.xml b/capture-sdk/sdk/src/main/res/layout-sw600dp-land/gc_fragment_camera.xml
index e49318a2f0..ec997a8aa1 100644
--- a/capture-sdk/sdk/src/main/res/layout-sw600dp-land/gc_fragment_camera.xml
+++ b/capture-sdk/sdk/src/main/res/layout-sw600dp-land/gc_fragment_camera.xml
@@ -116,6 +116,7 @@
                 android:clickable="false"
                 android:scaleType="centerInside"
                 android:src="@drawable/gc_camera_flash_on"
+                android:contentDescription="@string/gc_flash_button"
                 app:layout_constraintBottom_toTopOf="@id/gc_camera_flash_button_subtitle"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -183,6 +184,7 @@
                 android:background="@null"
                 android:clickable="false"
                 android:scaleType="centerInside"
+                android:contentDescription="@string/gc_camera_document_import_subtitle"
                 android:src="@drawable/gc_document_import_icon" />
 
             <TextView
diff --git a/capture-sdk/sdk/src/main/res/layout-sw600dp-land/gc_fragment_error.xml b/capture-sdk/sdk/src/main/res/layout-sw600dp-land/gc_fragment_error.xml
index ef84dd5f63..b7aca5b318 100644
--- a/capture-sdk/sdk/src/main/res/layout-sw600dp-land/gc_fragment_error.xml
+++ b/capture-sdk/sdk/src/main/res/layout-sw600dp-land/gc_fragment_error.xml
@@ -24,7 +24,7 @@
         android:alpha="0.15"
         android:background="@color/gc_error_01"/>
 
-    <RelativeLayout
+    <LinearLayout
         android:id="@+id/gc_error_header_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -32,15 +32,16 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_alignParentTop="true"
+        android:orientation="horizontal"
         android:layout_marginTop="@dimen/gc_large"
-        android:minHeight="@dimen/gc_large_64"
-        android:paddingStart="@dimen/gc_large_24"
-        android:paddingEnd="@dimen/gc_large_24">
+        android:minHeight="@dimen/gc_large_42"
+        android:paddingStart="@dimen/gc_large_48"
+        android:paddingEnd="@dimen/gc_large_48">
 
         <ImageView
             android:id="@+id/gc_error_header_icon"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_centerVertical="true"
             android:layout_toStartOf="@id/gc_error_header"
             android:layout_marginEnd="@dimen/gc_large_24"
@@ -51,22 +52,21 @@
             android:id="@+id/gc_error_header"
             style="@style/GiniCaptureTheme.Typography.Body2"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
+            android:layout_height="match_parent"
             android:gravity="center"
             android:text="@string/gc_error_upload_title" />
-    </RelativeLayout>
+    </LinearLayout>
 
     <TextView
         android:id="@+id/gc_error_textview"
         style="@style/GiniCaptureTheme.Typography.Body2"
-        android:layout_width="@dimen/gc_tablet_width"
+        android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginTop="@dimen/gc_large_24"
         android:textColor="@color/gc_dark_06"
         android:text="@string/gc_error_upload_text"
-        android:layout_marginStart="@dimen/gc_large_24"
-        android:layout_marginEnd="@dimen/gc_large_24"
+        android:layout_marginStart="@dimen/gc_large_48"
+        android:layout_marginEnd="@dimen/gc_large_48"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toTopOf="@id/gc_error_button_container"
diff --git a/capture-sdk/sdk/src/main/res/layout-sw600dp/gc_fragment_camera.xml b/capture-sdk/sdk/src/main/res/layout-sw600dp/gc_fragment_camera.xml
index ce965e5716..aa10fb2e93 100644
--- a/capture-sdk/sdk/src/main/res/layout-sw600dp/gc_fragment_camera.xml
+++ b/capture-sdk/sdk/src/main/res/layout-sw600dp/gc_fragment_camera.xml
@@ -116,6 +116,7 @@
                 android:clickable="false"
                 android:scaleType="centerInside"
                 android:src="@drawable/gc_camera_flash_on"
+                android:contentDescription="@string/gc_flash_button"
                 app:layout_constraintBottom_toTopOf="@id/gc_camera_flash_button_subtitle"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -183,6 +184,7 @@
                 android:background="@null"
                 android:clickable="false"
                 android:scaleType="centerInside"
+                android:contentDescription="@string/gc_camera_document_import_subtitle"
                 android:src="@drawable/gc_document_import_icon" />
 
             <TextView
diff --git a/capture-sdk/sdk/src/main/res/layout-sw600dp/gc_fragment_error.xml b/capture-sdk/sdk/src/main/res/layout-sw600dp/gc_fragment_error.xml
index 566c89b681..b7aca5b318 100644
--- a/capture-sdk/sdk/src/main/res/layout-sw600dp/gc_fragment_error.xml
+++ b/capture-sdk/sdk/src/main/res/layout-sw600dp/gc_fragment_error.xml
@@ -24,7 +24,7 @@
         android:alpha="0.15"
         android:background="@color/gc_error_01"/>
 
-    <RelativeLayout
+    <LinearLayout
         android:id="@+id/gc_error_header_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -32,15 +32,16 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_alignParentTop="true"
+        android:orientation="horizontal"
         android:layout_marginTop="@dimen/gc_large"
-        android:minHeight="@dimen/gc_large_64"
-        android:paddingStart="@dimen/gc_large_24"
-        android:paddingEnd="@dimen/gc_large_24">
+        android:minHeight="@dimen/gc_large_42"
+        android:paddingStart="@dimen/gc_large_48"
+        android:paddingEnd="@dimen/gc_large_48">
 
         <ImageView
             android:id="@+id/gc_error_header_icon"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_centerVertical="true"
             android:layout_toStartOf="@id/gc_error_header"
             android:layout_marginEnd="@dimen/gc_large_24"
@@ -51,11 +52,10 @@
             android:id="@+id/gc_error_header"
             style="@style/GiniCaptureTheme.Typography.Body2"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
+            android:layout_height="match_parent"
             android:gravity="center"
             android:text="@string/gc_error_upload_title" />
-    </RelativeLayout>
+    </LinearLayout>
 
     <TextView
         android:id="@+id/gc_error_textview"
diff --git a/capture-sdk/sdk/src/main/res/layout/gc_navigation_bar_top.xml b/capture-sdk/sdk/src/main/res/layout/gc_navigation_bar_top.xml
index 352a437814..00cbbf3c05 100644
--- a/capture-sdk/sdk/src/main/res/layout/gc_navigation_bar_top.xml
+++ b/capture-sdk/sdk/src/main/res/layout/gc_navigation_bar_top.xml
@@ -14,6 +14,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:navigationIconTint="?attr/colorOnBackground"
+        android:touchscreenBlocksFocus="false"
         tools:title="This is a title"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/res/values-en/strings.xml b/capture-sdk/sdk/src/main/res/values-en/strings.xml
index 5eb9e7e8a3..8f62f2e790 100644
--- a/capture-sdk/sdk/src/main/res/values-en/strings.xml
+++ b/capture-sdk/sdk/src/main/res/values-en/strings.xml
@@ -155,4 +155,8 @@
     <string name="gc_useful_tips">Useful tips</string>
     <string name="gc_iban_detected_please_take_picture">\n\nTake a photo</string>
     <string name="gc_iban_detected">IBAN detected</string>
+    <!--   region Date Picker -->
+    <string name="gc_date_picker_select">Select</string>
+    <string name="gc_date_picker_cancel">Cancel</string>
+    <!--   endregion -->
 </resources>
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/main/res/values-sw600dp-land/dimens.xml b/capture-sdk/sdk/src/main/res/values-sw600dp-land/dimens.xml
index 2642c781c0..b3b311659e 100644
--- a/capture-sdk/sdk/src/main/res/values-sw600dp-land/dimens.xml
+++ b/capture-sdk/sdk/src/main/res/values-sw600dp-land/dimens.xml
@@ -7,6 +7,7 @@
     <dimen name="gc_large_20">20dp</dimen>
     <dimen name="gc_large_24">24dp</dimen>
     <dimen name="gc_large_32">32dp</dimen>
+    <dimen name="gc_large_42">52dp</dimen>
     <dimen name="gc_large_48">64dp</dimen>
     <dimen name="gc_large_64">80dp</dimen>
     <dimen name="gc_large_80">96dp</dimen>
diff --git a/capture-sdk/sdk/src/main/res/values-sw600dp/dimens.xml b/capture-sdk/sdk/src/main/res/values-sw600dp/dimens.xml
index fc0073283a..8503147102 100644
--- a/capture-sdk/sdk/src/main/res/values-sw600dp/dimens.xml
+++ b/capture-sdk/sdk/src/main/res/values-sw600dp/dimens.xml
@@ -7,6 +7,7 @@
     <dimen name="gc_large_20">20dp</dimen>
     <dimen name="gc_large_24">24dp</dimen>
     <dimen name="gc_large_32">32dp</dimen>
+    <dimen name="gc_large_42">52dp</dimen>
     <dimen name="gc_large_48">64dp</dimen>
     <dimen name="gc_large_64">80dp</dimen>
     <dimen name="gc_large_80">96dp</dimen>
diff --git a/capture-sdk/sdk/src/main/res/values/colors.xml b/capture-sdk/sdk/src/main/res/values/colors.xml
index 8f72dd0709..99eec28a51 100644
--- a/capture-sdk/sdk/src/main/res/values/colors.xml
+++ b/capture-sdk/sdk/src/main/res/values/colors.xml
@@ -6,6 +6,7 @@
     <color name="gc_accent_03">#62ACFB</color>
     <color name="gc_accent_04">#93C4F9</color>
     <color name="gc_accent_05">#C4DDF7</color>
+    <color name="gc_accent_06">#40007BFF</color>
 
     <color name="gc_dark_01">#000000</color>
     <color name="gc_dark_02">#121212</color>
@@ -13,27 +14,22 @@
     <color name="gc_dark_04">#4A4A4A</color>
     <color name="gc_dark_05">#626262</color>
     <color name="gc_dark_06">#7A7A7A</color>
-
     <color name="gc_light_01">#FFFFFF</color>
     <color name="gc_light_02">#F2F2F2</color>
     <color name="gc_light_03">#E5E5E5</color>
     <color name="gc_light_04">#D9D9D9</color>
     <color name="gc_light_05">#CCCCCC</color>
     <color name="gc_light_06">#BFBFBF</color>
-
     <color name="gc_success_01">#09B523</color>
     <color name="gc_success_02">#32D74B</color>
     <color name="gc_success_03">#D0ECD4</color>
     <color name="gc_success_04">#DEEEE1</color>
     <color name="gc_success_05">#048016</color>
-
-
     <color name="gc_error_01">#D9190E</color>
     <color name="gc_error_02">#FF453A</color>
     <color name="gc_error_03">#ECD0D0</color>
     <color name="gc_error_04">#EEDEDE</color>
     <color name="gc_error_05">#830801</color>
-
     <color name="gc_warning_01">#D9A00E</color>
     <color name="gc_warning_02">#FFC73A</color>
     <color name="gc_warning_03">#ECE4D0</color>
diff --git a/capture-sdk/sdk/src/main/res/values/dimens.xml b/capture-sdk/sdk/src/main/res/values/dimens.xml
index 1e3350c927..115372ddcf 100644
--- a/capture-sdk/sdk/src/main/res/values/dimens.xml
+++ b/capture-sdk/sdk/src/main/res/values/dimens.xml
@@ -6,6 +6,7 @@
     <dimen name="gc_large_20">20dp</dimen>
     <dimen name="gc_large_24">24dp</dimen>
     <dimen name="gc_large_32">32dp</dimen>
+    <dimen name="gc_large_42">42dp</dimen>
     <dimen name="gc_large_48">48dp</dimen>
     <dimen name="gc_large_64">64dp</dimen>
     <dimen name="gc_large_80">80dp</dimen>
diff --git a/capture-sdk/sdk/src/main/res/values/strings.xml b/capture-sdk/sdk/src/main/res/values/strings.xml
index 58ef480764..54a4d1fab6 100644
--- a/capture-sdk/sdk/src/main/res/values/strings.xml
+++ b/capture-sdk/sdk/src/main/res/values/strings.xml
@@ -173,4 +173,8 @@
     <string name="gc_menu_item_close_button_content_description">Schließen, Schaltfläche</string>
     <string name="gc_iban_detected_please_take_picture">\n\nMachen Sie ein Foto</string>
     <string name="gc_iban_detected">IBAN erkannt</string>
+    <!--   region Date Picker -->
+    <string name="gc_date_picker_select">Auswählen</string>
+    <string name="gc_date_picker_cancel">Abbrechen</string>
+    <!--   endregion -->
 </resources>
diff --git a/capture-sdk/sdk/src/main/res/values/styles.xml b/capture-sdk/sdk/src/main/res/values/styles.xml
index 96ff4b9267..7d009a7a21 100644
--- a/capture-sdk/sdk/src/main/res/values/styles.xml
+++ b/capture-sdk/sdk/src/main/res/values/styles.xml
@@ -14,6 +14,7 @@
         <item name="colorSurfaceVariant">@color/gc_light_01</item>
         <item name="colorOnSurfaceVariant">?attr/colorOnBackground</item>
         <item name="android:windowLightStatusBar">true</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="colorAccent">?attr/colorPrimary</item>
         <item name="gcPageItemBackground">@color/gc_light_01</item>
         <item name="gcErrorScreenSubtitle">@color/gc_dark_05</item>
@@ -44,6 +45,7 @@
         <item name="textAppearanceBodySmall">?attr/textAppearanceCaption</item>
         <item name="textAppearanceLabelLarge">?attr/textAppearanceButton</item>
         <item name="textAppearanceLabelMedium">?attr/textAppearanceOverline</item>
+        <item name="android:colorControlHighlight">@color/gc_accent_06</item>
     </style>
 
     <style name="Root.GiniCaptureTheme" parent="Root.GiniCaptureTheme.Internal"/>
diff --git a/capture-sdk/sdk/src/test/java/net/gini/android/capture/analysis/AnalysisFragmentTest.kt b/capture-sdk/sdk/src/test/java/net/gini/android/capture/analysis/AnalysisFragmentTest.kt
index 7d80fd2552..f41293f9b2 100644
--- a/capture-sdk/sdk/src/test/java/net/gini/android/capture/analysis/AnalysisFragmentTest.kt
+++ b/capture-sdk/sdk/src/test/java/net/gini/android/capture/analysis/AnalysisFragmentTest.kt
@@ -7,6 +7,7 @@ import androidx.fragment.app.testing.FragmentScenario
 import androidx.lifecycle.Lifecycle
 import androidx.navigation.Navigation
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.spy
 import com.nhaarman.mockitokotlin2.verify
@@ -17,6 +18,7 @@ import net.gini.android.capture.document.ImageDocument
 import net.gini.android.capture.tracking.AnalysisScreenEvent
 import net.gini.android.capture.tracking.Event
 import net.gini.android.capture.tracking.EventTracker
+import net.gini.android.capture.tracking.useranalytics.UserAnalytics
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -33,8 +35,10 @@ class AnalysisFragmentTest {
     fun `triggers Cancel event when back was pressed`() {
         // Given
         val eventTracker = spy<EventTracker>()
-        GiniCapture.Builder().setEventTracker(eventTracker).build()
+        GiniCapture.newInstance(InstrumentationRegistry.getInstrumentation().context)
+            .setEventTracker(eventTracker).build()
         GiniCapture.getInstance().internal().imageMultiPageDocumentMemoryStore.setMultiPageDocument(mock())
+        UserAnalytics.initialize(InstrumentationRegistry.getInstrumentation().context)
 
         val bundle = Bundle().apply {
             putParcelable("GC_ARGS_DOCUMENT", mock<ImageDocument>().apply {
diff --git a/capture-sdk/sdk/src/test/java/net/gini/android/capture/analysis/AnalysisScreenPresenterTest.kt b/capture-sdk/sdk/src/test/java/net/gini/android/capture/analysis/AnalysisScreenPresenterTest.kt
index 925589ce6b..3bc495621b 100644
--- a/capture-sdk/sdk/src/test/java/net/gini/android/capture/analysis/AnalysisScreenPresenterTest.kt
+++ b/capture-sdk/sdk/src/test/java/net/gini/android/capture/analysis/AnalysisScreenPresenterTest.kt
@@ -140,7 +140,7 @@ class AnalysisScreenPresenterTest {
     }
 
     private fun createGiniCaptureInstance(): GiniCapture {
-        GiniCapture.newInstance(mActivity)
+        GiniCapture.newInstance(InstrumentationRegistry.getInstrumentation().context)
             .setGiniCaptureNetworkService(mock())
             .build()
         return GiniCapture.getInstance()
diff --git a/capture-sdk/sdk/src/test/java/net/gini/android/capture/camera/CameraFragmentImplTest.kt b/capture-sdk/sdk/src/test/java/net/gini/android/capture/camera/CameraFragmentImplTest.kt
index c270d3bf82..6054d9c5f0 100644
--- a/capture-sdk/sdk/src/test/java/net/gini/android/capture/camera/CameraFragmentImplTest.kt
+++ b/capture-sdk/sdk/src/test/java/net/gini/android/capture/camera/CameraFragmentImplTest.kt
@@ -1,11 +1,18 @@
 package net.gini.android.capture.camera
 
 import android.app.Activity
+import android.view.View
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentTransaction
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
 import com.nhaarman.mockitokotlin2.*
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.spyk
 import jersey.repackaged.jsr166e.CompletableFuture
 import net.gini.android.capture.GiniCapture
 import net.gini.android.capture.internal.camera.api.CameraInterface
@@ -14,6 +21,7 @@ import net.gini.android.capture.internal.util.CancelListener
 import net.gini.android.capture.tracking.CameraScreenEvent
 import net.gini.android.capture.tracking.Event
 import net.gini.android.capture.tracking.EventTracker
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsEventTracker
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -32,7 +40,7 @@ class CameraFragmentImplTest {
         val eventTracker = spy<EventTracker>()
         GiniCapture.Builder().setEventTracker(eventTracker).build()
 
-        val fragmentImpl = object: CameraFragmentImpl(mock(), mock<CancelListener>(), false) {
+        val fragmentImpl = object : CameraFragmentImpl(mock(), mock<CancelListener>(), false) {
             override fun createCameraController(activity: Activity?): CameraInterface {
                 return mock<CameraInterface>().apply {
                     whenever(isPreviewRunning).thenReturn(true)
@@ -88,6 +96,17 @@ class CameraFragmentImplTest {
 
         val fragmentImpl = CameraFragmentImpl(fragmentCallbackStub, mock(),false)
 
+        val noPermissionLayoutMock = mock<ConstraintLayout> {
+            on { visibility } doReturn View.INVISIBLE
+        }
+        val analyticsTrackerMock = mock<UserAnalyticsEventTracker> {
+            on { trackEvent(any()) }.then {}
+            on { trackEvent(any(), any()) }.then {}
+        }
+
+        fragmentImpl.mLayoutNoPermission = noPermissionLayoutMock
+        fragmentImpl.mUserAnalyticsEventTracker = analyticsTrackerMock
+
         // When
         fragmentImpl.startHelpActivity()
 
diff --git a/capture-sdk/sdk/src/test/java/net/gini/android/capture/camera/CameraFragmentTest.kt b/capture-sdk/sdk/src/test/java/net/gini/android/capture/camera/CameraFragmentTest.kt
index ded765cdc0..5d9a9baa4d 100644
--- a/capture-sdk/sdk/src/test/java/net/gini/android/capture/camera/CameraFragmentTest.kt
+++ b/capture-sdk/sdk/src/test/java/net/gini/android/capture/camera/CameraFragmentTest.kt
@@ -7,6 +7,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.navigation.NavController
 import androidx.navigation.Navigation
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.spy
 import com.nhaarman.mockitokotlin2.verify
@@ -14,6 +15,7 @@ import net.gini.android.capture.GiniCapture
 import net.gini.android.capture.tracking.CameraScreenEvent
 import net.gini.android.capture.tracking.Event
 import net.gini.android.capture.tracking.EventTracker
+import net.gini.android.capture.tracking.useranalytics.UserAnalytics
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -31,6 +33,7 @@ class CameraFragmentTest {
         // Given
         val eventTracker = spy<EventTracker>()
         GiniCapture.Builder().setEventTracker(eventTracker).build()
+        UserAnalytics.initialize(InstrumentationRegistry.getInstrumentation().context)
 
         val navController = mock<NavController>()
 
diff --git a/capture-sdk/sdk/src/test/java/net/gini/android/capture/onboarding/OnboardingScreenPresenterTest.kt b/capture-sdk/sdk/src/test/java/net/gini/android/capture/onboarding/OnboardingScreenPresenterTest.kt
index e105e6906a..7a4fdbe6ce 100644
--- a/capture-sdk/sdk/src/test/java/net/gini/android/capture/onboarding/OnboardingScreenPresenterTest.kt
+++ b/capture-sdk/sdk/src/test/java/net/gini/android/capture/onboarding/OnboardingScreenPresenterTest.kt
@@ -4,12 +4,14 @@ import android.app.Activity
 import com.google.common.collect.Lists
 import com.google.common.truth.Correspondence
 import com.google.common.truth.Truth
-import com.nhaarman.mockitokotlin2.eq
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.never
-import com.nhaarman.mockitokotlin2.spy
-import com.nhaarman.mockitokotlin2.times
-import com.nhaarman.mockitokotlin2.verify
+import io.mockk.Runs
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.mockkObject
+import io.mockk.mockkStatic
+import io.mockk.spyk
+import io.mockk.verify
 import junitparams.JUnitParamsRunner
 import junitparams.Parameters
 import net.gini.android.capture.GiniCapture
@@ -19,13 +21,12 @@ import net.gini.android.capture.onboarding.view.OnboardingNavigationBarBottomAda
 import net.gini.android.capture.tracking.Event
 import net.gini.android.capture.tracking.EventTracker
 import net.gini.android.capture.tracking.OnboardingScreenEvent
+import net.gini.android.capture.tracking.useranalytics.UserAnalytics
+import net.gini.android.capture.tracking.useranalytics.UserAnalyticsEventTracker
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
-import org.mockito.Mockito
-import org.mockito.MockitoAnnotations
 
 /**
  * Created by Alpar Szotyori on 20.05.2019.
@@ -35,20 +36,33 @@ import org.mockito.MockitoAnnotations
 @RunWith(JUnitParamsRunner::class)
 class OnboardingScreenPresenterTest {
 
-    @Mock
+
     private lateinit var mActivity: Activity
 
-    @Mock
+
     private lateinit var mView: OnboardingScreenContract.View
 
-    private val onboardingPageComparator = Correspondence.from<OnboardingPage, OnboardingPage>({ actual, expected ->
-        actual?.titleResId == expected?.titleResId && actual?.messageResId == expected?.messageResId
-    }, "is equivalent to")
+
+    private lateinit var mUserAnalyticsEventTracker: UserAnalyticsEventTracker
+
+    private val onboardingPageComparator =
+        Correspondence.from<OnboardingPage, OnboardingPage>({ actual, expected ->
+            actual?.titleResId == expected?.titleResId && actual?.messageResId == expected?.messageResId
+        }, "is equivalent to")
 
     @Before
-    @Throws(Exception::class)
     fun setUp() {
-        MockitoAnnotations.openMocks(this)
+        mUserAnalyticsEventTracker = mockk<UserAnalyticsEventTracker>().apply {
+            every { trackEvent(any()) } just Runs
+            every { trackEvent(any(), any()) } just Runs
+        }
+        mActivity = mockk()
+
+        mockkObject(UserAnalytics)
+
+        mView = mockk<OnboardingScreenContract.View>(relaxed = true)
+
+        every { UserAnalytics.getAnalyticsEventTracker() } returns mUserAnalyticsEventTracker
     }
 
     @After
@@ -68,14 +82,22 @@ class OnboardingScreenPresenterTest {
 
         // When
         val customPages: List<OnboardingPage> = Lists.newArrayList(
-            OnboardingPage(R.string.gc_onboarding_align_corners_title, R.string.gc_onboarding_align_corners_message, null),
-            OnboardingPage(R.string.gc_onboarding_lighting_title, R.string.gc_onboarding_lighting_message, null)
+            OnboardingPage(
+                R.string.gc_onboarding_align_corners_title,
+                R.string.gc_onboarding_align_corners_message,
+                null
+            ),
+            OnboardingPage(
+                R.string.gc_onboarding_lighting_title,
+                R.string.gc_onboarding_lighting_message,
+                null
+            )
         )
         presenter.setCustomPages(customPages)
         presenter.showNextPage()
 
         // Then
-        Mockito.verify(mView).scrollToPage(1)
+        verify { mView.scrollToPage(1) }
     }
 
     @Test
@@ -86,15 +108,23 @@ class OnboardingScreenPresenterTest {
 
         // When
         val customPages: List<OnboardingPage> = Lists.newArrayList(
-            OnboardingPage(R.string.gc_onboarding_align_corners_title, R.string.gc_onboarding_align_corners_message, null),
-            OnboardingPage(R.string.gc_onboarding_lighting_title, R.string.gc_onboarding_lighting_message, null)
+            OnboardingPage(
+                R.string.gc_onboarding_align_corners_title,
+                R.string.gc_onboarding_align_corners_message,
+                null
+            ),
+            OnboardingPage(
+                R.string.gc_onboarding_lighting_title,
+                R.string.gc_onboarding_lighting_message,
+                null
+            )
         )
         presenter.setCustomPages(customPages)
         presenter.onScrolledToPage(1)
         presenter.showNextPage()
 
         // Then
-        Mockito.verify(mView).close()
+        verify { mView.close() }
     }
 
     @Test
@@ -105,14 +135,22 @@ class OnboardingScreenPresenterTest {
 
         // When
         val customPages: List<OnboardingPage> = Lists.newArrayList(
-            OnboardingPage(R.string.gc_onboarding_align_corners_title, R.string.gc_onboarding_align_corners_message, null),
-            OnboardingPage(R.string.gc_onboarding_lighting_title, R.string.gc_onboarding_lighting_message, null)
+            OnboardingPage(
+                R.string.gc_onboarding_align_corners_title,
+                R.string.gc_onboarding_align_corners_message,
+                null
+            ),
+            OnboardingPage(
+                R.string.gc_onboarding_lighting_title,
+                R.string.gc_onboarding_lighting_message,
+                null
+            )
         )
         presenter.setCustomPages(customPages)
         presenter.onScrolledToPage(1)
 
         // Then
-        Mockito.verify(mView).activatePageIndicatorForPage(1)
+        verify { mView.activatePageIndicatorForPage(1) }
     }
 
     @Test
@@ -125,7 +163,7 @@ class OnboardingScreenPresenterTest {
         presenter.start()
 
         // Then
-        Mockito.verify(mView).showPages(presenter.pages)
+        verify { mView.showPages(presenter.pages) }
     }
 
     @Test
@@ -138,7 +176,7 @@ class OnboardingScreenPresenterTest {
         presenter.start()
 
         // Then
-        Mockito.verify(mView).scrollToPage(0)
+        verify { mView.scrollToPage(0) }
     }
 
     @Test
@@ -146,12 +184,20 @@ class OnboardingScreenPresenterTest {
     fun `trigger finish event when clicking next on the last page`() {
         // Given
         val presenter = createPresenter()
-        val eventTracker = spy<EventTracker>()
+        val eventTracker = spyk<EventTracker>()
         GiniCapture.Builder().setEventTracker(eventTracker).build()
 
         val customPages: List<OnboardingPage> = Lists.newArrayList(
-            OnboardingPage(R.string.gc_onboarding_align_corners_title, R.string.gc_onboarding_align_corners_message, null),
-            OnboardingPage(R.string.gc_onboarding_lighting_title, R.string.gc_onboarding_lighting_message, null)
+            OnboardingPage(
+                R.string.gc_onboarding_align_corners_title,
+                R.string.gc_onboarding_align_corners_message,
+                null
+            ),
+            OnboardingPage(
+                R.string.gc_onboarding_lighting_title,
+                R.string.gc_onboarding_lighting_message,
+                null
+            )
         )
         presenter.setCustomPages(customPages)
         presenter.onScrolledToPage(1)
@@ -160,7 +206,7 @@ class OnboardingScreenPresenterTest {
         presenter.showNextPage()
 
         // Then
-        Mockito.verify(eventTracker).onOnboardingScreenEvent(Event(OnboardingScreenEvent.FINISH))
+        verify { eventTracker.onOnboardingScreenEvent(Event(OnboardingScreenEvent.FINISH)) }
     }
 
     @Test
@@ -168,14 +214,14 @@ class OnboardingScreenPresenterTest {
     fun `trigger finish event when clicking the skip button`() {
         // Given
         val presenter = createPresenter()
-        val eventTracker = spy<EventTracker>()
+        val eventTracker = spyk<EventTracker>()
         GiniCapture.Builder().setEventTracker(eventTracker).build()
 
         // When
         presenter.skip()
 
         // Then
-        Mockito.verify(eventTracker).onOnboardingScreenEvent(Event(OnboardingScreenEvent.FINISH))
+        verify { eventTracker.onOnboardingScreenEvent(Event(OnboardingScreenEvent.FINISH)) }
     }
 
     @Test
@@ -183,14 +229,14 @@ class OnboardingScreenPresenterTest {
     fun `trigger start event`() {
         // Given
         val presenter = createPresenter()
-        val eventTracker = spy<EventTracker>()
+        val eventTracker = spyk<EventTracker>()
         GiniCapture.Builder().setEventTracker(eventTracker).build()
 
         // When
         presenter.start()
 
         // Then
-        Mockito.verify(eventTracker).onOnboardingScreenEvent(Event(OnboardingScreenEvent.START))
+        verify() { eventTracker.onOnboardingScreenEvent(Event(OnboardingScreenEvent.START)) }
     }
 
     @Test
@@ -243,7 +289,7 @@ class OnboardingScreenPresenterTest {
         presenter.skip()
 
         // Then
-        verify(mView).close()
+        verify { mView.close() }
     }
 
     @Test
@@ -258,13 +304,21 @@ class OnboardingScreenPresenterTest {
         presenter.start()
 
         // Then
-        verify(mView).setNavigationBarBottomAdapterInstance(eq(GiniCapture.getInstance().internal().onboardingNavigationBarBottomAdapterInstance))
+        verify {
+            mView.setNavigationBarBottomAdapterInstance(
+                eq(
+                    GiniCapture.getInstance()
+                        .internal().onboardingNavigationBarBottomAdapterInstance
+                )
+            )
+        }
     }
 
     @Test
     fun `use custom onboarding bottom navigation bar if enabled`() {
         // Given
-        val customOnboardingNavigationBarBottomAdapter = mock<OnboardingNavigationBarBottomAdapter>()
+        val customOnboardingNavigationBarBottomAdapter =
+            mockk<OnboardingNavigationBarBottomAdapter>()
         GiniCapture.Builder()
             .setBottomNavigationBarEnabled(true)
             .setOnboardingNavigationBarBottomAdapter(customOnboardingNavigationBarBottomAdapter)
@@ -275,12 +329,21 @@ class OnboardingScreenPresenterTest {
         presenter.start()
 
         // Then
-        verify(mView).setNavigationBarBottomAdapterInstance(eq(GiniCapture.getInstance().internal().onboardingNavigationBarBottomAdapterInstance))
+        verify {
+            mView.setNavigationBarBottomAdapterInstance(
+                eq(
+                    GiniCapture.getInstance()
+                        .internal().onboardingNavigationBarBottomAdapterInstance
+                )
+            )
+        }
     }
 
     @Test
     @Parameters("false", "true")
-    fun `show skip and next buttons when not on last page - (isBottomNavigationBarEnabled) `(isBottomNavigationBarEnabled: Boolean) {
+    fun `show skip and next buttons when not on last page - (isBottomNavigationBarEnabled) `(
+        isBottomNavigationBarEnabled: Boolean
+    ) {
         // Given
         GiniCapture.Builder()
             .setBottomNavigationBarEnabled(isBottomNavigationBarEnabled)
@@ -292,17 +355,19 @@ class OnboardingScreenPresenterTest {
 
         // Then
         if (isBottomNavigationBarEnabled) {
-            verify(mView, never()).showSkipAndNextButtons()
-            verify(mView).showSkipAndNextButtonsInNavigationBarBottom()
+            verify(exactly = 0) { mView.showSkipAndNextButtons() }
+            verify { mView.showSkipAndNextButtonsInNavigationBarBottom() }
         } else {
-            verify(mView).showSkipAndNextButtons()
-            verify(mView, never()).showSkipAndNextButtonsInNavigationBarBottom()
+            verify { mView.showSkipAndNextButtons() }
+            verify(exactly = 0) { mView.showSkipAndNextButtonsInNavigationBarBottom() }
         }
     }
 
     @Test
     @Parameters("false", "true")
-    fun `show skip and next buttons after going back from the last page - (isBottomNavigationBarEnabled) `(isBottomNavigationBarEnabled: Boolean) {
+    fun `show skip and next buttons after going back from the last page - (isBottomNavigationBarEnabled) `(
+        isBottomNavigationBarEnabled: Boolean
+    ) {
         // Given
         GiniCapture.Builder()
             .setBottomNavigationBarEnabled(isBottomNavigationBarEnabled)
@@ -310,8 +375,16 @@ class OnboardingScreenPresenterTest {
         val presenter = createPresenter()
 
         val customPages: List<OnboardingPage> = Lists.newArrayList(
-            OnboardingPage(R.string.gc_onboarding_align_corners_title, R.string.gc_onboarding_align_corners_message, null),
-            OnboardingPage(R.string.gc_onboarding_lighting_title, R.string.gc_onboarding_lighting_message, null)
+            OnboardingPage(
+                R.string.gc_onboarding_align_corners_title,
+                R.string.gc_onboarding_align_corners_message,
+                null
+            ),
+            OnboardingPage(
+                R.string.gc_onboarding_lighting_title,
+                R.string.gc_onboarding_lighting_message,
+                null
+            )
         )
         presenter.setCustomPages(customPages)
 
@@ -322,17 +395,19 @@ class OnboardingScreenPresenterTest {
 
         // Then
         if (isBottomNavigationBarEnabled) {
-            verify(mView, never()).showSkipAndNextButtons()
-            verify(mView, times(2)).showSkipAndNextButtonsInNavigationBarBottom()
+            verify(exactly = 0) { mView.showSkipAndNextButtons() }
+            verify(exactly = 2) { mView.showSkipAndNextButtonsInNavigationBarBottom() }
         } else {
-            verify(mView, times(2)).showSkipAndNextButtons()
-            verify(mView, never()).showSkipAndNextButtonsInNavigationBarBottom()
+            verify(exactly = 2) { mView.showSkipAndNextButtons() }
+            verify(exactly = 0) { mView.showSkipAndNextButtonsInNavigationBarBottom() }
         }
     }
 
     @Test
     @Parameters("false", "true")
-    fun `show 'get started' button when on last page - (isBottomNavigationBarEnabled) `(isBottomNavigationBarEnabled: Boolean) {
+    fun `show 'get started' button when on last page - (isBottomNavigationBarEnabled) `(
+        isBottomNavigationBarEnabled: Boolean
+    ) {
         // Given
         GiniCapture.Builder()
             .setBottomNavigationBarEnabled(isBottomNavigationBarEnabled)
@@ -340,8 +415,16 @@ class OnboardingScreenPresenterTest {
         val presenter = createPresenter()
 
         val customPages: List<OnboardingPage> = Lists.newArrayList(
-            OnboardingPage(R.string.gc_onboarding_align_corners_title, R.string.gc_onboarding_align_corners_message, null),
-            OnboardingPage(R.string.gc_onboarding_lighting_title, R.string.gc_onboarding_lighting_message, null)
+            OnboardingPage(
+                R.string.gc_onboarding_align_corners_title,
+                R.string.gc_onboarding_align_corners_message,
+                null
+            ),
+            OnboardingPage(
+                R.string.gc_onboarding_lighting_title,
+                R.string.gc_onboarding_lighting_message,
+                null
+            )
         )
         presenter.setCustomPages(customPages)
 
@@ -351,11 +434,11 @@ class OnboardingScreenPresenterTest {
 
         // Then
         if (isBottomNavigationBarEnabled) {
-            verify(mView, never()).showGetStartedButton()
-            verify(mView).showGetStartedButtonInNavigationBarBottom()
+            verify(exactly = 0) { mView.showGetStartedButton() }
+            verify { mView.showGetStartedButtonInNavigationBarBottom() }
         } else {
-            verify(mView).showGetStartedButton()
-            verify(mView, never()).showGetStartedButtonInNavigationBarBottom()
+            verify { mView.showGetStartedButton() }
+            verify(exactly = 0) { mView.showGetStartedButtonInNavigationBarBottom() }
         }
     }
 
@@ -371,7 +454,7 @@ class OnboardingScreenPresenterTest {
         presenter.start()
 
         // Then
-        verify(mView).hideButtons()
+        verify { mView.hideButtons() }
     }
 
 }
\ No newline at end of file
diff --git a/capture-sdk/sdk/src/test/java/net/gini/android/capture/review/multipage/MultipageReviewFragmentTest.kt b/capture-sdk/sdk/src/test/java/net/gini/android/capture/review/multipage/MultipageReviewFragmentTest.kt
index 5046f0175f..b9066c93ab 100644
--- a/capture-sdk/sdk/src/test/java/net/gini/android/capture/review/multipage/MultipageReviewFragmentTest.kt
+++ b/capture-sdk/sdk/src/test/java/net/gini/android/capture/review/multipage/MultipageReviewFragmentTest.kt
@@ -4,6 +4,7 @@ import androidx.fragment.app.testing.FragmentScenario
 import androidx.lifecycle.Lifecycle
 import androidx.navigation.Navigation
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
 import com.google.common.truth.Truth
 import com.nhaarman.mockitokotlin2.*
 import jersey.repackaged.jsr166e.CompletableFuture
@@ -17,6 +18,7 @@ import net.gini.android.capture.tracking.Event
 import net.gini.android.capture.tracking.EventTracker
 import net.gini.android.capture.tracking.ReviewScreenEvent
 import net.gini.android.capture.tracking.ReviewScreenEvent.UPLOAD_ERROR_DETAILS_MAP_KEY.*
+import net.gini.android.capture.tracking.useranalytics.UserAnalytics
 import org.junit.After
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -45,6 +47,7 @@ class MultipageReviewFragmentTest {
         val eventTracker = spy<EventTracker>()
         GiniCapture.Builder().setEventTracker(eventTracker).build()
         GiniCapture.getInstance().internal().imageMultiPageDocumentMemoryStore.setMultiPageDocument(mock())
+        UserAnalytics.initialize(InstrumentationRegistry.getInstrumentation().context)
 
         FragmentScenario.launchInContainer(fragmentClass = MultiPageReviewFragment::class.java).use { scenario ->
             scenario.moveToState(Lifecycle.State.STARTED)
@@ -77,7 +80,7 @@ class MultipageReviewFragmentTest {
             val eventTracker = spy<EventTracker>()
             GiniCapture.Builder().setEventTracker(eventTracker).build()
             GiniCapture.getInstance().internal().imageMultiPageDocumentMemoryStore.setMultiPageDocument(mock())
-
+            UserAnalytics.initialize(InstrumentationRegistry.getInstrumentation().context)
             FragmentScenario.launchInContainer(fragmentClass = MultiPageReviewFragment::class.java).use { scenario ->
                 scenario.moveToState(Lifecycle.State.STARTED)
 
diff --git a/capture-sdk/sdk/src/test/java/net/gini/android/capture/ui/components/textinput/amount/CustomOffsetMappingTest.kt b/capture-sdk/sdk/src/test/java/net/gini/android/capture/ui/components/textinput/amount/CustomOffsetMappingTest.kt
new file mode 100644
index 0000000000..de17731312
--- /dev/null
+++ b/capture-sdk/sdk/src/test/java/net/gini/android/capture/ui/components/textinput/amount/CustomOffsetMappingTest.kt
@@ -0,0 +1,80 @@
+package net.gini.android.capture.ui.components.textinput.amount
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+import kotlin.random.Random
+
+
+@RunWith(JUnit4::class)
+class CustomOffsetMappingTest {
+
+    @Test
+    fun testCustomOffsetMapping() {
+
+        val testData = listOf(
+            PossibleCursorPosition("1", "0.01", 9, 1),
+            PossibleCursorPosition("12", "0.12", 9, 2),
+            PossibleCursorPosition("123", "1.23", 9, 3),
+            PossibleCursorPosition("1234", "12.34", 9, 4),
+            PossibleCursorPosition("12345", "123.45", 9, 5),
+            PossibleCursorPosition("123456", "1,234.56", 9, 6),
+            PossibleCursorPosition("1234567", "12,345.67", 9, 7),
+
+            PossibleCursorPosition("1", "0.01", 8, 1),
+            PossibleCursorPosition("12", "0.12", 8, 2),
+            PossibleCursorPosition("123", "1.23", 8, 3),
+            PossibleCursorPosition("1234", "12.34", 8, 4),
+            PossibleCursorPosition("12345", "123.45", 8, 5),
+            PossibleCursorPosition("123456", "1,234.56", 8, 6),
+            PossibleCursorPosition("1234567", "12,345.67", 8, 7),
+
+            PossibleCursorPosition("1", "0.01", 7, 1),
+            PossibleCursorPosition("12", "0.12", 7, 2),
+            PossibleCursorPosition("123", "1.23", 7, 3),
+            PossibleCursorPosition("1234", "12.34", 7, 4),
+            PossibleCursorPosition("12345", "123.45", 7, 5),
+            PossibleCursorPosition("123456", "1,234.56", 7, 5),
+            PossibleCursorPosition("1234567", "12,345.67", 7, 5),
+
+            PossibleCursorPosition("1", "0.01", 6, 1),
+            PossibleCursorPosition("12", "0.12", 6, 2),
+            PossibleCursorPosition("123", "1.23", 6, 3),
+            PossibleCursorPosition("1234", "12.34", 6, 4),
+            PossibleCursorPosition("12345", "123.45", 6, 5),
+            PossibleCursorPosition("123456", "1,234.56", 6, 4),
+            PossibleCursorPosition("1234567", "12,345.67", 6, 5),
+        )
+
+
+        testData.forEach {
+
+            val mapping = DecimalInputVisualTransformation.CustomOffsetMapping(
+                source = it.source,
+                formatted = it.formatted
+            )
+
+             /*Assert.assertEquals(
+                 "Invalid result for pair: ${it.source} -> ${it.formatted}. Offset: ${it.offset}",
+                 mapping.originalToTransformed(Random.nextInt()),
+                 formatted.length
+             )
+            Assert.assertEquals(
+                "Invalid result for pair: ${it.source} -> ${it.formatted}. Offset: ${it.offset}",
+                it.transformedToOriginal,
+                mapping.transformedToOriginal(Random.nextInt())
+            )*/
+            // TODO Uncomment this to enable unit testing of cursor
+        }
+    }
+
+    private class PossibleCursorPosition(
+        val source: String,
+        val formatted: String,
+        val offset: Int,
+        val transformedToOriginal: Int,
+
+        )
+
+}
\ No newline at end of file
diff --git a/config/detekt/detekt.yml b/config/detekt/detekt.yml
new file mode 100644
index 0000000000..9b4a4ed993
--- /dev/null
+++ b/config/detekt/detekt.yml
@@ -0,0 +1,788 @@
+build:
+  maxIssues: 0
+  excludeCorrectable: false
+  weights:
+  # complexity: 2
+  # LongParameterList: 1
+  # style: 1
+  # comments: 1
+
+config:
+  validation: true
+  warningsAsErrors: false
+  checkExhaustiveness: false
+  # when writing own rules with new properties, exclude the property path e.g.: 'my_rule_set,.*>.*>[my_property]'
+  excludes: ''
+
+processors:
+  active: true
+  exclude:
+    - 'DetektProgressListener'
+  # - 'KtFileCountProcessor'
+  # - 'PackageCountProcessor'
+  # - 'ClassCountProcessor'
+  # - 'FunctionCountProcessor'
+  # - 'PropertyCountProcessor'
+  # - 'ProjectComplexityProcessor'
+  # - 'ProjectCognitiveComplexityProcessor'
+  # - 'ProjectLLOCProcessor'
+  # - 'ProjectCLOCProcessor'
+  # - 'ProjectLOCProcessor'
+  # - 'ProjectSLOCProcessor'
+  # - 'LicenseHeaderLoaderExtension'
+
+console-reports:
+  active: true
+  exclude:
+    - 'ProjectStatisticsReport'
+    - 'ComplexityReport'
+    - 'NotificationReport'
+    - 'FindingsReport'
+    - 'FileBasedFindingsReport'
+  #  - 'LiteFindingsReport'
+
+output-reports:
+  active: true
+  exclude:
+  # - 'TxtOutputReport'
+  # - 'XmlOutputReport'
+  # - 'HtmlOutputReport'
+  # - 'MdOutputReport'
+  # - 'SarifOutputReport'
+
+comments:
+  active: true
+  AbsentOrWrongFileLicense:
+    active: false
+    licenseTemplateFile: 'license.template'
+    licenseTemplateIsRegex: false
+  CommentOverPrivateFunction:
+    active: false
+  CommentOverPrivateProperty:
+    active: false
+  DeprecatedBlockTag:
+    active: false
+  EndOfSentenceFormat:
+    active: false
+    endOfSentenceFormat: '([.?!][ \t\n\r\f<])|([.?!:]$)'
+  KDocReferencesNonPublicProperty:
+    active: false
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**' ]
+  OutdatedDocumentation:
+    active: false
+    matchTypeParameters: true
+    matchDeclarationsOrder: true
+    allowParamOnConstructorProperties: false
+  UndocumentedPublicClass:
+    active: false
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**' ]
+    searchInNestedClass: true
+    searchInInnerClass: true
+    searchInInnerObject: true
+    searchInInnerInterface: true
+    searchInProtectedClass: false
+  UndocumentedPublicFunction:
+    active: false
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**' ]
+    searchProtectedFunction: false
+  UndocumentedPublicProperty:
+    active: false
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**' ]
+    searchProtectedProperty: false
+
+complexity:
+  active: true
+  CognitiveComplexMethod:
+    active: false
+    threshold: 15
+  ComplexCondition:
+    active: true
+    threshold: 4
+  ComplexInterface:
+    active: false
+    threshold: 10
+    includeStaticDeclarations: false
+    includePrivateDeclarations: false
+    ignoreOverloaded: false
+  CyclomaticComplexMethod:
+    active: true
+    threshold: 15
+    ignoreSingleWhenExpression: false
+    ignoreSimpleWhenEntries: false
+    ignoreNestingFunctions: false
+    nestingFunctions:
+      - 'also'
+      - 'apply'
+      - 'forEach'
+      - 'isNotNull'
+      - 'ifNull'
+      - 'let'
+      - 'run'
+      - 'use'
+      - 'with'
+  LabeledExpression:
+    active: false
+    ignoredLabels: [ ]
+  LargeClass:
+    active: true
+    threshold: 600
+  LongMethod:
+    active: true
+    threshold: 60
+  LongParameterList:
+    active: true
+    functionThreshold: 6
+    constructorThreshold: 7
+    ignoreDefaultParameters: true
+    ignoreDataClasses: true
+    ignoreAnnotatedParameter: [ ]
+  MethodOverloading:
+    active: false
+    threshold: 6
+  NamedArguments:
+    active: false
+    threshold: 3
+    ignoreArgumentsMatchingNames: false
+  NestedBlockDepth:
+    active: true
+    threshold: 4
+  NestedScopeFunctions:
+    active: false
+    threshold: 1
+    functions:
+      - 'kotlin.apply'
+      - 'kotlin.run'
+      - 'kotlin.with'
+      - 'kotlin.let'
+      - 'kotlin.also'
+  ReplaceSafeCallChainWithRun:
+    active: false
+  StringLiteralDuplication:
+    active: false
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**' ]
+    threshold: 3
+    ignoreAnnotation: true
+    excludeStringsWithLessThan5Characters: true
+    ignoreStringsRegex: '$^'
+  TooManyFunctions:
+    active: true
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**' ]
+    thresholdInFiles: 11
+    thresholdInClasses: 11
+    thresholdInInterfaces: 11
+    thresholdInObjects: 11
+    thresholdInEnums: 11
+    ignoreDeprecated: false
+    ignorePrivate: false
+    ignoreOverridden: false
+    ignoreAnnotatedFunctions: [ 'Preview' ]
+
+coroutines:
+  active: true
+  GlobalCoroutineUsage:
+    active: false
+  InjectDispatcher:
+    active: true
+    dispatcherNames:
+      - 'IO'
+      - 'Default'
+      - 'Unconfined'
+  RedundantSuspendModifier:
+    active: true
+  SleepInsteadOfDelay:
+    active: true
+  SuspendFunSwallowedCancellation:
+    active: false
+  SuspendFunWithCoroutineScopeReceiver:
+    active: false
+  SuspendFunWithFlowReturnType:
+    active: true
+
+empty-blocks:
+  active: true
+  EmptyCatchBlock:
+    active: true
+    allowedExceptionNameRegex: '_|(ignore|expected).*'
+  EmptyClassBlock:
+    active: true
+  EmptyDefaultConstructor:
+    active: true
+  EmptyDoWhileBlock:
+    active: true
+  EmptyElseBlock:
+    active: true
+  EmptyFinallyBlock:
+    active: true
+  EmptyForBlock:
+    active: true
+  EmptyFunctionBlock:
+    active: true
+    ignoreOverridden: false
+  EmptyIfBlock:
+    active: true
+  EmptyInitBlock:
+    active: true
+  EmptyKtFile:
+    active: true
+  EmptySecondaryConstructor:
+    active: true
+  EmptyTryBlock:
+    active: true
+  EmptyWhenBlock:
+    active: true
+  EmptyWhileBlock:
+    active: true
+
+exceptions:
+  active: true
+  ExceptionRaisedInUnexpectedLocation:
+    active: true
+    methodNames:
+      - 'equals'
+      - 'finalize'
+      - 'hashCode'
+      - 'toString'
+  InstanceOfCheckForException:
+    active: true
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**' ]
+  NotImplementedDeclaration:
+    active: false
+  ObjectExtendsThrowable:
+    active: false
+  PrintStackTrace:
+    active: true
+  RethrowCaughtException:
+    active: true
+  ReturnFromFinally:
+    active: true
+    ignoreLabeled: false
+  SwallowedException:
+    active: true
+    ignoredExceptionTypes:
+      - 'InterruptedException'
+      - 'MalformedURLException'
+      - 'NumberFormatException'
+      - 'ParseException'
+    allowedExceptionNameRegex: '_|(ignore|expected).*'
+  ThrowingExceptionFromFinally:
+    active: true
+  ThrowingExceptionInMain:
+    active: false
+  ThrowingExceptionsWithoutMessageOrCause:
+    active: true
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**' ]
+    exceptions:
+      - 'ArrayIndexOutOfBoundsException'
+      - 'Exception'
+      - 'IllegalArgumentException'
+      - 'IllegalMonitorStateException'
+      - 'IllegalStateException'
+      - 'IndexOutOfBoundsException'
+      - 'NullPointerException'
+      - 'RuntimeException'
+      - 'Throwable'
+  ThrowingNewInstanceOfSameException:
+    active: true
+  TooGenericExceptionCaught:
+    active: true
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**' ]
+    exceptionNames:
+      - 'ArrayIndexOutOfBoundsException'
+      - 'Error'
+      - 'Exception'
+      - 'IllegalMonitorStateException'
+      - 'IndexOutOfBoundsException'
+      - 'NullPointerException'
+      - 'RuntimeException'
+      - 'Throwable'
+    allowedExceptionNameRegex: '_|(ignore|expected).*'
+  TooGenericExceptionThrown:
+    active: true
+    exceptionNames:
+      - 'Error'
+      - 'Exception'
+      - 'RuntimeException'
+      - 'Throwable'
+
+naming:
+  active: true
+  BooleanPropertyNaming:
+    active: false
+    allowedPattern: '^(is|has|are)'
+  ClassNaming:
+    active: true
+    classPattern: '[A-Z][a-zA-Z0-9]*'
+  ConstructorParameterNaming:
+    active: true
+    parameterPattern: '[a-z][A-Za-z0-9]*'
+    privateParameterPattern: '[a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
+  EnumNaming:
+    active: true
+    enumEntryPattern: '[A-Z][_a-zA-Z0-9]*'
+  ForbiddenClassName:
+    active: false
+    forbiddenName: [ ]
+  FunctionMaxLength:
+    active: false
+    maximumFunctionNameLength: 30
+  FunctionMinLength:
+    active: false
+    minimumFunctionNameLength: 3
+  FunctionNaming:
+    active: true
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**' ]
+    functionPattern: '[a-z][a-zA-Z0-9]*'
+    excludeClassPattern: '$^'
+    ignoreAnnotated: [ 'Composable' ]
+  FunctionParameterNaming:
+    active: true
+    parameterPattern: '[a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
+  InvalidPackageDeclaration:
+    active: true
+    rootPackage: ''
+    requireRootInDeclaration: false
+  LambdaParameterNaming:
+    active: false
+    parameterPattern: '[a-z][A-Za-z0-9]*|_'
+  MatchingDeclarationName:
+    active: true
+    mustBeFirst: true
+  MemberNameEqualsClassName:
+    active: true
+    ignoreOverridden: true
+  NoNameShadowing:
+    active: true
+  NonBooleanPropertyPrefixedWithIs:
+    active: false
+  ObjectPropertyNaming:
+    active: true
+    constantPattern: '[A-Za-z][_A-Za-z0-9]*'
+    propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
+    privatePropertyPattern: '(_)?[A-Za-z][_A-Za-z0-9]*'
+  PackageNaming:
+    active: true
+    packagePattern: '[a-z]+(\.[a-z][A-Za-z0-9]*)*'
+  TopLevelPropertyNaming:
+    active: true
+    constantPattern: '[A-Z][_A-Z0-9]*'
+    propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
+    privatePropertyPattern: '_?[A-Za-z][_A-Za-z0-9]*'
+    ignoreAnnotated: [ 'Composable' ]
+  VariableMaxLength:
+    active: false
+    maximumVariableNameLength: 64
+  VariableMinLength:
+    active: false
+    minimumVariableNameLength: 1
+  VariableNaming:
+    active: true
+    variablePattern: '[a-z][A-Za-z0-9]*'
+    privateVariablePattern: '(_)?[a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
+
+performance:
+  active: true
+  ArrayPrimitive:
+    active: true
+  CouldBeSequence:
+    active: false
+    threshold: 3
+  ForEachOnRange:
+    active: true
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**' ]
+  SpreadOperator:
+    active: true
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**' ]
+  UnnecessaryPartOfBinaryExpression:
+    active: false
+  UnnecessaryTemporaryInstantiation:
+    active: true
+
+potential-bugs:
+  active: true
+  AvoidReferentialEquality:
+    active: true
+    forbiddenTypePatterns:
+      - 'kotlin.String'
+  CastNullableToNonNullableType:
+    active: false
+  CastToNullableType:
+    active: false
+  Deprecation:
+    active: false
+  DontDowncastCollectionTypes:
+    active: false
+  DoubleMutabilityForCollection:
+    active: true
+    mutableTypes:
+      - 'kotlin.collections.MutableList'
+      - 'kotlin.collections.MutableMap'
+      - 'kotlin.collections.MutableSet'
+      - 'java.util.ArrayList'
+      - 'java.util.LinkedHashSet'
+      - 'java.util.HashSet'
+      - 'java.util.LinkedHashMap'
+      - 'java.util.HashMap'
+  ElseCaseInsteadOfExhaustiveWhen:
+    active: false
+    ignoredSubjectTypes: [ ]
+  EqualsAlwaysReturnsTrueOrFalse:
+    active: true
+  EqualsWithHashCodeExist:
+    active: true
+  ExitOutsideMain:
+    active: false
+  ExplicitGarbageCollectionCall:
+    active: true
+  HasPlatformType:
+    active: true
+  IgnoredReturnValue:
+    active: true
+    restrictToConfig: true
+    returnValueAnnotations:
+      - 'CheckResult'
+      - '*.CheckResult'
+      - 'CheckReturnValue'
+      - '*.CheckReturnValue'
+    ignoreReturnValueAnnotations:
+      - 'CanIgnoreReturnValue'
+      - '*.CanIgnoreReturnValue'
+    returnValueTypes:
+      - 'kotlin.sequences.Sequence'
+      - 'kotlinx.coroutines.flow.*Flow'
+      - 'java.util.stream.*Stream'
+    ignoreFunctionCall: [ ]
+  ImplicitDefaultLocale:
+    active: true
+  ImplicitUnitReturnType:
+    active: false
+    allowExplicitReturnType: true
+  InvalidRange:
+    active: true
+  IteratorHasNextCallsNextMethod:
+    active: true
+  IteratorNotThrowingNoSuchElementException:
+    active: true
+  LateinitUsage:
+    active: false
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**' ]
+    ignoreOnClassesPattern: ''
+  MapGetWithNotNullAssertionOperator:
+    active: true
+  MissingPackageDeclaration:
+    active: false
+    excludes: [ '**/*.kts' ]
+  NullCheckOnMutableProperty:
+    active: false
+  NullableToStringCall:
+    active: false
+  PropertyUsedBeforeDeclaration:
+    active: false
+  UnconditionalJumpStatementInLoop:
+    active: false
+  UnnecessaryNotNullCheck:
+    active: false
+  UnnecessaryNotNullOperator:
+    active: true
+  UnnecessarySafeCall:
+    active: true
+  UnreachableCatchBlock:
+    active: true
+  UnreachableCode:
+    active: true
+  UnsafeCallOnNullableType:
+    active: true
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**' ]
+  UnsafeCast:
+    active: true
+  UnusedUnaryOperator:
+    active: true
+  UselessPostfixExpression:
+    active: true
+  WrongEqualsTypeParameter:
+    active: true
+
+style:
+  active: true
+  AlsoCouldBeApply:
+    active: false
+  BracesOnIfStatements:
+    active: false
+    singleLine: 'never'
+    multiLine: 'always'
+  BracesOnWhenStatements:
+    active: false
+    singleLine: 'necessary'
+    multiLine: 'consistent'
+  CanBeNonNullable:
+    active: false
+  CascadingCallWrapping:
+    active: false
+    includeElvis: true
+  ClassOrdering:
+    active: false
+  CollapsibleIfStatements:
+    active: false
+  DataClassContainsFunctions:
+    active: false
+    conversionFunctionPrefix:
+      - 'to'
+    allowOperators: false
+  DataClassShouldBeImmutable:
+    active: false
+  DestructuringDeclarationWithTooManyEntries:
+    active: true
+    maxDestructuringEntries: 3
+  DoubleNegativeLambda:
+    active: false
+    negativeFunctions:
+      - reason: 'Use `takeIf` instead.'
+        value: 'takeUnless'
+      - reason: 'Use `all` instead.'
+        value: 'none'
+    negativeFunctionNameParts:
+      - 'not'
+      - 'non'
+  EqualsNullCall:
+    active: true
+  EqualsOnSignatureLine:
+    active: false
+  ExplicitCollectionElementAccessMethod:
+    active: false
+  ExplicitItLambdaParameter:
+    active: true
+  ExpressionBodySyntax:
+    active: false
+    includeLineWrapping: false
+  ForbiddenAnnotation:
+    active: false
+    annotations:
+      - reason: 'it is a java annotation. Use `Suppress` instead.'
+        value: 'java.lang.SuppressWarnings'
+      - reason: 'it is a java annotation. Use `kotlin.Deprecated` instead.'
+        value: 'java.lang.Deprecated'
+      - reason: 'it is a java annotation. Use `kotlin.annotation.MustBeDocumented` instead.'
+        value: 'java.lang.annotation.Documented'
+      - reason: 'it is a java annotation. Use `kotlin.annotation.Target` instead.'
+        value: 'java.lang.annotation.Target'
+      - reason: 'it is a java annotation. Use `kotlin.annotation.Retention` instead.'
+        value: 'java.lang.annotation.Retention'
+      - reason: 'it is a java annotation. Use `kotlin.annotation.Repeatable` instead.'
+        value: 'java.lang.annotation.Repeatable'
+      - reason: 'Kotlin does not support @Inherited annotation, see https://youtrack.jetbrains.com/issue/KT-22265'
+        value: 'java.lang.annotation.Inherited'
+  ForbiddenComment:
+    active: true
+    comments:
+      - reason: 'Forbidden FIXME todo marker in comment, please fix the problem.'
+        value: 'FIXME:'
+      - reason: 'Forbidden STOPSHIP todo marker in comment, please address the problem before shipping the code.'
+        value: 'STOPSHIP:'
+      - reason: 'Forbidden TODO todo marker in comment, please do the changes.'
+        value: 'TODO:'
+    allowedPatterns: ''
+  ForbiddenImport:
+    active: false
+    imports: [ ]
+    forbiddenPatterns: ''
+  ForbiddenMethodCall:
+    active: false
+    methods:
+      - reason: 'print does not allow you to configure the output stream. Use a logger instead.'
+        value: 'kotlin.io.print'
+      - reason: 'println does not allow you to configure the output stream. Use a logger instead.'
+        value: 'kotlin.io.println'
+  ForbiddenSuppress:
+    active: false
+    rules: [ ]
+  ForbiddenVoid:
+    active: true
+    ignoreOverridden: false
+    ignoreUsageInGenerics: false
+  FunctionOnlyReturningConstant:
+    active: true
+    ignoreOverridableFunction: true
+    ignoreActualFunction: true
+    excludedFunctions: [ ]
+  LoopWithTooManyJumpStatements:
+    active: true
+    maxJumpCount: 1
+  MagicNumber:
+    active: true
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**', '**/*.kts' ]
+    ignoreNumbers:
+      - '-1'
+      - '0'
+      - '1'
+      - '2'
+    ignoreHashCodeFunction: true
+    ignorePropertyDeclaration: true
+    ignoreLocalVariableDeclaration: false
+    ignoreConstantDeclaration: true
+    ignoreCompanionObjectPropertyDeclaration: true
+    ignoreAnnotation: false
+    ignoreNamedArgument: true
+    ignoreEnums: false
+    ignoreRanges: false
+    ignoreExtensionFunctions: true
+  MandatoryBracesLoops:
+    active: false
+  MaxChainedCallsOnSameLine:
+    active: false
+    maxChainedCalls: 5
+  MaxLineLength:
+    active: true
+    maxLineLength: 120
+    excludePackageStatements: true
+    excludeImportStatements: true
+    excludeCommentStatements: false
+    excludeRawStrings: true
+  MayBeConst:
+    active: true
+  ModifierOrder:
+    active: true
+  MultilineLambdaItParameter:
+    active: false
+  MultilineRawStringIndentation:
+    active: false
+    indentSize: 4
+    trimmingMethods:
+      - 'trimIndent'
+      - 'trimMargin'
+  NestedClassesVisibility:
+    active: true
+  NewLineAtEndOfFile:
+    active: true
+  NoTabs:
+    active: false
+  NullableBooleanCheck:
+    active: false
+  ObjectLiteralToLambda:
+    active: true
+  OptionalAbstractKeyword:
+    active: true
+  OptionalUnit:
+    active: false
+  PreferToOverPairSyntax:
+    active: false
+  ProtectedMemberInFinalClass:
+    active: true
+  RedundantExplicitType:
+    active: false
+  RedundantHigherOrderMapUsage:
+    active: true
+  RedundantVisibilityModifierRule:
+    active: false
+  ReturnCount:
+    active: true
+    max: 2
+    excludedFunctions:
+      - 'equals'
+    excludeLabeled: false
+    excludeReturnFromLambda: true
+    excludeGuardClauses: false
+  SafeCast:
+    active: true
+  SerialVersionUIDInSerializableClass:
+    active: true
+  SpacingBetweenPackageAndImports:
+    active: false
+  StringShouldBeRawString:
+    active: false
+    maxEscapedCharacterCount: 2
+    ignoredCharacters: [ ]
+  ThrowsCount:
+    active: true
+    max: 2
+    excludeGuardClauses: false
+  TrailingWhitespace:
+    active: false
+  TrimMultilineRawString:
+    active: false
+    trimmingMethods:
+      - 'trimIndent'
+      - 'trimMargin'
+  UnderscoresInNumericLiterals:
+    active: false
+    acceptableLength: 4
+    allowNonStandardGrouping: false
+  UnnecessaryAbstractClass:
+    active: true
+  UnnecessaryAnnotationUseSiteTarget:
+    active: false
+  UnnecessaryApply:
+    active: true
+  UnnecessaryBackticks:
+    active: false
+  UnnecessaryBracesAroundTrailingLambda:
+    active: false
+  UnnecessaryFilter:
+    active: true
+  UnnecessaryInheritance:
+    active: true
+  UnnecessaryInnerClass:
+    active: false
+  UnnecessaryLet:
+    active: false
+  UnnecessaryParentheses:
+    active: false
+    allowForUnclearPrecedence: false
+  UntilInsteadOfRangeTo:
+    active: false
+  UnusedImports:
+    active: false
+  UnusedParameter:
+    active: true
+    allowedNames: 'ignored|expected'
+  UnusedPrivateClass:
+    active: true
+  UnusedPrivateMember:
+    active: true
+    allowedNames: ''
+    ignoreAnnotated: [ 'Preview ' ]
+  UnusedPrivateProperty:
+    active: true
+    allowedNames: '_|ignored|expected|serialVersionUID'
+  UseAnyOrNoneInsteadOfFind:
+    active: true
+  UseArrayLiteralsInAnnotations:
+    active: true
+  UseCheckNotNull:
+    active: true
+  UseCheckOrError:
+    active: true
+  UseDataClass:
+    active: false
+    allowVars: false
+  UseEmptyCounterpart:
+    active: false
+  UseIfEmptyOrIfBlank:
+    active: false
+  UseIfInsteadOfWhen:
+    active: false
+    ignoreWhenContainingVariableDeclaration: false
+  UseIsNullOrEmpty:
+    active: true
+  UseLet:
+    active: false
+  UseOrEmpty:
+    active: true
+  UseRequire:
+    active: true
+  UseRequireNotNull:
+    active: true
+  UseSumOfInsteadOfFlatMapSize:
+    active: false
+  UselessCallOnNotNull:
+    active: true
+  UtilityClassWithPublicConstructor:
+    active: true
+  VarCouldBeVal:
+    active: true
+    ignoreLateinitVar: false
+  WildcardImport:
+    active: true
+    excludeImports:
+      - 'java.util.*'
diff --git a/core-api-library/library/build.gradle.kts b/core-api-library/library/build.gradle.kts
index b39e4c95d2..fb9bfba157 100644
--- a/core-api-library/library/build.gradle.kts
+++ b/core-api-library/library/build.gradle.kts
@@ -16,7 +16,8 @@ android {
     }
     defaultConfig {
         minSdk = libs.versions.android.minSdk.get().toInt()
-        targetSdk = libs.versions.android.targetSdk.get().toInt()
+        testOptions.targetSdk = libs.versions.android.targetSdk.get().toInt()
+        lint.targetSdk = libs.versions.android.targetSdk.get().toInt()
 
         // Use the test runner with JUnit4 support
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
diff --git a/core-api-library/library/gradle.properties b/core-api-library/library/gradle.properties
index d1783d2892..ead082cae5 100644
--- a/core-api-library/library/gradle.properties
+++ b/core-api-library/library/gradle.properties
@@ -1,7 +1,7 @@
 # Maven coordinates
 # groupId is in the root gradle.properties
 artifactId=gini-internal-core-api-lib
-version=2.1.4
+version=2.2.0
 # Version code is visible only in the generated BuildConfig file
 versionCode=0
 
diff --git a/core-api-library/library/src/androidTest/java/net/gini/android/core/api/authorization/AnonymousSessionManagerTest.kt b/core-api-library/library/src/androidTest/java/net/gini/android/core/api/authorization/AnonymousSessionManagerTest.kt
index 969ad06bb5..6877ec078d 100644
--- a/core-api-library/library/src/androidTest/java/net/gini/android/core/api/authorization/AnonymousSessionManagerTest.kt
+++ b/core-api-library/library/src/androidTest/java/net/gini/android/core/api/authorization/AnonymousSessionManagerTest.kt
@@ -217,37 +217,6 @@ class AnonymousSessionManagerTest {
         assertFalse(mAnonymousSessionSessionManager!!.hasUserCredentialsEmailDomain("domain.com", userCredentials))
     }
 
-    @Test
-    @SdkSuppress(minSdkVersion = 28)
-    fun testThatLoginUserUpdatesEmailDomainIfChanged() = runTest{
-        val newEmailDomain = "beispiel.com"
-        val oldEmailDomain = "example.com"
-        mAnonymousSessionSessionManager = AnonymousSessionManager(mUserRepository!!, mCredentialsStore!!, newEmailDomain)
-
-        every { mCredentialsStore!!.userCredentials } returns (UserCredentials("1234@$oldEmailDomain", "5678"))
-        coEvery {mUserRepository?.updateEmail(any(), any(), any()) } returns Resource.Success(Unit)
-        coEvery {mUserRepository?.loginUser(ofType(UserRequestModel::class)) } returnsMany listOf(Resource.Success(
-            Session.fromAPIResponse(SessionToken(accessToken = "1234-5678-9012", tokenType = "bearer", expiresIn = 30000))
-        ), Resource.Success(
-                Session.fromAPIResponse(SessionToken(accessToken = "1234-5678-9012", tokenType = "bearer", expiresIn = 30000))
-        ))
-
-        every { mCredentialsStore?.deleteUserCredentials() } returns (true)
-        every { mCredentialsStore?.storeUserCredentials(any()) } returns (true)
-
-        val session = mAnonymousSessionSessionManager?.loginUser()
-
-        assertTrue(session is Resource.Success)
-        verify { mCredentialsStore?.deleteUserCredentials() }
-
-        val userCredentialsSlot = slot<UserCredentials>()
-        verify { mCredentialsStore?.storeUserCredentials(capture(userCredentialsSlot)) }
-
-        val newUserCredentials = userCredentialsSlot.captured
-        assertEquals(newEmailDomain, extractEmailDomain(newUserCredentials.username))
-        assertEquals("5678", newUserCredentials.password)
-    }
-
     private fun email(name: String): String {
         return "$name@$mEmailDomain"
     }
diff --git a/core-api-library/library/src/main/java/net/gini/android/core/api/authorization/AnonymousSessionManager.kt b/core-api-library/library/src/main/java/net/gini/android/core/api/authorization/AnonymousSessionManager.kt
index d5c9c448f1..dcb65fb082 100644
--- a/core-api-library/library/src/main/java/net/gini/android/core/api/authorization/AnonymousSessionManager.kt
+++ b/core-api-library/library/src/main/java/net/gini/android/core/api/authorization/AnonymousSessionManager.kt
@@ -84,44 +84,11 @@ internal class AnonymousSessionManager(
     suspend fun loginUser(): Resource<Session> {
         val userCredentials = credentialsStore.userCredentials
         if (userCredentials != null) {
-            if (hasUserCredentialsEmailDomain(emailDomain, userCredentials)) {
-                return userRepository.loginUser(UserRequestModel(userCredentials.username, userCredentials.password))
-            }
-
-            return when (val updateCredentials = updateEmailDomain(userCredentials)) {
-                is Resource.Cancelled -> Resource.Cancelled()
-                is Resource.Error -> Resource.Error(updateCredentials)
-                is Resource.Success -> {
-                    userRepository.loginUser(UserRequestModel(updateCredentials.data.username, updateCredentials.data.password))
-                }
-            }
+            return userRepository.loginUser(UserRequestModel(userCredentials.username, userCredentials.password))
         }
         return Resource.Error()
     }
 
-    private suspend fun updateEmailDomain(userCredentials: UserCredentials): Resource<UserCredentials> {
-        val oldEmail = userCredentials.username
-        val newEmail = generateUserName()
-
-        return when (val loginUser = userRepository.loginUser(UserRequestModel(userCredentials.username, userCredentials.password))) {
-            is Resource.Cancelled -> Resource.Cancelled()
-            is Resource.Error -> Resource.Error(loginUser)
-            is Resource.Success -> {
-                val session = loginUser.data
-                return when (val updateEmail = userRepository.updateEmail(newEmail, oldEmail, session.accessToken)) {
-                    is Resource.Cancelled -> Resource.Cancelled()
-                    is Resource.Error -> Resource.Error(updateEmail)
-                    is Resource.Success -> {
-                        credentialsStore.deleteUserCredentials()
-                        val newCredentials = UserCredentials(newEmail, userCredentials.password)
-                        credentialsStore.storeUserCredentials(newCredentials)
-                        Resource.Success(newCredentials)
-                    }
-                }
-            }
-        }
-    }
-
     fun hasUserCredentialsEmailDomain(emailDomain: String, userCredentials: UserCredentials): Boolean {
         return userCredentials.username.endsWith("@$emailDomain")
     }
diff --git a/core-api-library/library/src/main/java/net/gini/android/core/api/authorization/UserRemoteSource.kt b/core-api-library/library/src/main/java/net/gini/android/core/api/authorization/UserRemoteSource.kt
index 53ade93083..c2f52b5766 100644
--- a/core-api-library/library/src/main/java/net/gini/android/core/api/authorization/UserRemoteSource.kt
+++ b/core-api-library/library/src/main/java/net/gini/android/core/api/authorization/UserRemoteSource.kt
@@ -3,7 +3,6 @@ package net.gini.android.core.api.authorization
 import android.util.Base64
 import kotlinx.coroutines.withContext
 import net.gini.android.core.api.authorization.apimodels.SessionToken
-import net.gini.android.core.api.authorization.apimodels.SessionTokenInfo
 import net.gini.android.core.api.authorization.apimodels.UserRequestModel
 import net.gini.android.core.api.authorization.apimodels.UserResponseModel
 import net.gini.android.core.api.requests.ApiException
@@ -40,13 +39,6 @@ internal class UserRemoteSource(
         }
     }
 
-    suspend fun getGiniApiSessionTokenInfo(token: String, authAccessToken: String): SessionTokenInfo = withContext(coroutineContext) {
-        val response = SafeApiRequest.apiRequest {
-           userService.getGiniApiSessionTokenInfo(bearerHeaderMap(authAccessToken), token)
-        }
-        response.body() ?: throw ApiException.forResponse("Empty response body", response)
-    }
-
     suspend fun getUserInfo(uri: String, accessToken: String): UserResponseModel = withContext(coroutineContext) {
         val response = SafeApiRequest.apiRequest {
             userService.getUserInfo(bearerHeaderMap(accessToken), uri)
diff --git a/core-api-library/library/src/main/java/net/gini/android/core/api/authorization/UserRepository.kt b/core-api-library/library/src/main/java/net/gini/android/core/api/authorization/UserRepository.kt
index 68821ec5a8..f4e0994f64 100644
--- a/core-api-library/library/src/main/java/net/gini/android/core/api/authorization/UserRepository.kt
+++ b/core-api-library/library/src/main/java/net/gini/android/core/api/authorization/UserRepository.kt
@@ -40,13 +40,4 @@ internal class UserRepository(
             }
         } ?: loginClient()
 
-    suspend fun updateEmail(newEmail: String, oldEmail: String, accessToken: String): Resource<Unit> =
-        when (val authToken = getUserRepositorySession()) {
-            is Resource.Cancelled -> Resource.Cancelled()
-            is Resource.Error -> Resource.Error(authToken)
-            is Resource.Success -> wrapInResource {
-                val userId = userRemoteSource.getGiniApiSessionTokenInfo(accessToken, authToken.data.accessToken).userName
-                userRemoteSource.updateEmail(userId, UserRequestModel(email = newEmail, oldEmail = oldEmail), authToken.data.accessToken)
-            }
-        }
 }
diff --git a/core-api-library/library/src/main/java/net/gini/android/core/api/authorization/UserService.kt b/core-api-library/library/src/main/java/net/gini/android/core/api/authorization/UserService.kt
index 894df4f942..3202358521 100644
--- a/core-api-library/library/src/main/java/net/gini/android/core/api/authorization/UserService.kt
+++ b/core-api-library/library/src/main/java/net/gini/android/core/api/authorization/UserService.kt
@@ -1,7 +1,6 @@
 package net.gini.android.core.api.authorization
 
 import net.gini.android.core.api.authorization.apimodels.SessionToken
-import net.gini.android.core.api.authorization.apimodels.SessionTokenInfo
 import net.gini.android.core.api.authorization.apimodels.UserRequestModel
 import net.gini.android.core.api.authorization.apimodels.UserResponseModel
 import okhttp3.ResponseBody
@@ -19,9 +18,6 @@ internal interface UserService {
     @POST("api/users")
     suspend fun createUser(@HeaderMap bearerHeaders: Map<String, String>, @Body userRequestModel: UserRequestModel): Response<ResponseBody>
 
-    @GET("oauth/check_token")
-    suspend fun getGiniApiSessionTokenInfo(@HeaderMap bearerHeaders: Map<String, String>, @Query("token") token: String): Response<SessionTokenInfo>
-
     @GET
     suspend fun getUserInfo(@HeaderMap bearerHeaders: Map<String, String>, @Url uri: String): Response<UserResponseModel>
 
diff --git a/core-api-library/library/src/main/java/net/gini/android/core/api/internal/GiniCoreAPIBuilder.kt b/core-api-library/library/src/main/java/net/gini/android/core/api/internal/GiniCoreAPIBuilder.kt
index 97453da585..06a2074513 100644
--- a/core-api-library/library/src/main/java/net/gini/android/core/api/internal/GiniCoreAPIBuilder.kt
+++ b/core-api-library/library/src/main/java/net/gini/android/core/api/internal/GiniCoreAPIBuilder.kt
@@ -63,6 +63,7 @@ abstract class GiniCoreAPIBuilder<DM : DocumentManager<DR, E>, G : GiniCoreAPI<D
     private var mCache: Cache? = null
     private var mTrustManager: TrustManager? = null
     private var mUserApiRetrofit: Retrofit? = null
+    private var mTrackingAnalysisApiRetrofit: Retrofit? = null
     private var mPayApiRetrofit: Retrofit? = null
     private var mUserService: UserService? = null
     private var mUserRepository: UserRepository? = null
@@ -148,10 +149,11 @@ abstract class GiniCoreAPIBuilder<DM : DocumentManager<DR, E>, G : GiniCoreAPI<D
     }
 
     /**
-     * Set the cache implementation to use with Volley. If no cache is set, the default Volley cache
+     * Set the cache implementation to use with OkHttp caching. If no cache is set, no caching
      * will be used.
      *
-     * @param cache A cache instance (specified by the com.android.volley.Cache interface).
+     * @param cache a cache instance (specified by the [okhttp3.Cache])
+     *
      * @return The builder instance to enable chaining.
      */
     open fun setCache(cache: Cache): GiniCoreAPIBuilder<DM, G, DR, E> {
@@ -309,6 +311,18 @@ abstract class GiniCoreAPIBuilder<DM : DocumentManager<DR, E>, G : GiniCoreAPI<D
         return retrofit
     }
 
+
+    @Synchronized
+    protected fun getTrackingAnalyticsApiRetrofit(): Retrofit {
+        val retrofit = Retrofit.Builder()
+            .baseUrl("https://api.eu.amplitude.com")
+            .addConverterFactory(MoshiConverterFactory.create(getMoshi()))
+            .client(createOkHttpClient())
+            .build()
+        mTrackingAnalysisApiRetrofit = retrofit
+        return retrofit
+    }
+
     private fun createOkHttpClient() = OkHttpClient.Builder()
         .apply {
             // Set system user agent string or fallback user agent if it's not available
diff --git a/core-api-library/library/src/test/java/net/gini/android/core/api/DocumentRemoteSourceTest.kt b/core-api-library/library/src/test/java/net/gini/android/core/api/DocumentRemoteSourceTest.kt
index 6e155d52ab..c0967f37e5 100644
--- a/core-api-library/library/src/test/java/net/gini/android/core/api/DocumentRemoteSourceTest.kt
+++ b/core-api-library/library/src/test/java/net/gini/android/core/api/DocumentRemoteSourceTest.kt
@@ -213,6 +213,14 @@ class DocumentRemoteSourceTest {
             return Response.success(listOf(PaymentRequestResponse(null, null, "", "", null, "", "", "")))
         }
 
+        override suspend fun getPayment(
+            bearer: Map<String, String>,
+            id: String
+        ): Response<PaymentResponse> {
+            bearerAuthHeader = bearer["Authorization"]
+            return Response.success(PaymentResponse("", "", "", null, "", "" ))
+        }
+
         override suspend fun getFile(bearer: Map<String, String>, location: String): Response<ResponseBody> {
             bearerAuthHeader = bearer["Authorization"]
             return Response.success("response".toResponseBody())
diff --git a/core-api-library/library/src/test/java/net/gini/android/core/api/authorization/UserRemoteSourceTest.kt b/core-api-library/library/src/test/java/net/gini/android/core/api/authorization/UserRemoteSourceTest.kt
index b0b12271af..a831ede80c 100644
--- a/core-api-library/library/src/test/java/net/gini/android/core/api/authorization/UserRemoteSourceTest.kt
+++ b/core-api-library/library/src/test/java/net/gini/android/core/api/authorization/UserRemoteSourceTest.kt
@@ -9,7 +9,6 @@ import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runTest
 import net.gini.android.core.api.authorization.apimodels.SessionToken
-import net.gini.android.core.api.authorization.apimodels.SessionTokenInfo
 import net.gini.android.core.api.authorization.apimodels.UserRequestModel
 import net.gini.android.core.api.authorization.apimodels.UserResponseModel
 import okhttp3.ResponseBody
@@ -35,15 +34,6 @@ class UserRemoteSourceTest {
         }
     }
 
-    @Test
-    fun `sets bearer authorization header with capital case 'Bearer' in getGiniApiSessionTokenInfo`() = runTest {
-        val accessToken = UUID.randomUUID().toString()
-        val expectedHeaderValue = "Bearer $accessToken"
-        verifyHeader(name = "Authorization", value = expectedHeaderValue, testScope = this) {
-            getGiniApiSessionTokenInfo("", accessToken)
-        }
-    }
-
     @Test
     fun `sets bearer authorization header with capital case 'Bearer' in getUserInfo`() = runTest {
         val accessToken = UUID.randomUUID().toString()
@@ -112,15 +102,6 @@ class UserRemoteSourceTest {
         }
     }
 
-    @Test
-    fun `sets json accept header in getGiniApiSessionTokenInfo`() = runTest {
-        val accessToken = UUID.randomUUID().toString()
-        val expectedHeaderValue = "application/json"
-        verifyHeader(name = "Accept", value = expectedHeaderValue, testScope = this) {
-            getGiniApiSessionTokenInfo("", accessToken)
-        }
-    }
-
     @Test
     fun `sets json accept header in getUserInfo`() = runTest {
         val accessToken = UUID.randomUUID().toString()
@@ -230,14 +211,6 @@ class UserRemoteSourceTest {
             return Response.success(null)
         }
 
-        override suspend fun getGiniApiSessionTokenInfo(
-            bearerHeaders: Map<String, String>,
-            token: String
-        ): Response<SessionTokenInfo> {
-            headers = bearerHeaders
-            return Response.success(SessionTokenInfo(""))
-        }
-
         override suspend fun getUserInfo(bearerHeaders: Map<String, String>, uri: String): Response<UserResponseModel> {
             headers = bearerHeaders
             return Response.success(UserResponseModel())
diff --git a/core-api-library/shared-tests/build.gradle.kts b/core-api-library/shared-tests/build.gradle.kts
index b112ac1b65..3e274d9a70 100644
--- a/core-api-library/shared-tests/build.gradle.kts
+++ b/core-api-library/shared-tests/build.gradle.kts
@@ -14,7 +14,8 @@ android {
     }
     defaultConfig {
         minSdk = libs.versions.android.minSdk.get().toInt()
-        targetSdk = libs.versions.android.targetSdk.get().toInt()
+        testOptions.targetSdk = libs.versions.android.targetSdk.get().toInt()
+        lint.targetSdk = libs.versions.android.targetSdk.get().toInt()
 
         // Use the test runner with JUnit4 support
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
diff --git a/core-api-library/shared-tests/src/main/java/net/gini/android/core/api/test/shared/GiniCoreAPIIntegrationTest.kt b/core-api-library/shared-tests/src/main/java/net/gini/android/core/api/test/shared/GiniCoreAPIIntegrationTest.kt
index 9797a42ed9..33f6b5d7e1 100644
--- a/core-api-library/shared-tests/src/main/java/net/gini/android/core/api/test/shared/GiniCoreAPIIntegrationTest.kt
+++ b/core-api-library/shared-tests/src/main/java/net/gini/android/core/api/test/shared/GiniCoreAPIIntegrationTest.kt
@@ -159,12 +159,13 @@ abstract class GiniCoreAPIIntegrationTest<DM: DocumentManager<DR, E>, DR: Docume
 
     @Test
     @Throws(IOException::class, InterruptedException::class, JSONException::class)
-    fun emailDomainIsUpdatedForExistingUserIfEmailDomainWasChanged() = runTest(timeout = 30.seconds) {
+    fun emailDomainIsNotUpdatedForExistingUserIfEmailDomainWasChanged() = runTest(timeout = 30.seconds) {
 
         // Upload a document to make sure we have a valid user
         val credentialsStore = EncryptedCredentialsStore(ApplicationProvider.getApplicationContext<Context>()
             .getSharedPreferences("GiniTests", Context.MODE_PRIVATE), ApplicationProvider.getApplicationContext())
-        giniCoreApi = createGiniCoreAPIBuilder(clientId, clientSecret, "example.com")
+        val oldEmailDomain = "example.com"
+        giniCoreApi = createGiniCoreAPIBuilder(clientId, clientSecret, oldEmailDomain)
             .setApiBaseUrl(apiUri)
             .setUserCenterApiBaseUrl(userCenterUri)
             .setConnectionTimeoutInMs(60000)
@@ -191,7 +192,8 @@ abstract class GiniCoreAPIIntegrationTest<DM: DocumentManager<DR, E>, DR: Docume
         processDocument(testDocument, "image/jpeg", "test.jpg", DocumentManager.DocumentType.INVOICE)
 
         val newUserCredentials = credentialsStore.userCredentials
-        Assert.assertEquals(newEmailDomain, extractEmailDomain(newUserCredentials.username))
+        Assert.assertNotEquals(newEmailDomain, extractEmailDomain(newUserCredentials.username))
+        Assert.assertEquals(oldEmailDomain, extractEmailDomain(newUserCredentials.username))
     }
 
     @XmlRes
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5794398eee..7a742ddd24 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,9 +1,9 @@
 [versions]
 android-compileSdk = "34"
 android-minSdk = "21"
-android-targetSdk = "33"
+android-targetSdk = "34"
 kotlin = "1.8.20"
-android-gradle-plugin = "8.2.1"
+android-gradle-plugin = "8.4.2"
 dokka = "1.7.20"
 androidx-lifecycle = "2.7.0"
 androidx-camera = "1.3.1"
@@ -20,6 +20,10 @@ pmd = "6.0.0"
 jacoco = "0.8.10"
 hilt = "2.46.1"
 navigation_component = "2.7.6"
+compose-bom = "2024.06.00"
+accompanist-themeAdapter = "1.1.1"
+compose-activity = "1.9.0"
+koin-bom = "3.5.6"
 
 [libraries]
 android-gradle = { module = "com.android.tools.build:gradle", version.ref = "android-gradle-plugin" }
@@ -58,7 +62,7 @@ androidx-test-espresso-intents = { module = "androidx.test.espresso:espresso-int
 androidx-test-espresso-idlingresource = { module = "androidx.test.espresso:espresso-idling-resource", version.ref = "espresso" }
 androidx-test-uiautomator = "androidx.test.uiautomator:uiautomator:2.2.0"
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
-kotlinx-coroutines-android = { module ="org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" }
+kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
 koin-androidx-scope = { module = "io.insert-koin:koin-androidx-scope", version.ref = "koin" }
 koin-androidx-viewmodel = { module = "io.insert-koin:koin-androidx-viewmodel", version.ref = "koin" }
@@ -77,14 +81,14 @@ mockk = "io.mockk:mockk:1.12.2"
 mockk-android = "io.mockk:mockk-android:1.12.2"
 turbine = "app.cash.turbine:turbine:0.12.3"
 junit = "junit:junit:4.13.2"
-detekt-gradle = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.18.1"
+detekt-gradle = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.6"
 ktlint-gradle = "org.jlleitschuh.gradle:ktlint-gradle:10.2.0"
 mlkit-barcodescanning = "com.google.android.gms:play-services-mlkit-barcode-scanning:18.3.0"
 mlkit-textrecognition = "com.google.android.gms:play-services-mlkit-text-recognition:19.0.0"
 apachecommons-imaging = "org.apache.commons:commons-imaging:1.0-alpha2"
 completableFuture = "org.glassfish.jersey.bundles.repackaged:jersey-jsr166e:2.25.1"
 truth = "com.google.truth:truth:1.1.3"
-robolectric = "org.robolectric:robolectric:4.9"
+robolectric = "org.robolectric:robolectric:4.12.2"
 dexter = "com.karumi:dexter:6.2.3"
 logback-android-core = "com.github.tony19:logback-android-core:1.1.1-6"
 logback-android-classic = "com.github.tony19:logback-android-classic:1.1.1-6"
@@ -111,4 +115,14 @@ navigation_ui_ktx = { module = "androidx.navigation:navigation-ui-ktx", version.
 navigation_safe_args = { module = "androidx.navigation:navigation-safe-args-gradle-plugin", version.ref = "navigation_component" }
 datastore-preferences = "androidx.datastore:datastore-preferences:1.0.0"
 tomlj = "org.tomlj:tomlj:1.1.1"
-json-testing = "org.json:json:20231013"
\ No newline at end of file
+json-testing = "org.json:json:20231013"
+compose-bom = { module = "androidx.compose:compose-bom", version.ref = "compose-bom" }
+compose-material3 = { module = "androidx.compose.material3:material3" }
+compose-activity = { module = "androidx.activity:activity-compose", version.ref = "compose-activity" }
+compose-tools-uiTooling = { module = "androidx.compose.ui:ui-tooling" }
+compose-tools-uiToolingPreview = { module = "androidx.compose.ui:ui-tooling-preview" }
+accompanist-themeAdapter = { module = "com.google.android.material:compose-theme-adapter-3", version.ref = "accompanist-themeAdapter" }
+koin-bom = { module = "io.insert-koin:koin-bom", version.ref = "koin-bom" }
+koin-core = { module = "io.insert-koin:koin-core" }
+koin-android = { module = "io.insert-koin:koin-android" }
+koin-androidx-compose = { module = "io.insert-koin:koin-androidx-compose" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cbaf4e4640..a6f0bdd495 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Sep 29 16:01:46 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/health-api-library/library/build.gradle.kts b/health-api-library/library/build.gradle.kts
index ceed6bda6e..fc85ee1657 100644
--- a/health-api-library/library/build.gradle.kts
+++ b/health-api-library/library/build.gradle.kts
@@ -24,7 +24,8 @@ android {
     }
     defaultConfig {
         minSdk = libs.versions.android.minSdk.get().toInt()
-        targetSdk = libs.versions.android.targetSdk.get().toInt()
+        testOptions.targetSdk = libs.versions.android.targetSdk.get().toInt()
+        lint.targetSdk = libs.versions.android.targetSdk.get().toInt()
 
         // Use the test runner with JUnit4 support
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -124,7 +125,7 @@ tasks.register<CreatePropertiesTask>("injectTestProperties") {
 
     doFirst {
         propertiesMap.clear()
-        propertiesMap.putAll(readLocalPropertiesToMap(project,
+        propertiesMap.putAll(readLocalPropertiesToMapSilent(project,
             listOf("testClientId", "testClientSecret", "testApiUri", "testUserCenterUri", "testBankApiUri")))
     }
 
diff --git a/health-api-library/library/gradle.properties b/health-api-library/library/gradle.properties
index 3170dc873f..5972c6063e 100644
--- a/health-api-library/library/gradle.properties
+++ b/health-api-library/library/gradle.properties
@@ -1,7 +1,7 @@
 # Maven coordinates
 # groupId is in the root gradle.properties
 artifactId=gini-health-api-lib
-version=4.1.0
+version=4.2.0
 # Version code is visible only in the generated BuildConfig file
 versionCode=0
 
diff --git a/health-api-library/library/src/doc/source/guides/getting-started.rst b/health-api-library/library/src/doc/source/guides/getting-started.rst
index 4c822f6037..ae43d8a019 100644
--- a/health-api-library/library/src/doc/source/guides/getting-started.rst
+++ b/health-api-library/library/src/doc/source/guides/getting-started.rst
@@ -13,7 +13,7 @@ build.gradle:
 .. code-block:: groovy
 
     dependencies {
-        implementation 'net.gini.android:gini-health-api-lib:4.1.0'
+        implementation 'net.gini.android:gini-health-api-lib:4.2.0'
     }
 
 Integrating the Gini Health API Library
diff --git a/health-api-library/library/src/main/java/net/gini/android/health/api/GiniHealthAPIBuilder.kt b/health-api-library/library/src/main/java/net/gini/android/health/api/GiniHealthAPIBuilder.kt
index 08299e752e..8836def33c 100644
--- a/health-api-library/library/src/main/java/net/gini/android/health/api/GiniHealthAPIBuilder.kt
+++ b/health-api-library/library/src/main/java/net/gini/android/health/api/GiniHealthAPIBuilder.kt
@@ -28,10 +28,11 @@ class GiniHealthAPIBuilder @JvmOverloads constructor(
     clientId: String = "",
     clientSecret: String = "",
     emailDomain: String = "",
-    sessionManager: SessionManager? = null
+    sessionManager: SessionManager? = null,
+    apiVersion: Int = API_VERSION
 ) : GiniCoreAPIBuilder<HealthApiDocumentManager, GiniHealthAPI, HealthApiDocumentRepository, ExtractionsContainer>(context, clientId, clientSecret, emailDomain, sessionManager) {
 
-    private val healthApiType = GiniHealthApiType(4)
+    private val healthApiType = GiniHealthApiType(apiVersion)
 
     override fun getGiniApiType(): GiniApiType {
         return healthApiType
@@ -57,4 +58,8 @@ class GiniHealthAPIBuilder @JvmOverloads constructor(
     override fun createDocumentRepository(): HealthApiDocumentRepository {
         return HealthApiDocumentRepository(createDocumentRemoteSource(), getSessionManager(), healthApiType)
     }
-}
\ No newline at end of file
+
+    companion object {
+        const val API_VERSION = 4
+    }
+}
diff --git a/health-sdk/example-app/src/main/java/net/gini/android/health/sdk/exampleapp/MainActivity.kt b/health-sdk/example-app/src/main/java/net/gini/android/health/sdk/exampleapp/MainActivity.kt
index 43d77f3fc4..fb1881cea9 100644
--- a/health-sdk/example-app/src/main/java/net/gini/android/health/sdk/exampleapp/MainActivity.kt
+++ b/health-sdk/example-app/src/main/java/net/gini/android/health/sdk/exampleapp/MainActivity.kt
@@ -6,7 +6,6 @@ import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import ch.qos.logback.classic.Logger
 import ch.qos.logback.classic.LoggerContext
@@ -23,7 +22,6 @@ import net.gini.android.health.sdk.exampleapp.review.ReviewActivity
 import net.gini.android.health.sdk.exampleapp.upload.UploadActivity
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.slf4j.LoggerFactory
-import java.util.*
 
 class MainActivity : AppCompatActivity() {
 
@@ -47,7 +45,7 @@ class MainActivity : AppCompatActivity() {
         binding.importFile.setOnClickListener {
             if (useTestDocument) {
                 viewModel.setDocumentForReview(testDocumentId)
-                startActivity(ReviewActivity.getStartIntent(this))
+                startActivity(ReviewActivity.getStartIntent(this, paymentComponentConfiguration = viewModel.getPaymentComponentConfiguration()))
             } else {
                 importFile()
             }
@@ -67,7 +65,8 @@ class MainActivity : AppCompatActivity() {
             startActivity(
                 UploadActivity.getStartIntent(
                     this@MainActivity,
-                    viewModel.pages.value.map { it.uri })
+                    viewModel.pages.value.map { it.uri },
+                    viewModel.getPaymentComponentConfiguration())
             )
         }
 
@@ -114,7 +113,7 @@ class MainActivity : AppCompatActivity() {
 
     private fun importResult(uri: Uri?) {
         uri?.let {
-            startActivity(UploadActivity.getStartIntent(this, listOf(it)))
+            startActivity(UploadActivity.getStartIntent(this, listOf(it), viewModel.getPaymentComponentConfiguration()))
         } ?: run {
             Toast.makeText(this, "No document received", Toast.LENGTH_LONG).show()
         }
diff --git a/health-sdk/example-app/src/main/java/net/gini/android/health/sdk/exampleapp/MainViewModel.kt b/health-sdk/example-app/src/main/java/net/gini/android/health/sdk/exampleapp/MainViewModel.kt
index 93f111bd56..37d33470c4 100644
--- a/health-sdk/example-app/src/main/java/net/gini/android/health/sdk/exampleapp/MainViewModel.kt
+++ b/health-sdk/example-app/src/main/java/net/gini/android/health/sdk/exampleapp/MainViewModel.kt
@@ -11,6 +11,7 @@ import kotlinx.coroutines.launch
 import net.gini.android.health.sdk.GiniHealth
 import net.gini.android.health.sdk.exampleapp.pager.PagerAdapter
 import net.gini.android.health.sdk.paymentcomponent.PaymentComponentConfiguration
+import net.gini.android.health.sdk.util.GiniLocalization
 import java.io.File
 
 class MainViewModel(
@@ -51,4 +52,10 @@ class MainViewModel(
     }
 
     fun getPaymentComponentConfiguration() = paymentComponentConfiguration
+
+    fun setGiniHealthLanguage(localization: GiniLocalization, context: Context) {
+        giniHealth.setSDKLanguage(localization, context)
+    }
+
+    fun getGiniHealthLanguage(context: Context) = GiniHealth.getSDKLanguage(context)
 }
diff --git a/health-sdk/example-app/src/main/java/net/gini/android/health/sdk/exampleapp/configuration/ConfigurationFragment.kt b/health-sdk/example-app/src/main/java/net/gini/android/health/sdk/exampleapp/configuration/ConfigurationFragment.kt
index b8307ee4e3..805a3ed257 100644
--- a/health-sdk/example-app/src/main/java/net/gini/android/health/sdk/exampleapp/configuration/ConfigurationFragment.kt
+++ b/health-sdk/example-app/src/main/java/net/gini/android/health/sdk/exampleapp/configuration/ConfigurationFragment.kt
@@ -5,11 +5,15 @@ import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
 import androidx.fragment.app.activityViewModels
 import net.gini.android.health.sdk.exampleapp.MainViewModel
 import net.gini.android.health.sdk.exampleapp.databinding.FragmentConfigurationBinding
 import net.gini.android.health.sdk.exampleapp.review.ReviewViewModel
 import net.gini.android.health.sdk.paymentcomponent.PaymentComponentConfiguration
+import net.gini.android.health.sdk.util.GiniLocalization
+import org.koin.android.ext.android.bind
 
 class ConfigurationFragment: Fragment() {
 
@@ -25,6 +29,26 @@ class ConfigurationFragment: Fragment() {
         with(binding) {
             setupSwitchListeners()
         }
+
+        val languages = arrayOf(GiniLocalization.GERMAN, GiniLocalization.ENGLISH)
+        context?.let {
+            val languageAdapter = ArrayAdapter(it, android.R.layout.simple_spinner_dropdown_item, languages)
+            binding.languageSpinner.apply {
+                adapter = languageAdapter
+                onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(p0: AdapterView<*>?, p1: View?, p2: Int, p3: Long) {
+                        languageAdapter.getItem(p2)?.let {
+                            viewModel.setGiniHealthLanguage(it, context)
+                        }
+                    }
+
+                    override fun onNothingSelected(p0: AdapterView<*>?) {
+                    }
+                }
+                setSelection(languageAdapter.getPosition(viewModel.getGiniHealthLanguage(context)))
+            }
+        }
+
         return binding.root
     }
 
diff --git a/health-sdk/example-app/src/main/java/net/gini/android/health/sdk/exampleapp/review/ReviewActivity.kt b/health-sdk/example-app/src/main/java/net/gini/android/health/sdk/exampleapp/review/ReviewActivity.kt
index 0a40c323b6..51f63abad2 100644
--- a/health-sdk/example-app/src/main/java/net/gini/android/health/sdk/exampleapp/review/ReviewActivity.kt
+++ b/health-sdk/example-app/src/main/java/net/gini/android/health/sdk/exampleapp/review/ReviewActivity.kt
@@ -5,9 +5,11 @@ import android.content.DialogInterface
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.IntentCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.isGone
 import androidx.fragment.app.commit
@@ -21,9 +23,12 @@ import kotlinx.coroutines.launch
 import net.gini.android.core.api.models.Document
 import net.gini.android.health.sdk.GiniHealth
 import net.gini.android.health.sdk.bankselection.BankSelectionBottomSheet
+import net.gini.android.health.sdk.exampleapp.MainActivity
+import net.gini.android.health.sdk.exampleapp.MainActivity.Companion.PAYMENT_COMPONENT_CONFIG
 import net.gini.android.health.sdk.exampleapp.R
 import net.gini.android.health.sdk.exampleapp.databinding.ActivityReviewBinding
 import net.gini.android.health.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.health.sdk.paymentcomponent.PaymentComponentConfiguration
 import net.gini.android.health.sdk.paymentcomponent.PaymentProviderAppsState
 import net.gini.android.health.sdk.review.ReviewConfiguration
 import net.gini.android.health.sdk.review.ReviewFragment
@@ -85,7 +90,11 @@ class ReviewActivity : AppCompatActivity() {
 
         supportActionBar?.hide()
 
-        val binding = ActivityReviewBinding.inflate(layoutInflater)
+        val binding = ActivityReviewBinding.inflate(LayoutInflater.from(baseContext))
+        IntentCompat.getParcelableExtra(intent, MainActivity.PAYMENT_COMPONENT_CONFIG, PaymentComponentConfiguration::class.java)?.let {
+            viewModel.setPaymentComponentConfig(it)
+        }
+
         setContentView(binding.root)
 
         binding.toolbar.isGone = showCloseButton
@@ -208,11 +217,12 @@ class ReviewActivity : AppCompatActivity() {
 
         private const val EXTRA_URIS = "EXTRA_URIS"
 
-        fun getStartIntent(context: Context, pages: List<Uri> = emptyList()): Intent =
+        fun getStartIntent(context: Context, pages: List<Uri> = emptyList(), paymentComponentConfiguration: PaymentComponentConfiguration?): Intent =
             Intent(context, ReviewActivity::class.java).apply {
                 putParcelableArrayListExtra(
                     EXTRA_URIS,
                     if (pages is ArrayList<Uri>) pages else ArrayList<Uri>().apply { addAll(pages) })
+                putExtra(PAYMENT_COMPONENT_CONFIG, paymentComponentConfiguration)
             }
 
         private val Intent.pageUris: List<Uri>
diff --git a/health-sdk/example-app/src/main/java/net/gini/android/health/sdk/exampleapp/review/ReviewViewModel.kt b/health-sdk/example-app/src/main/java/net/gini/android/health/sdk/exampleapp/review/ReviewViewModel.kt
index febdddcbd0..6c1fd24e27 100644
--- a/health-sdk/example-app/src/main/java/net/gini/android/health/sdk/exampleapp/review/ReviewViewModel.kt
+++ b/health-sdk/example-app/src/main/java/net/gini/android/health/sdk/exampleapp/review/ReviewViewModel.kt
@@ -3,5 +3,10 @@ package net.gini.android.health.sdk.exampleapp.review
 import androidx.lifecycle.ViewModel
 import net.gini.android.health.sdk.GiniHealth
 import net.gini.android.health.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.health.sdk.paymentcomponent.PaymentComponentConfiguration
 
-class ReviewViewModel(val giniHealth: GiniHealth, val paymentComponent: PaymentComponent) : ViewModel()
\ No newline at end of file
+class ReviewViewModel(val giniHealth: GiniHealth, val paymentComponent: PaymentComponent) : ViewModel() {
+    fun setPaymentComponentConfig(paymentComponentConfiguration: PaymentComponentConfiguration) {
+        paymentComponent.paymentComponentConfiguration = paymentComponentConfiguration
+    }
+}
diff --git a/health-sdk/example-app/src/main/java/net/gini/android/health/sdk/exampleapp/upload/UploadActivity.kt b/health-sdk/example-app/src/main/java/net/gini/android/health/sdk/exampleapp/upload/UploadActivity.kt
index d12023a995..a8d4e32345 100644
--- a/health-sdk/example-app/src/main/java/net/gini/android/health/sdk/exampleapp/upload/UploadActivity.kt
+++ b/health-sdk/example-app/src/main/java/net/gini/android/health/sdk/exampleapp/upload/UploadActivity.kt
@@ -5,13 +5,17 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.IntentCompat
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.flow.collect
+import net.gini.android.health.sdk.exampleapp.MainActivity
+import net.gini.android.health.sdk.exampleapp.MainActivity.Companion.PAYMENT_COMPONENT_CONFIG
 import net.gini.android.health.sdk.exampleapp.R
 import net.gini.android.health.sdk.exampleapp.databinding.ActivityUploadBinding
 import net.gini.android.health.sdk.exampleapp.review.ReviewActivity
 import net.gini.android.health.sdk.exampleapp.upload.UploadViewModel.UploadState
+import net.gini.android.health.sdk.paymentcomponent.PaymentComponentConfiguration
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class UploadActivity : AppCompatActivity() {
@@ -33,7 +37,7 @@ class UploadActivity : AppCompatActivity() {
         }
 
         binding.payment.setOnClickListener {
-            startActivity(ReviewActivity.getStartIntent(this, intent.pageUris))
+            startActivity(ReviewActivity.getStartIntent(this, intent.pageUris, IntentCompat.getParcelableExtra(intent, PAYMENT_COMPONENT_CONFIG, PaymentComponentConfiguration::class.java)))
         }
     }
 
@@ -50,8 +54,9 @@ class UploadActivity : AppCompatActivity() {
 
     companion object {
         private const val EXTRA_URIS = "EXTRA_URIS"
-        fun getStartIntent(context: Context, pages: List<Uri>): Intent = Intent(context, UploadActivity::class.java).apply {
+        fun getStartIntent(context: Context, pages: List<Uri>, paymentComponentConfiguration: PaymentComponentConfiguration?): Intent = Intent(context, UploadActivity::class.java).apply {
             putParcelableArrayListExtra(EXTRA_URIS, if (pages is ArrayList<Uri>) pages else ArrayList<Uri>().apply { addAll(pages) })
+            putExtra(PAYMENT_COMPONENT_CONFIG, paymentComponentConfiguration)
         }
 
         private val Intent.pageUris: List<Uri>
diff --git a/health-sdk/example-app/src/main/java/net/gini/android/health/sdk/exampleapp/upload/UploadViewModel.kt b/health-sdk/example-app/src/main/java/net/gini/android/health/sdk/exampleapp/upload/UploadViewModel.kt
index 187baa79fc..86429a6512 100644
--- a/health-sdk/example-app/src/main/java/net/gini/android/health/sdk/exampleapp/upload/UploadViewModel.kt
+++ b/health-sdk/example-app/src/main/java/net/gini/android/health/sdk/exampleapp/upload/UploadViewModel.kt
@@ -15,12 +15,14 @@ import net.gini.android.health.sdk.GiniHealth
 import net.gini.android.health.sdk.exampleapp.invoices.data.InvoicesLocalDataSource
 import net.gini.android.health.sdk.exampleapp.invoices.data.model.DocumentWithExtractions
 import net.gini.android.health.sdk.exampleapp.util.getBytes
+import net.gini.android.health.sdk.paymentcomponent.PaymentComponentConfiguration
 
 class UploadViewModel(
     private val giniHealthAPI: GiniHealthAPI,
     val giniHealth: GiniHealth,
     private val invoicesLocalDataSource: InvoicesLocalDataSource
 ) : ViewModel() {
+    private val paymentComponentConfiguration: PaymentComponentConfiguration? = null
     private val _uploadState: MutableStateFlow<UploadState> = MutableStateFlow(UploadState.Loading)
     val uploadState: StateFlow<UploadState> = _uploadState
 
diff --git a/health-sdk/example-app/src/main/res/layout/fragment_configuration.xml b/health-sdk/example-app/src/main/res/layout/fragment_configuration.xml
index 17843bb9f5..0934804a34 100644
--- a/health-sdk/example-app/src/main/res/layout/fragment_configuration.xml
+++ b/health-sdk/example-app/src/main/res/layout/fragment_configuration.xml
@@ -36,4 +36,34 @@
         android:layout_height="wrap_content"
         android:checked="false"
         android:text="@string/hide_powered_by_gini"/>
-</LinearLayout>
\ No newline at end of file
+
+    <com.google.android.material.divider.MaterialDivider
+        android:id="@+id/divider3"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/ghs_medium" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/sdk_language"/>
+
+        <View
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="1dp"/>
+
+
+        <Spinner
+            android:id="@+id/languageSpinner"
+            android:layout_width="wrap_content"
+            android:gravity="end"
+            android:layout_height="wrap_content"/>
+
+    </LinearLayout>
+</LinearLayout>
diff --git a/health-sdk/example-app/src/main/res/values/strings.xml b/health-sdk/example-app/src/main/res/values/strings.xml
index c2cc54d99d..fa58967121 100644
--- a/health-sdk/example-app/src/main/res/values/strings.xml
+++ b/health-sdk/example-app/src/main/res/values/strings.xml
@@ -21,6 +21,7 @@
     <string name="close_screen_for_configurations_to_take_place">The configuration changes will take effect after closing this screen.</string>
     <string name="hide_powered_by_gini">Hide powered by Gini on payment component</string>
     <string name="gini_health_version">Gini Health SDK v: </string>
+    <string name="sdk_language">SDK language: </string>
 
     <string name="ghs_privacy_policy_link_url">https://www.google.com</string>
     <!-- TODO: Remove or change this placeholder text -->
diff --git a/health-sdk/example-app/src/main/res/values/styles.xml b/health-sdk/example-app/src/main/res/values/styles.xml
index 819c08ff3a..9bee44609b 100644
--- a/health-sdk/example-app/src/main/res/values/styles.xml
+++ b/health-sdk/example-app/src/main/res/values/styles.xml
@@ -12,6 +12,7 @@
         <item name="colorOnPrimary">@color/ghs_color_01</item>
         <item name="backgroundColor">@color/ghs_color_02</item>
         <item name="colorOnBackground">@color/ghs_color_contrast_02</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="dividerColor">@color/ghs_color_03</item>
         <item name="colorSurface">@color/ghs_color_03</item>
         <item name="colorOnSurface">?attr/colorOnBackground</item>
diff --git a/health-sdk/sdk/build.gradle.kts b/health-sdk/sdk/build.gradle.kts
index 4161936612..406c38767a 100644
--- a/health-sdk/sdk/build.gradle.kts
+++ b/health-sdk/sdk/build.gradle.kts
@@ -19,7 +19,8 @@ android {
     }
     defaultConfig {
         minSdk = libs.versions.android.minSdk.get().toInt()
-        targetSdk = libs.versions.android.targetSdk.get().toInt()
+        testOptions.targetSdk = libs.versions.android.targetSdk.get().toInt()
+        lint.targetSdk = libs.versions.android.targetSdk.get().toInt()
 
         // Use the test runner with JUnit4 support
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
diff --git a/health-sdk/sdk/gradle.properties b/health-sdk/sdk/gradle.properties
index 58be6abe8c..5e2ca23346 100644
--- a/health-sdk/sdk/gradle.properties
+++ b/health-sdk/sdk/gradle.properties
@@ -1,7 +1,7 @@
 # Maven coordinates
 # groupId is in the root gradle.properties
 artifactId=gini-health-sdk
-version=4.1.0
+version=4.2.0
 # Version code is visible only in the generated BuildConfig file
 versionCode=1000
 
diff --git a/health-sdk/sdk/src/doc/source/customization.rst b/health-sdk/sdk/src/doc/source/customization.rst
index 3699259eee..9a3c328169 100644
--- a/health-sdk/sdk/src/doc/source/customization.rst
+++ b/health-sdk/sdk/src/doc/source/customization.rst
@@ -162,6 +162,17 @@ You can also view the UI customisation guide in Figma `here
 
     To copy text from Figma you need to have a Figma account. If you don't have one, you can create one for free.
 
+.. note::
+
+  To change the paddings for the gray bank selection button (the one which shows the bank icon) you can override the ``GiniHealthTheme.Widget.Button.PaymentProviderSelector`` style:
+
+  .. code-block:: xml
+
+      <style name="GiniHealthTheme.Widget.Button.PaymentProviderSelector" parent="Root.GiniHealthTheme.Widget.Button.PaymentProviderSelector">
+          <item name="android:paddingStart">5dp</item>
+          <item name="android:paddingEnd">5dp</item>
+      </style>
+
 .. raw:: html
 
     <iframe style="border: 1px solid rgba(0, 0, 0, 0.1);" width="600" height="450"
diff --git a/health-sdk/sdk/src/doc/source/setup.rst b/health-sdk/sdk/src/doc/source/setup.rst
index b92ae5749d..9f5918c6aa 100644
--- a/health-sdk/sdk/src/doc/source/setup.rst
+++ b/health-sdk/sdk/src/doc/source/setup.rst
@@ -11,7 +11,7 @@ build.gradle:
 .. code-block:: groovy
 
     dependencies {
-        implementation 'net.gini.android:gini-health-sdk:4.1.0'
+        implementation 'net.gini.android:gini-health-sdk:4.2.0'
     }
 
 Gini Pay Deep Link For Your App
diff --git a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/GiniHealth.kt b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/GiniHealth.kt
index 4dd228abae..4964cf58da 100644
--- a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/GiniHealth.kt
+++ b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/GiniHealth.kt
@@ -1,5 +1,7 @@
 package net.gini.android.health.sdk
 
+import android.content.Context
+import android.content.SharedPreferences
 import android.os.Bundle
 import android.os.Parcelable
 import androidx.lifecycle.Lifecycle
@@ -21,11 +23,12 @@ import net.gini.android.health.sdk.review.ReviewFragment
 import net.gini.android.health.sdk.review.model.PaymentDetails
 import net.gini.android.health.sdk.review.model.PaymentRequest
 import net.gini.android.health.sdk.review.model.ResultWrapper
-import net.gini.android.health.sdk.review.model.getPaymentExtraction
 import net.gini.android.health.sdk.review.model.toPaymentDetails
 import net.gini.android.health.sdk.review.model.wrapToResult
+import net.gini.android.health.sdk.util.GiniLocalization
 import org.slf4j.LoggerFactory
 import java.lang.ref.WeakReference
+import java.util.Locale
 
 /**
  * [GiniHealth] is one of the main classes for interacting with the Gini Health SDK. It manages interaction with the Gini Health API.
@@ -76,6 +79,17 @@ class GiniHealth(
      */
     val openBankState: StateFlow<PaymentState> = _openBankState
 
+    /**
+     * Sets the app language to the desired one from the languages the SDK is supporting. If not set then defaults to the system's language locale.
+     *
+     * @param language enum value for the desired language or null for default system language
+     * @param context Context object to save the configuration.
+     */
+    fun setSDKLanguage(language: GiniLocalization?, context: Context) {
+        localizedContext = null
+        GiniHealthPreferences(context).saveSDKLanguage(language)
+    }
+
     /**
      * Sets a [Document] for review. Results can be collected from [documentFlow] and [paymentFlow].
      *
@@ -232,6 +246,23 @@ class GiniHealth(
         class Error(val throwable: Throwable) : PaymentState()
     }
 
+    internal class GiniHealthPreferences(context: Context) {
+        private val sharedPreferences = context.getSharedPreferences("GiniHealthPreferences", Context.MODE_PRIVATE)
+
+        fun saveSDKLanguage(value: GiniLocalization?) {
+            val editor: SharedPreferences.Editor = sharedPreferences.edit()
+            editor.putString(SDK_LANGUAGE_PREFS_KEY, value?.readableName?.uppercase())
+            editor.apply()
+        }
+
+        fun getSDKLanguage(): GiniLocalization? {
+            val enumValue = sharedPreferences.getString(SDK_LANGUAGE_PREFS_KEY, null)
+            return if (enumValue.isNullOrEmpty()) null else GiniLocalization.valueOf(enumValue)
+        }
+    }
+
+    internal var localizedContext: Context? = null
+
     companion object {
         private val LOG = LoggerFactory.getLogger(GiniHealth::class.java)
 
@@ -242,5 +273,10 @@ class GiniHealth(
         private const val PROVIDER = "net.gini.android.health.sdk.GiniHealth"
         private const val CAPTURED_ARGUMENTS = "CAPTURED_ARGUMENTS"
         private const val PAYABLE = "Payable"
+        private const val SDK_LANGUAGE_PREFS_KEY = "SDK_LANGUAGE_PREFS_KEY"
+
+        fun getSDKLanguage(context: Context): GiniLocalization? {
+            return GiniHealthPreferences(context).getSDKLanguage()
+        }
     }
 }
diff --git a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/bankselection/BankSelectionBottomSheet.kt b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/bankselection/BankSelectionBottomSheet.kt
index b513a7e2e8..5cc9a5ad79 100644
--- a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/bankselection/BankSelectionBottomSheet.kt
+++ b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/bankselection/BankSelectionBottomSheet.kt
@@ -22,10 +22,11 @@ import net.gini.android.health.sdk.paymentcomponent.PaymentComponent
 import net.gini.android.health.sdk.paymentprovider.PaymentProviderApp
 import net.gini.android.health.sdk.util.GhsBottomSheetDialogFragment
 import net.gini.android.health.sdk.util.autoCleared
-import net.gini.android.health.sdk.util.getLayoutInflaterWithGiniHealthTheme
+import net.gini.android.health.sdk.util.getLayoutInflaterWithGiniHealthThemeAndLocale
 import net.gini.android.health.sdk.util.setIntervalClickListener
-import net.gini.android.health.sdk.util.wrappedWithGiniHealthTheme
+import net.gini.android.health.sdk.util.wrappedWithGiniHealthThemeAndLocale
 import org.slf4j.LoggerFactory
+import java.util.Locale
 
 /**
  * The [BankSelectionBottomSheet] displays a list of available banks for the user to choose from. If a banking app is not
@@ -39,12 +40,17 @@ class BankSelectionBottomSheet private constructor(private val paymentComponent:
     private var binding: GhsBottomSheetBankSelectionBinding by autoCleared()
     private val viewModel: BankSelectionViewModel by viewModels { BankSelectionViewModel.Factory(paymentComponent) }
 
+    override fun onGetLayoutInflater(savedInstanceState: Bundle?): LayoutInflater {
+        val inflater = super.onGetLayoutInflater(savedInstanceState)
+        return this.getLayoutInflaterWithGiniHealthThemeAndLocale(inflater, viewModel.paymentComponent?.giniHealthLanguage)
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         binding = GhsBottomSheetBankSelectionBinding.inflate(inflater, container, false)
 
         binding.ghsPaymentProviderAppsList.layoutManager = LinearLayoutManager(requireContext())
         binding.ghsPaymentProviderAppsList.adapter =
-            PaymentProviderAppsAdapter(emptyList(), object : PaymentProviderAppsAdapter.OnItemClickListener {
+            PaymentProviderAppsAdapter(emptyList(), viewModel.paymentComponent?.giniHealthLanguage, object : PaymentProviderAppsAdapter.OnItemClickListener {
                 override fun onItemClick(paymentProviderApp: PaymentProviderApp) {
                     LOG.debug("Selected payment provider app: {}", paymentProviderApp.name)
 
@@ -116,6 +122,7 @@ class BankSelectionBottomSheet private constructor(private val paymentComponent:
 
 internal class PaymentProviderAppsAdapter(
     var dataSet: List<PaymentProviderAppListItem>,
+    val locale: Locale?,
     val onItemClickListener: OnItemClickListener
 ) : RecyclerView.Adapter<PaymentProviderAppsAdapter.ViewHolder>() {
 
@@ -135,7 +142,7 @@ internal class PaymentProviderAppsAdapter(
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val view = GhsItemPaymentProviderAppBinding.inflate(parent.getLayoutInflaterWithGiniHealthTheme(), parent, false)
+        val view = GhsItemPaymentProviderAppBinding.inflate(parent.getLayoutInflaterWithGiniHealthThemeAndLocale(locale), parent, false)
         val viewHolder = ViewHolder(view, object : ViewHolder.OnClickListener {
             override fun onClick(adapterPosition: Int) {
                 onItemClickListener.onItemClick(dataSet[adapterPosition].paymentProviderApp)
@@ -146,7 +153,7 @@ internal class PaymentProviderAppsAdapter(
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val paymentProviderAppListItem = dataSet[position]
-        holder.itemView.context.wrappedWithGiniHealthTheme().let { context ->
+        holder.itemView.context.wrappedWithGiniHealthThemeAndLocale(locale).let { context ->
             holder.button.text = paymentProviderAppListItem.paymentProviderApp.name
             holder.iconView.setImageDrawable(paymentProviderAppListItem.paymentProviderApp.icon)
             holder.itemView.isSelected = paymentProviderAppListItem.isSelected
diff --git a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/moreinformation/FaqExpandableListAdapter.kt b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/moreinformation/FaqExpandableListAdapter.kt
index d4c1b9eac6..c584c16ad6 100644
--- a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/moreinformation/FaqExpandableListAdapter.kt
+++ b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/moreinformation/FaqExpandableListAdapter.kt
@@ -2,20 +2,23 @@ package net.gini.android.health.sdk.moreinformation
 
 import android.text.SpannedString
 import android.text.method.LinkMovementMethod
-import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import android.widget.BaseExpandableListAdapter
-import android.widget.TextView
 import net.gini.android.health.sdk.databinding.GhsItemFaqAnswerBinding
 import net.gini.android.health.sdk.databinding.GhsItemFaqLabelBinding
-import net.gini.android.health.sdk.util.getLayoutInflaterWithGiniHealthTheme
+import net.gini.android.health.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.health.sdk.util.getLayoutInflaterWithGiniHealthThemeAndLocale
+import java.util.Locale
 
 /**
  * Created by dani on 26/02/2024.
  */
 
-internal class FaqExpandableListAdapter(val dataSet: List<Pair<String, CharSequence>>) : BaseExpandableListAdapter() {
+internal class FaqExpandableListAdapter(
+    val dataSet: List<Pair<String, CharSequence>>,
+    private val locale: Locale?
+    ) : BaseExpandableListAdapter() {
     override fun getGroupCount(): Int = dataSet.size
     override fun getChildrenCount(listPosition: Int): Int = 1
     override fun getGroup(listPosition: Int): Any = dataSet[listPosition].first
@@ -29,13 +32,13 @@ internal class FaqExpandableListAdapter(val dataSet: List<Pair<String, CharSeque
     override fun hasStableIds(): Boolean = true
 
     override fun getGroupView(position: Int, isExpanded: Boolean, p2: View?, parent: ViewGroup): View {
-        val groupView = GhsItemFaqLabelBinding.inflate(parent.getLayoutInflaterWithGiniHealthTheme(), parent, false)
+        val groupView = GhsItemFaqLabelBinding.inflate(parent.getLayoutInflaterWithGiniHealthThemeAndLocale(locale), parent, false)
         groupView.ghsFaqLabel.text = dataSet[position].first
         return groupView.root
     }
 
     override fun getChildView(p0: Int, p1: Int, isLastChild: Boolean, convertView: View?, parent: ViewGroup): View {
-        val groupView = GhsItemFaqAnswerBinding.inflate(parent.getLayoutInflaterWithGiniHealthTheme(), parent, false)
+        val groupView = GhsItemFaqAnswerBinding.inflate(parent.getLayoutInflaterWithGiniHealthThemeAndLocale(locale), parent, false)
         val text = getChild(p0, p1)
         if (text is SpannedString) {
             groupView.ghsFaqAnswerLabel.movementMethod = LinkMovementMethod.getInstance()
diff --git a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/moreinformation/MoreInformationFragment.kt b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/moreinformation/MoreInformationFragment.kt
index 16bb97c83d..227aafb42c 100644
--- a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/moreinformation/MoreInformationFragment.kt
+++ b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/moreinformation/MoreInformationFragment.kt
@@ -1,6 +1,5 @@
 package net.gini.android.health.sdk.moreinformation
 
-import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.text.SpannableString
 import android.text.SpannedString
@@ -8,7 +7,6 @@ import android.text.TextPaint
 import android.text.method.LinkMovementMethod
 import android.text.style.TextAppearanceSpan
 import android.text.style.URLSpan
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -30,7 +28,9 @@ import net.gini.android.health.sdk.databinding.GhsPaymentProviderIconHolderBindi
 import net.gini.android.health.sdk.paymentcomponent.PaymentComponent
 import net.gini.android.health.sdk.paymentprovider.PaymentProviderApp
 import net.gini.android.health.sdk.util.autoCleared
-import net.gini.android.health.sdk.util.getLayoutInflaterWithGiniHealthTheme
+import net.gini.android.health.sdk.util.getLayoutInflaterWithGiniHealthThemeAndLocale
+import net.gini.android.health.sdk.util.getLocaleStringResource
+import java.util.Locale
 
 /**
  * The [MoreInformationFragment] displays information and an FAQ section about the payment feature. It requires a
@@ -47,21 +47,25 @@ class MoreInformationFragment private constructor(private val paymentComponent:
         )
     }
 
+    private fun getLocaleStringResource(resourceId: Int): String {
+        return getLocaleStringResource(resourceId, viewModel.paymentComponent?.giniHealth)
+    }
+
     @VisibleForTesting
     internal val faqList: List<Pair<String, CharSequence>> by lazy {
         listOf(
-            getString(R.string.ghs_faq_1) to getString(R.string.ghs_faq_answer_1),
-            getString(R.string.ghs_faq_2) to getString(R.string.ghs_faq_answer_2),
-            getString(R.string.ghs_faq_3) to getString(R.string.ghs_faq_answer_3),
-            getString(R.string.ghs_faq_4) to buildGiniRelatedAnswer(),
-            getString(R.string.ghs_faq_5) to getString(R.string.ghs_faq_answer_5),
-            getString(R.string.ghs_faq_6) to getString(R.string.ghs_faq_answer_6)
+            getLocaleStringResource(R.string.ghs_faq_1) to getLocaleStringResource(R.string.ghs_faq_answer_1),
+            getLocaleStringResource(R.string.ghs_faq_2) to getLocaleStringResource(R.string.ghs_faq_answer_2),
+            getLocaleStringResource(R.string.ghs_faq_3) to getLocaleStringResource(R.string.ghs_faq_answer_3),
+            getLocaleStringResource(R.string.ghs_faq_4) to buildGiniRelatedAnswer(),
+            getLocaleStringResource(R.string.ghs_faq_5) to getLocaleStringResource(R.string.ghs_faq_answer_5),
+            getLocaleStringResource(R.string.ghs_faq_6) to getLocaleStringResource(R.string.ghs_faq_answer_6)
         )
     }
 
     override fun onGetLayoutInflater(savedInstanceState: Bundle?): LayoutInflater {
         val inflater = super.onGetLayoutInflater(savedInstanceState)
-        return this.getLayoutInflaterWithGiniHealthTheme(inflater)
+        return this.getLayoutInflaterWithGiniHealthThemeAndLocale(inflater, viewModel.getLocale())
     }
 
     override fun onCreateView(
@@ -76,21 +80,24 @@ class MoreInformationFragment private constructor(private val paymentComponent:
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        resources.configuration.setLocale(viewModel.getLocale())
         binding.ghsMoreInformationDetails.text = buildSpannedString {
-            append(getString(R.string.ghs_more_information_details))
+            append(getLocaleStringResource(R.string.ghs_more_information_details))
             append(" ")
             append(createSpanForLink(R.string.ghs_gini_link, R.string.ghs_gini_link_url))
             append(".")
         }
+
         binding.ghsMoreInformationDetails.movementMethod = LinkMovementMethod.getInstance()
-        binding.ghsPaymentProvidersIconsList.adapter = PaymentProvidersIconsAdapter(listOf())
+        binding.ghsPaymentProvidersIconsList.adapter = PaymentProvidersIconsAdapter(listOf(), viewModel.getLocale())
         binding.ghsFaqList.apply {
-            setAdapter(FaqExpandableListAdapter(faqList))
+            setAdapter(FaqExpandableListAdapter(faqList, viewModel.getLocale()))
             setOnGroupClickListener { expandableListView, _, group, _ ->
                 setListViewHeight(listView = expandableListView, group = group, isReload = false)
                 return@setOnGroupClickListener false
             }
         }
+
         //Set initial list view height so we can scroll full page
         binding.ghsFaqList.postDelayed({
             setListViewHeight(listView = binding.ghsFaqList, group = getExpandedGroupPosition(), isReload = true)
@@ -127,9 +134,9 @@ class MoreInformationFragment private constructor(private val paymentComponent:
     }
 
     private fun createSpanForLink(@StringRes placeholder: Int, @StringRes urlResource: Int) =
-        SpannableString(getString(placeholder)).apply {
+        SpannableString(getLocaleStringResource(placeholder)).apply {
             setSpan(
-                URLSpanNoUnderline(getString(urlResource)),
+                URLSpanNoUnderline(getLocaleStringResource(urlResource)),
                 0,
                 this.length,
                 SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE
@@ -146,7 +153,7 @@ class MoreInformationFragment private constructor(private val paymentComponent:
         val giniLink = createSpanForLink(R.string.ghs_gini_website, R.string.ghs_gini_link_url)
         val privacyPolicyString = createSpanForLink(R.string.ghs_privacy_policy, R.string.ghs_privacy_policy_link_url)
         val span = buildSpannedString {
-            append(getString(R.string.ghs_faq_answer_4))
+            append(getLocaleStringResource(R.string.ghs_faq_answer_4))
             replace(indexOf("%s"), indexOf("%s") + 2, giniLink)
             replace(indexOf("%p"), indexOf("%p") + 2, privacyPolicyString)
         }
@@ -186,12 +193,12 @@ class MoreInformationFragment private constructor(private val paymentComponent:
         listView.requestLayout()
     }
 
-    internal class PaymentProvidersIconsAdapter(var dataSet: List<PaymentProviderApp?>) :
+    internal class PaymentProvidersIconsAdapter(var dataSet: List<PaymentProviderApp?>, var locale: Locale?) :
         RecyclerView.Adapter<PaymentProvidersIconsAdapter.ViewHolder>() {
 
         override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
             val view = GhsPaymentProviderIconHolderBinding.inflate(
-                parent.getLayoutInflaterWithGiniHealthTheme(),
+                parent.getLayoutInflaterWithGiniHealthThemeAndLocale(locale),
                 parent,
                 false
             )
diff --git a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/moreinformation/MoreInformationViewModel.kt b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/moreinformation/MoreInformationViewModel.kt
index c57f831cf4..b0d34dddf7 100644
--- a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/moreinformation/MoreInformationViewModel.kt
+++ b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/moreinformation/MoreInformationViewModel.kt
@@ -13,9 +13,10 @@ import net.gini.android.health.sdk.paymentcomponent.PaymentComponent
 import net.gini.android.health.sdk.paymentcomponent.PaymentProviderAppsState
 import net.gini.android.health.sdk.paymentprovider.PaymentProviderApp
 import org.slf4j.LoggerFactory
+import java.util.Locale
 
 
-internal class MoreInformationViewModel(private val paymentComponent: PaymentComponent?) : ViewModel() {
+internal class MoreInformationViewModel(val paymentComponent: PaymentComponent?) : ViewModel() {
 
     private val _paymentProviderAppsListFlow =
         MutableStateFlow<PaymentProviderAppsListState>(PaymentProviderAppsListState.Loading)
@@ -53,6 +54,8 @@ internal class MoreInformationViewModel(private val paymentComponent: PaymentCom
         }
     }
 
+    fun getLocale(): Locale? = paymentComponent?.giniHealthLanguage
+
     private fun processError(throwable: Throwable) {
         LOG.error("Error loading payment provider apps", throwable)
         _paymentProviderAppsListFlow.value = PaymentProviderAppsListState.Error(throwable)
diff --git a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/paymentcomponent/PaymentComponent.kt b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/paymentcomponent/PaymentComponent.kt
index adabbd1d83..beb06c8a7e 100644
--- a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/paymentcomponent/PaymentComponent.kt
+++ b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/paymentcomponent/PaymentComponent.kt
@@ -23,7 +23,7 @@ import net.gini.android.health.sdk.paymentprovider.getPaymentProviderApps
  *
  * It requires a [GiniHealth] instance and a [Context] (application or activity) to be created.
  */
-class PaymentComponent(private val context: Context, private val giniHealth: GiniHealth, private var configuration: PaymentComponentConfiguration = PaymentComponentConfiguration()) {
+class PaymentComponent(private val context: Context, internal val giniHealth: GiniHealth, private var configuration: PaymentComponentConfiguration = PaymentComponentConfiguration()) {
 
     // Holds the state of the Payment Provider apps as received from the server - no processing is done on this list, to serve as a point of truth
     private val _initialStatePaymentProviderAppsFlow = MutableStateFlow<PaymentProviderAppsState>(PaymentProviderAppsState.Loading)
@@ -53,6 +53,8 @@ class PaymentComponent(private val context: Context, private val giniHealth: Gin
     @VisibleForTesting
     internal val paymentComponentPreferences = PaymentComponentPreferences(context)
 
+    internal val giniHealthLanguage = GiniHealth.getSDKLanguage(context)?.languageLocale()
+
     /**
      * A listener for the payment component. It exposes the user interactions with all of the [PaymentComponentView]s.
      * See [Listener] for the methods you need to implement.
diff --git a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/paymentcomponent/PaymentComponentView.kt b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/paymentcomponent/PaymentComponentView.kt
index 774959f0f3..a67138c427 100644
--- a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/paymentcomponent/PaymentComponentView.kt
+++ b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/paymentcomponent/PaymentComponentView.kt
@@ -12,13 +12,14 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.launch
+import net.gini.android.health.sdk.GiniHealth
 import net.gini.android.health.sdk.R
 import net.gini.android.health.sdk.databinding.GhsViewPaymentComponentBinding
 import net.gini.android.health.sdk.paymentprovider.PaymentProviderApp
-import net.gini.android.health.sdk.util.getLayoutInflaterWithGiniHealthTheme
+import net.gini.android.health.sdk.util.getLayoutInflaterWithGiniHealthThemeAndLocale
 import net.gini.android.health.sdk.util.setBackgroundTint
 import net.gini.android.health.sdk.util.setIntervalClickListener
-import net.gini.android.health.sdk.util.wrappedWithGiniHealthTheme
+import net.gini.android.health.sdk.util.wrappedWithGiniHealthThemeAndLocale
 import org.slf4j.LoggerFactory
 import kotlin.coroutines.CoroutineContext
 
@@ -62,6 +63,7 @@ class PaymentComponentView(context: Context, attrs: AttributeSet?) : ConstraintL
     /**
      * Sets the payable state of the [PaymentComponentView]. If `true`, the view will be shown, otherwise it will be hidden.
      */
+
     var isPayable: Boolean = false
         set(isPayable) {
             field = isPayable
@@ -87,7 +89,7 @@ class PaymentComponentView(context: Context, attrs: AttributeSet?) : ConstraintL
             launchJobs()
         }
 
-    private val binding = GhsViewPaymentComponentBinding.inflate(getLayoutInflaterWithGiniHealthTheme(), this)
+    private val binding = GhsViewPaymentComponentBinding.inflate(getLayoutInflaterWithGiniHealthThemeAndLocale(GiniHealth.getSDKLanguage(context)?.languageLocale()), this)
 
     init {
         addButtonInputHandlers()
@@ -168,7 +170,7 @@ class PaymentComponentView(context: Context, attrs: AttributeSet?) : ConstraintL
 
     private fun restoreBankPickerDefaultState() {
         LOG.debug("Restoring bank picker default state")
-        context?.wrappedWithGiniHealthTheme()?.let { context ->
+        context?.wrappedWithGiniHealthThemeAndLocale(paymentComponent?.giniHealthLanguage)?.let { context ->
             binding.ghsPayInvoiceButton.visibility = View.GONE
             binding.ghsPaymentProviderAppIconHolder.root.visibility = View.GONE
             binding.ghsSelectBankButton.text = context.getString(R.string.ghs_select_bank)
@@ -183,7 +185,7 @@ class PaymentComponentView(context: Context, attrs: AttributeSet?) : ConstraintL
 
     private fun customizeBankPicker(paymentProviderApp: PaymentProviderApp) {
         LOG.debug("Customizing bank picker for payment provider app: {}", paymentProviderApp.name)
-        context?.wrappedWithGiniHealthTheme()?.let { context ->
+        context?.wrappedWithGiniHealthThemeAndLocale(paymentComponent?.giniHealthLanguage)?.let { context ->
             binding.ghsSelectBankButton.text = ""
             binding.ghsSelectBankButton.setCompoundDrawablesWithIntrinsicBounds(
                 null,
@@ -228,7 +230,7 @@ class PaymentComponentView(context: Context, attrs: AttributeSet?) : ConstraintL
 
     private fun restorePayInvoiceButtonDefaultState() {
         LOG.debug("Restoring pay invoice button default state")
-        context?.wrappedWithGiniHealthTheme()?.let { context ->
+        context?.wrappedWithGiniHealthThemeAndLocale(paymentComponent?.giniHealthLanguage)?.let { context ->
             binding.ghsPayInvoiceButton.setBackgroundTint(
                 ContextCompat.getColor(
                     context,
@@ -268,7 +270,7 @@ class PaymentComponentView(context: Context, attrs: AttributeSet?) : ConstraintL
     private fun show() {
         LOG.debug("Showing payment component")
         binding.ghsSelectBankPicker.visibility = VISIBLE
-        binding.ghsPoweredByGini.visibility = if (paymentComponent?.paymentComponentConfiguration?.isPaymentComponentBranded == true) VISIBLE else INVISIBLE
+        binding.ghsPoweredByGini.visibility = if (paymentComponent?.paymentComponentConfiguration?.isPaymentComponentBranded == true) VISIBLE else GONE
         changeLabelsVisibilityIfNeeded()
         launchJobs()
     }
diff --git a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/paymentprovider/PaymentProviderApp.kt b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/paymentprovider/PaymentProviderApp.kt
index 5c14a2d9db..99a64523d9 100644
--- a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/paymentprovider/PaymentProviderApp.kt
+++ b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/paymentprovider/PaymentProviderApp.kt
@@ -47,7 +47,6 @@ private fun getPaymentProviderAppQueryIntent() = Intent().apply {
     action = Intent.ACTION_VIEW
     data = Uri.parse(QueryUri)
 }
-
 data class PaymentProviderApp(
     val name: String,
     val icon: BitmapDrawable?,
diff --git a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/ReviewFragment.kt b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/ReviewFragment.kt
index 57167d3ecd..d58f13a331 100644
--- a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/ReviewFragment.kt
+++ b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/ReviewFragment.kt
@@ -62,15 +62,17 @@ import net.gini.android.health.sdk.util.amountWatcher
 import net.gini.android.health.sdk.util.autoCleared
 import net.gini.android.health.sdk.util.clearErrorMessage
 import net.gini.android.health.sdk.util.extensions.getFontScale
-import net.gini.android.health.sdk.util.getLayoutInflaterWithGiniHealthTheme
+import net.gini.android.health.sdk.util.getLayoutInflaterWithGiniHealthThemeAndLocale
+import net.gini.android.health.sdk.util.getLocaleStringResource
 import net.gini.android.health.sdk.util.hideErrorMessage
 import net.gini.android.health.sdk.util.hideKeyboard
 import net.gini.android.health.sdk.util.setBackgroundTint
 import net.gini.android.health.sdk.util.setErrorMessage
 import net.gini.android.health.sdk.util.setTextIfDifferent
 import net.gini.android.health.sdk.util.showErrorMessage
-import net.gini.android.health.sdk.util.wrappedWithGiniHealthTheme
+import net.gini.android.health.sdk.util.wrappedWithGiniHealthThemeAndLocale
 import java.io.File
+import java.util.Locale
 
 /**
  * Configuration for the [ReviewFragment].
@@ -121,7 +123,6 @@ interface ReviewFragmentListener {
  */
 class ReviewFragment private constructor(
     var listener: ReviewFragmentListener? = null,
-    private val paymentComponent: PaymentComponent? = null,
     private val viewModelFactory: ViewModelProvider.Factory? = null,
 ) : Fragment() {
 
@@ -138,10 +139,9 @@ class ReviewFragment private constructor(
         }
     }
 
-
     override fun onGetLayoutInflater(savedInstanceState: Bundle?): LayoutInflater {
         val inflater = super.onGetLayoutInflater(savedInstanceState)
-        return this.getLayoutInflaterWithGiniHealthTheme(inflater)
+        return this.getLayoutInflaterWithGiniHealthThemeAndLocale(inflater, viewModel.paymentComponent.giniHealthLanguage)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
@@ -259,7 +259,7 @@ class ReviewFragment private constructor(
                 })
             }
 
-            is ResultWrapper.Error -> handleError(getString(R.string.ghs_generic_error_message)) { viewModel.retryDocumentReview() }
+            is ResultWrapper.Error -> handleError(getLocaleStringResource(R.string.ghs_generic_error_message)) { viewModel.retryDocumentReview() }
             else -> { // Loading state handled by payment details
             }
         }
@@ -268,7 +268,7 @@ class ReviewFragment private constructor(
     private fun GhsFragmentReviewBinding.handlePaymentResult(paymentResult: ResultWrapper<PaymentDetails>) {
         binding.loading.isVisible = paymentResult is ResultWrapper.Loading
         if (paymentResult is ResultWrapper.Error) {
-            handleError(getString(R.string.ghs_generic_error_message)) { viewModel.retryDocumentReview() }
+            handleError(getLocaleStringResource(R.string.ghs_generic_error_message)) { viewModel.retryDocumentReview() }
         }
     }
 
@@ -362,14 +362,14 @@ class ReviewFragment private constructor(
                         startActivity(intent)
                         viewModel.onBankOpened()
                     } else {
-                        handleError(getString(R.string.ghs_generic_error_message)) { viewModel.onPayment() }
+                        handleError(getLocaleStringResource(R.string.ghs_generic_error_message)) { viewModel.onPayment() }
                     }
                 } catch (exception: ActivityNotFoundException) {
-                    handleError(getString(R.string.ghs_generic_error_message)) { viewModel.onPayment() }
+                    handleError(getLocaleStringResource(R.string.ghs_generic_error_message)) { viewModel.onPayment() }
                 }
             }
             is GiniHealth.PaymentState.Error -> {
-                handleError(getString(R.string.ghs_generic_error_message)) { viewModel.onPaymentButtonTapped(requireContext().externalCacheDir) }
+                handleError(getLocaleStringResource(R.string.ghs_generic_error_message)) { viewModel.onPaymentButtonTapped(requireContext().externalCacheDir) }
             }
             else -> { // Loading is already handled
             }
@@ -382,7 +382,7 @@ class ReviewFragment private constructor(
         ibanLayout.isEnabled = !isLoading
         amountLayout.isEnabled = !isLoading
         purposeLayout.isEnabled = !isLoading
-        payment.text = if (isLoading) "" else getString(R.string.ghs_pay_button)
+        payment.text = if (isLoading) "" else getLocaleStringResource(R.string.ghs_pay_button)
     }
 
     private fun GhsFragmentReviewBinding.handleError(text: String, onRetry: () -> Unit) {
@@ -393,14 +393,14 @@ class ReviewFragment private constructor(
     }
 
     private fun GhsFragmentReviewBinding.showSnackbar(text: String, onRetry: () -> Unit) {
-        val context = requireContext().wrappedWithGiniHealthTheme()
+        val context = requireContext().wrappedWithGiniHealthThemeAndLocale(viewModel.paymentComponent.giniHealthLanguage)
         errorSnackbar?.dismiss()
         errorSnackbar = Snackbar.make(context, root, text, Snackbar.LENGTH_INDEFINITE).apply {
             if (context.getFontScale() < 1.5) {
                 anchorView = paymentDetailsScrollview
             }
             setTextMaxLines(2)
-            setAction(getString(R.string.ghs_snackbar_retry)) {
+            setAction(getLocaleStringResource(R.string.ghs_snackbar_retry)) {
                 onRetry()
             }
             show()
@@ -577,7 +577,7 @@ class ReviewFragment private constructor(
 
     private fun showOpenWithDialog(paymentProviderApp: PaymentProviderApp) {
         errorSnackbar?.dismiss()
-        OpenWithBottomSheet.newInstance(paymentProviderApp, object: OpenWithForwardListener {
+        OpenWithBottomSheet.newInstance(paymentProviderApp, viewModel.paymentComponent, object: OpenWithForwardListener {
             override fun onForwardSelected() {
                 viewModel.onForwardToSharePdfTapped(requireContext().externalCacheDir)
             }
@@ -614,8 +614,15 @@ class ReviewFragment private constructor(
                     viewModel.onPayment()
                 }
             }
-            ReviewViewModel.PaymentNextStep.ShowOpenWithSheet -> viewModel.paymentProviderApp.value?.let { showOpenWithDialog(it) }
-            ReviewViewModel.PaymentNextStep.ShowInstallApp -> viewModel.paymentProviderApp.value?.let { showInstallAppDialog(it) }
+            ReviewViewModel.PaymentNextStep.ShowOpenWithSheet -> {
+                if (viewModel.validatePaymentDetails()) {
+                    viewModel.paymentProviderApp.value?.let { showOpenWithDialog(it) }
+                }
+            }
+            ReviewViewModel.PaymentNextStep.ShowInstallApp ->
+                if (viewModel.validatePaymentDetails()) {
+                    viewModel.paymentProviderApp.value?.let { showInstallAppDialog(it) }
+                }
             is ReviewViewModel.PaymentNextStep.OpenSharePdf -> {
                 binding.loading.isVisible = false
                 startSharePdfIntent(paymentNextStep.file)
@@ -629,6 +636,10 @@ class ReviewFragment private constructor(
         PendingIntent.FLAG_IMMUTABLE
     )
 
+    private fun getLocaleStringResource(resourceId: Int): String {
+        return getLocaleStringResource(resourceId, viewModel.paymentComponent.giniHealth)
+    }
+
     override fun onSaveInstanceState(outState: Bundle) {
         outState.putInt(PAGER_HEIGHT, binding.pager.layoutParams.height)
         super.onSaveInstanceState(outState)
@@ -652,7 +663,7 @@ class ReviewFragment private constructor(
             paymentComponent: PaymentComponent,
             documentId: String,
             viewModelFactory: ViewModelProvider.Factory = ReviewViewModel.Factory(giniHealth, configuration, paymentComponent, documentId),
-        ): ReviewFragment = ReviewFragment(listener, paymentComponent, viewModelFactory)
+        ): ReviewFragment = ReviewFragment(listener, viewModelFactory)
     }
 
     internal class ShareWithBroadcastReceiver: BroadcastReceiver() {
diff --git a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/ReviewViewModel.kt b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/ReviewViewModel.kt
index b3a6a4ebb3..10bd25a2f0 100644
--- a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/ReviewViewModel.kt
+++ b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/ReviewViewModel.kt
@@ -176,6 +176,8 @@ internal class ReviewViewModel(
         _paymentDetails.value = paymentDetails.value.copy(purpose = purpose)
     }
 
+    fun validatePaymentDetails(): Boolean = validatePaymentDetails(paymentDetails.value)
+
     private fun validatePaymentDetails(paymentDetails: PaymentDetails): Boolean {
         val items = paymentDetails.validate()
         _paymentValidation.tryEmit(items)
diff --git a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/installApp/InstallAppBottomSheet.kt b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/installApp/InstallAppBottomSheet.kt
index 8763ed89e5..0006f19233 100644
--- a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/installApp/InstallAppBottomSheet.kt
+++ b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/installApp/InstallAppBottomSheet.kt
@@ -1,37 +1,26 @@
 package net.gini.android.health.sdk.review.installApp
 
-import android.app.Dialog
 import android.content.Intent
-import android.graphics.drawable.ColorDrawable
 import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.constraintlayout.widget.ConstraintSet
-import androidx.core.content.ContentProviderCompat.requireContext
-import androidx.core.content.ContextCompat
-import androidx.core.content.ContextCompat.startActivity
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
-import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import kotlinx.coroutines.launch
+import net.gini.android.health.sdk.GiniHealth
 import net.gini.android.health.sdk.R
 import net.gini.android.health.sdk.databinding.GhsBottomSheetInstallAppBinding
 import net.gini.android.health.sdk.paymentcomponent.PaymentComponent
-import net.gini.android.health.sdk.paymentcomponent.SelectedPaymentProviderAppState
 import net.gini.android.health.sdk.paymentprovider.PaymentProviderApp
-import net.gini.android.health.sdk.review.ReviewViewModel
 import net.gini.android.health.sdk.util.GhsBottomSheetDialogFragment
 import net.gini.android.health.sdk.util.autoCleared
-import net.gini.android.health.sdk.util.getLayoutInflaterWithGiniHealthTheme
+import net.gini.android.health.sdk.util.getLayoutInflaterWithGiniHealthThemeAndLocale
+import net.gini.android.health.sdk.util.getLocaleStringResource
 import net.gini.android.health.sdk.util.setBackgroundTint
-import net.gini.android.health.sdk.util.wrappedWithGiniHealthTheme
 import org.slf4j.LoggerFactory
 
 /**
@@ -56,6 +45,11 @@ internal class InstallAppBottomSheet private constructor(
         )
     }
 
+    override fun onGetLayoutInflater(savedInstanceState: Bundle?): LayoutInflater {
+        val inflater = super.onGetLayoutInflater(savedInstanceState)
+        return this.getLayoutInflaterWithGiniHealthThemeAndLocale(inflater, GiniHealth.getSDKLanguage(requireContext())?.languageLocale())
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -79,13 +73,13 @@ internal class InstallAppBottomSheet private constructor(
                             paymentProviderApp.icon
                         )
                         binding.ghsPaymentProviderIcon.ghsPaymentProviderIcon.contentDescription =
-                            "${paymentProviderApp.name} ${getString(R.string.ghs_payment_provider_logo_content_description)}"
+                            "${paymentProviderApp.name} ${getLocaleStringResource(R.string.ghs_payment_provider_logo_content_description)}"
                         binding.ghsInstallAppTitle.text = String.format(
-                            getString(net.gini.android.health.sdk.R.string.ghs_install_app_title),
+                            getLocaleStringResource(net.gini.android.health.sdk.R.string.ghs_install_app_title),
                             paymentProviderApp.paymentProvider.name
                         )
                         binding.ghsInstallAppDetails.text = String.format(
-                            getString(net.gini.android.health.sdk.R.string.ghs_install_app_detail),
+                            getLocaleStringResource(net.gini.android.health.sdk.R.string.ghs_install_app_detail),
                             paymentProviderApp.paymentProvider.name
                         )
                         binding.ghsPlayStoreLogo.setOnClickListener {
@@ -106,7 +100,7 @@ internal class InstallAppBottomSheet private constructor(
 
     private fun updateUI(paymentProviderApp: PaymentProviderApp) {
         binding.ghsInstallAppDetails.text = String.format(
-            getString(R.string.ghs_install_app_tap_to_continue),
+            getLocaleStringResource(R.string.ghs_install_app_tap_to_continue),
             paymentProviderApp.paymentProvider.name
         )
         binding.ghsPlayStoreLogo.visibility = View.GONE
@@ -135,6 +129,10 @@ internal class InstallAppBottomSheet private constructor(
         startActivity(intent)
     }
 
+    private fun getLocaleStringResource(resourceId: Int): String {
+        return getLocaleStringResource(resourceId, viewModel.paymentComponent?.giniHealth)
+    }
+
     companion object {
         private val LOG = LoggerFactory.getLogger(InstallAppBottomSheet::class.java)
 
diff --git a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/installApp/InstallAppViewModel.kt b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/installApp/InstallAppViewModel.kt
index 3047792ae6..4ac71004b8 100644
--- a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/installApp/InstallAppViewModel.kt
+++ b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/installApp/InstallAppViewModel.kt
@@ -12,7 +12,7 @@ import net.gini.android.health.sdk.paymentprovider.PaymentProviderApp
 import net.gini.android.health.sdk.review.ReviewViewModel
 import org.slf4j.LoggerFactory
 
-internal class InstallAppViewModel(private val paymentComponent: PaymentComponent?) : ViewModel() {
+internal class InstallAppViewModel(internal val paymentComponent: PaymentComponent?) : ViewModel() {
 
     private val _paymentProviderApp = MutableStateFlow<PaymentProviderApp?>(null)
     val paymentProviderApp: StateFlow<PaymentProviderApp?> = _paymentProviderApp
diff --git a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/openWith/OpenWithBottomSheet.kt b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/openWith/OpenWithBottomSheet.kt
index 4478a2051b..f0df3f1df0 100644
--- a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/openWith/OpenWithBottomSheet.kt
+++ b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/openWith/OpenWithBottomSheet.kt
@@ -19,11 +19,15 @@ import android.widget.Toast
 import androidx.core.content.ContextCompat
 import androidx.core.text.buildSpannedString
 import androidx.fragment.app.viewModels
+import net.gini.android.health.sdk.GiniHealth
 import net.gini.android.health.sdk.R
 import net.gini.android.health.sdk.databinding.GhsBottomSheetOpenWithBinding
+import net.gini.android.health.sdk.paymentcomponent.PaymentComponent
 import net.gini.android.health.sdk.paymentprovider.PaymentProviderApp
 import net.gini.android.health.sdk.util.GhsBottomSheetDialogFragment
 import net.gini.android.health.sdk.util.autoCleared
+import net.gini.android.health.sdk.util.getLayoutInflaterWithGiniHealthThemeAndLocale
+import net.gini.android.health.sdk.util.getLocaleStringResource
 import net.gini.android.health.sdk.util.setBackgroundTint
 
 /**
@@ -32,13 +36,18 @@ import net.gini.android.health.sdk.util.setBackgroundTint
 internal interface OpenWithForwardListener {
     fun onForwardSelected()
 }
-internal class OpenWithBottomSheet private constructor(paymentProviderApp: PaymentProviderApp?, private val listener: OpenWithForwardListener?) : GhsBottomSheetDialogFragment() {
+internal class OpenWithBottomSheet private constructor(paymentProviderApp: PaymentProviderApp?, private val listener: OpenWithForwardListener?, private val paymentComponent: PaymentComponent?) : GhsBottomSheetDialogFragment() {
 
-    constructor(): this(null, null)
+    constructor(): this(null, null, null)
 
     private val viewModel by viewModels<OpenWithViewModel> { OpenWithViewModel.Factory(paymentProviderApp) }
     private var binding: GhsBottomSheetOpenWithBinding by autoCleared()
 
+    override fun onGetLayoutInflater(savedInstanceState: Bundle?): LayoutInflater {
+        val inflater = super.onGetLayoutInflater(savedInstanceState)
+        return this.getLayoutInflaterWithGiniHealthThemeAndLocale(inflater, GiniHealth.getSDKLanguage(requireContext())?.languageLocale())
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -57,12 +66,12 @@ internal class OpenWithBottomSheet private constructor(paymentProviderApp: Payme
                 setTextColor(paymentProviderApp.colors.textColor)
             }
             binding.ghsAppLayout.ghsAppName.text = paymentProviderApp.name
-            binding.ghsOpenWithTitle.text = String.format(getString(R.string.ghs_open_with_title), paymentProviderApp.name)
-            binding.ghsOpenWithDetails.text = String.format(getString(R.string.ghs_open_with_details), paymentProviderApp.name)
-            binding.ghsOpenWithInfo.text = createSpannableString(String.format(getString(R.string.ghs_open_with_info), paymentProviderApp.name, paymentProviderApp.name), paymentProviderApp.paymentProvider.playStoreUrl)
+            binding.ghsOpenWithTitle.text = String.format(getLocaleStringResource(R.string.ghs_open_with_title), paymentProviderApp.name)
+            binding.ghsOpenWithDetails.text = String.format(getLocaleStringResource(R.string.ghs_open_with_details), paymentProviderApp.name)
+            binding.ghsOpenWithInfo.text = createSpannableString(String.format(getLocaleStringResource(R.string.ghs_open_with_info), paymentProviderApp.name, paymentProviderApp.name), paymentProviderApp.paymentProvider.playStoreUrl)
             binding.ghsOpenWithInfo.movementMethod = LinkMovementMethod.getInstance()
         }
-        binding.ghsMoreLayout.ghsAppName.text = getString(R.string.ghs_open_with_more)
+        binding.ghsMoreLayout.ghsAppName.text = getLocaleStringResource(R.string.ghs_open_with_more)
         with(binding.ghsMoreLayout.ghsAppIcon) {
             setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ghs_more_icon))
             elevation = 0f
@@ -72,7 +81,7 @@ internal class OpenWithBottomSheet private constructor(paymentProviderApp: Payme
     }
 
     private fun createSpannableString(text: String, playStoreUrl: String?): SpannedString {
-        val linkSpan = SpannableString(getString(R.string.ghs_open_with_download_app))
+        val linkSpan = SpannableString(getLocaleStringResource(R.string.ghs_open_with_download_app))
         val playStoreLauncher = object: ClickableSpan() {
             override fun onClick(p0: View) {
                 playStoreUrl?.let {
@@ -98,6 +107,10 @@ internal class OpenWithBottomSheet private constructor(paymentProviderApp: Payme
         }
     }
 
+    private fun getLocaleStringResource(resourceId: Int): String {
+        return getLocaleStringResource(resourceId, paymentComponent?.giniHealth)
+    }
+
     companion object {
         /**
          * Create a new instance of the [OpenWithBottomSheet].
@@ -105,6 +118,6 @@ internal class OpenWithBottomSheet private constructor(paymentProviderApp: Payme
          * @param paymentProviderApp the [PaymentProviderApp] which the user needs ti identify in the 'Share PDF' screen
          * @param listener the [OpenWithForwardListener] which will forward requests
          */
-        fun newInstance(paymentProviderApp: PaymentProviderApp, listener: OpenWithForwardListener) = OpenWithBottomSheet(paymentProviderApp = paymentProviderApp, listener = listener)
+        fun newInstance(paymentProviderApp: PaymentProviderApp, paymentComponent: PaymentComponent?, listener: OpenWithForwardListener) = OpenWithBottomSheet(paymentProviderApp = paymentProviderApp, listener = listener, paymentComponent)
     }
 }
\ No newline at end of file
diff --git a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/openWith/OpenWithViewModel.kt b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/openWith/OpenWithViewModel.kt
index 4070e36538..b3b45cf7a0 100644
--- a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/openWith/OpenWithViewModel.kt
+++ b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/openWith/OpenWithViewModel.kt
@@ -1,10 +1,13 @@
 package net.gini.android.health.sdk.review.openWith
 
+import android.content.Context
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import net.gini.android.health.sdk.paymentprovider.PaymentProviderApp
 
 internal class OpenWithViewModel private constructor(val paymentProviderApp: PaymentProviderApp?): ViewModel() {
+    private  val context: Context? = null
+
     class Factory(private val paymentProviderApp: PaymentProviderApp?) : ViewModelProvider.Factory {
         @Suppress("UNCHECKED_CAST")
         override fun <T : ViewModel> create(modelClass: Class<T>): T {
@@ -12,4 +15,5 @@ internal class OpenWithViewModel private constructor(val paymentProviderApp: Pay
         }
     }
 
+
 }
\ No newline at end of file
diff --git a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/util/CustomLocaleContextThemeWrapper.kt b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/util/CustomLocaleContextThemeWrapper.kt
new file mode 100644
index 0000000000..0b410ede08
--- /dev/null
+++ b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/util/CustomLocaleContextThemeWrapper.kt
@@ -0,0 +1,23 @@
+package net.gini.android.health.sdk.util
+
+import android.content.Context
+import android.content.ContextWrapper
+import android.os.Build
+import java.util.Locale
+
+class CustomLocaleContextWrapper(base: Context) : ContextWrapper(base) {
+    companion object {
+        fun wrap(context: Context, locale: Locale): ContextWrapper {
+            val config = context.resources.configuration
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                config.setLocale(locale)
+            } else {
+                config.locale = locale
+            }
+            config.setLayoutDirection(locale)
+
+            return CustomLocaleContextWrapper(context.createConfigurationContext(config))
+        }
+    }
+}
diff --git a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/util/Extensions.kt b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/util/Extensions.kt
index 5995d677ed..9481080dee 100644
--- a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/util/Extensions.kt
+++ b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/util/Extensions.kt
@@ -2,6 +2,7 @@ package net.gini.android.health.sdk.util
 
 import android.content.Context
 import android.content.res.ColorStateList
+import android.content.res.Configuration
 import android.text.Editable
 import android.text.TextWatcher
 import android.view.LayoutInflater
@@ -15,15 +16,19 @@ import androidx.appcompat.view.ContextThemeWrapper
 import androidx.core.content.ContextCompat.getSystemService
 import androidx.core.graphics.ColorUtils
 import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
+import net.gini.android.health.sdk.GiniHealth
 import net.gini.android.health.sdk.R
+import net.gini.android.health.sdk.paymentcomponent.PaymentComponent
 import java.math.BigDecimal
 import java.text.DecimalFormat
 import java.text.DecimalFormatSymbols
 import java.text.NumberFormat
+import java.util.Locale
 
 internal fun TextInputEditText.setTextIfDifferent(text: String) {
     if (this.text.toString() != text) {
@@ -177,13 +182,29 @@ internal suspend fun <T> Flow<T>.withPrev() = flow {
     }
 }
 
-internal fun View.getLayoutInflaterWithGiniHealthTheme(): LayoutInflater =
-    LayoutInflater.from(context.wrappedWithGiniHealthTheme())
+internal fun View.getLayoutInflaterWithGiniHealthThemeAndLocale(locale: Locale? = null): LayoutInflater =
+        LayoutInflater.from(context.wrappedWithGiniHealthThemeAndLocale(locale))
 
-internal fun Context.wrappedWithGiniHealthTheme(): Context = ContextThemeWrapper(this, R.style.GiniHealthTheme)
+private fun Context.wrappedWithCustomLocale(locale: Locale): Context = CustomLocaleContextWrapper.wrap(this, locale)
+private fun Context.wrappedWithGiniHealthTheme(): Context = ContextThemeWrapper(this, R.style.GiniHealthTheme)
 
-internal fun Fragment.getLayoutInflaterWithGiniHealthTheme(inflater: LayoutInflater): LayoutInflater {
-    return inflater.cloneInContext(requireContext().wrappedWithGiniHealthTheme())
+internal fun Context.wrappedWithGiniHealthThemeAndLocale(locale: Locale? = null): Context =
+    if (locale == null || locale.language.isEmpty()) {
+        this.wrappedWithGiniHealthTheme()
+    } else {
+        this.wrappedWithCustomLocale(locale).wrappedWithGiniHealthTheme()
+    }
+
+internal fun Fragment.getLayoutInflaterWithGiniHealthThemeAndLocale(inflater: LayoutInflater, locale: Locale? = null): LayoutInflater {
+    return inflater.cloneInContext(requireContext().wrappedWithGiniHealthThemeAndLocale(locale))
+}
+
+internal fun Fragment.getLocaleStringResource(resourceId: Int, giniHealth: GiniHealth?): String {
+    if (giniHealth?.localizedContext == null) {
+        giniHealth?.localizedContext = context?.createConfigurationContext(resources.configuration)
+    }
+
+    return giniHealth?.localizedContext?.getText(resourceId).toString()
 }
 
 internal fun View.setIntervalClickListener(click: View.OnClickListener?) {
diff --git a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/util/GhsBottomSheetDialogFragment.kt b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/util/GhsBottomSheetDialogFragment.kt
index bc3718092d..a087346bcb 100644
--- a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/util/GhsBottomSheetDialogFragment.kt
+++ b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/util/GhsBottomSheetDialogFragment.kt
@@ -14,11 +14,11 @@ import net.gini.android.health.sdk.R
 open class GhsBottomSheetDialogFragment : BottomSheetDialogFragment() {
     override fun onGetLayoutInflater(savedInstanceState: Bundle?): LayoutInflater {
         val inflater = super.onGetLayoutInflater(savedInstanceState)
-        return this.getLayoutInflaterWithGiniHealthTheme(inflater)
+        return this.getLayoutInflaterWithGiniHealthThemeAndLocale(inflater)
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val wrappedContext = requireContext().wrappedWithGiniHealthTheme()
+        val wrappedContext = requireContext().wrappedWithGiniHealthThemeAndLocale()
         val dialog = BottomSheetDialog(wrappedContext, theme)
 
         val colorDrawable = ColorDrawable(ContextCompat.getColor(wrappedContext, R.color.ghs_bottom_sheet_scrim))
diff --git a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/util/GiniHealthAPI.kt b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/util/GiniHealthAPI.kt
index b57b94d086..ce3d98940f 100644
--- a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/util/GiniHealthAPI.kt
+++ b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/util/GiniHealthAPI.kt
@@ -8,18 +8,19 @@ import net.gini.android.health.api.GiniHealthAPIBuilder
 /**
  * Minimal configuration for Gini API
  */
-fun getGiniApi(context: Context, clientId: String, clientSecret: String, emailDomain: String): GiniHealthAPI {
+fun getGiniApi(context: Context, clientId: String, clientSecret: String, emailDomain: String, apiVersion: Int = GiniHealthAPIBuilder.API_VERSION): GiniHealthAPI {
     return GiniHealthAPIBuilder(
         context,
         clientId,
         clientSecret,
-        emailDomain
+        emailDomain,
+        apiVersion = apiVersion
     ).build()
 }
 
 /**
  * Minimal configuration for Gini API
  */
-fun getGiniApi(context: Context, sessionManager: SessionManager): GiniHealthAPI {
-    return GiniHealthAPIBuilder(context, sessionManager = sessionManager).build()
-}
\ No newline at end of file
+fun getGiniApi(context: Context, sessionManager: SessionManager, apiVersion: Int = GiniHealthAPIBuilder.API_VERSION): GiniHealthAPI {
+    return GiniHealthAPIBuilder(context, sessionManager = sessionManager, apiVersion = apiVersion).build()
+}
diff --git a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/util/GiniLocalization.kt b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/util/GiniLocalization.kt
new file mode 100644
index 0000000000..1157aec1cc
--- /dev/null
+++ b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/util/GiniLocalization.kt
@@ -0,0 +1,15 @@
+package net.gini.android.health.sdk.util
+
+import java.util.Locale
+
+enum class GiniLocalization(val readableName: String) {
+    GERMAN("German"),
+    ENGLISH("English");
+
+    fun languageLocale(): Locale {
+        return when (this) {
+            GERMAN -> Locale("de")
+            else -> Locale("en")
+        }
+    }
+}
\ No newline at end of file
diff --git a/health-sdk/sdk/src/main/res/drawable-hdpi/ghs_payment_review_close_button.webp b/health-sdk/sdk/src/main/res/drawable-hdpi/ghs_payment_review_close_button.webp
new file mode 100644
index 0000000000..cab81c3d04
Binary files /dev/null and b/health-sdk/sdk/src/main/res/drawable-hdpi/ghs_payment_review_close_button.webp differ
diff --git a/health-sdk/sdk/src/main/res/drawable-mdpi/ghs_payment_review_close_button.webp b/health-sdk/sdk/src/main/res/drawable-mdpi/ghs_payment_review_close_button.webp
new file mode 100644
index 0000000000..8117470bb5
Binary files /dev/null and b/health-sdk/sdk/src/main/res/drawable-mdpi/ghs_payment_review_close_button.webp differ
diff --git a/health-sdk/sdk/src/main/res/drawable-xhdpi/ghs_payment_review_close_button.webp b/health-sdk/sdk/src/main/res/drawable-xhdpi/ghs_payment_review_close_button.webp
new file mode 100644
index 0000000000..c6ea21080e
Binary files /dev/null and b/health-sdk/sdk/src/main/res/drawable-xhdpi/ghs_payment_review_close_button.webp differ
diff --git a/health-sdk/sdk/src/main/res/drawable-xxhdpi/ghs_payment_review_close_button.webp b/health-sdk/sdk/src/main/res/drawable-xxhdpi/ghs_payment_review_close_button.webp
new file mode 100644
index 0000000000..a60c22043d
Binary files /dev/null and b/health-sdk/sdk/src/main/res/drawable-xxhdpi/ghs_payment_review_close_button.webp differ
diff --git a/health-sdk/sdk/src/main/res/drawable-xxxhdpi/ghs_payment_review_close_button.webp b/health-sdk/sdk/src/main/res/drawable-xxxhdpi/ghs_payment_review_close_button.webp
new file mode 100644
index 0000000000..4cba579b3e
Binary files /dev/null and b/health-sdk/sdk/src/main/res/drawable-xxxhdpi/ghs_payment_review_close_button.webp differ
diff --git a/health-sdk/sdk/src/main/res/layout/ghs_powered_by_gini.xml b/health-sdk/sdk/src/main/res/layout/ghs_powered_by_gini.xml
index a314a1b3ab..3ac2d513dc 100644
--- a/health-sdk/sdk/src/main/res/layout/ghs_powered_by_gini.xml
+++ b/health-sdk/sdk/src/main/res/layout/ghs_powered_by_gini.xml
@@ -23,5 +23,5 @@
         app:layout_constraintBottom_toBottomOf="@id/ghs_powered_by_gini_label"
         app:layout_constraintStart_toEndOf="@id/ghs_powered_by_gini_label"
         app:layout_constraintTop_toTopOf="@id/ghs_powered_by_gini_label"
-        app:srcCompat="@drawable/ghs_gini_logo" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        android:src="@drawable/ghs_gini_logo" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/health-sdk/sdk/src/main/res/layout/ghs_view_payment_component.xml b/health-sdk/sdk/src/main/res/layout/ghs_view_payment_component.xml
index f1b3e417a6..d6c702f999 100644
--- a/health-sdk/sdk/src/main/res/layout/ghs_view_payment_component.xml
+++ b/health-sdk/sdk/src/main/res/layout/ghs_view_payment_component.xml
@@ -57,7 +57,6 @@
             android:layout_marginHorizontal="@dimen/ghs_large"
             android:clickable="false"
             android:gravity="start|center_vertical"
-            android:paddingHorizontal="@dimen/ghs_large"
             android:contentDescription="@string/ghs_select_bank_content_description"
             app:layout_constraintHorizontal_chainStyle="spread_inside"
             app:layout_constraintHorizontal_weight="1"
@@ -86,34 +85,44 @@
             />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <FrameLayout
-        android:id="@+id/ghs_powered_by_gini"
-        android:layout_width="wrap_content"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_height="wrap_content"
+        android:layout_width="match_parent"
         android:layout_marginTop="@dimen/ghs_small"
-        android:layout_marginBottom="@dimen/ghs_medium"
         android:layout_marginEnd="@dimen/ghs_large"
+        android:layout_marginBottom="@dimen/ghs_medium"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/ghs_select_bank_picker">
-        <include layout="@layout/ghs_powered_by_gini"/>
-    </FrameLayout>
 
-    <TextView
-        android:id="@+id/ghs_more_information"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/ghs_powered_by_gini"
-        app:layout_constraintBottom_toBottomOf="@id/ghs_powered_by_gini"
-        style="@style/GiniHealthTheme.Typography.Caption2"
-        android:layout_marginStart="@dimen/ghs_large"
-        android:drawableStart="@drawable/ghs_info_circle_icon"
-        android:drawablePadding="@dimen/ghs_medium"
-        android:drawableTint="@color/ghs_info_button_tint"
-        android:text="@string/ghs_more_information_underlined_part"
-        android:textColor="@color/ghs_payment_component_caption"
-        android:gravity="center_vertical"
-        android:visibility="gone"
-        />
-</merge>
\ No newline at end of file
+        <FrameLayout
+            android:id="@+id/ghs_powered_by_gini"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/ghs_small"
+            android:layout_marginEnd="@dimen/ghs_large"
+            android:visibility="invisible"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent">
+            <include layout="@layout/ghs_powered_by_gini"/>
+        </FrameLayout>
+
+        <TextView
+            android:id="@+id/ghs_more_information"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            style="@style/GiniHealthTheme.Typography.Caption2"
+            android:layout_marginStart="@dimen/ghs_large"
+            android:drawableStart="@drawable/ghs_info_circle_icon"
+            android:drawablePadding="@dimen/ghs_medium"
+            android:drawableTint="@color/ghs_info_button_tint"
+            android:text="@string/ghs_more_information_underlined_part"
+            android:textColor="@color/ghs_payment_component_caption"
+            android:gravity="center_vertical"
+            android:visibility="gone"
+            />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</merge>
diff --git a/health-sdk/sdk/src/main/res/values/styles.xml b/health-sdk/sdk/src/main/res/values/styles.xml
index cc0df00762..3ed4c5c507 100644
--- a/health-sdk/sdk/src/main/res/values/styles.xml
+++ b/health-sdk/sdk/src/main/res/values/styles.xml
@@ -18,6 +18,7 @@
         <item name="colorSurfaceVariant">@color/ghs_light_01</item>
         <item name="colorOnSurfaceVariant">?attr/colorOnBackground</item>
         <item name="android:windowLightStatusBar">true</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="colorAccent">?attr/colorPrimary</item>
         <item name="alertDialogTheme">@style/GiniHealthTheme.ThemeOverlay.Dialog.Alert</item>
         <item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Surface</item>
@@ -230,7 +231,10 @@
     <style name="Root.GiniHealthTheme.Widget.Button.PaymentProviderSelector" parent="GiniHealthTheme.Widget.Button.TransparentBackground">
         <item name="android:textAppearance">@style/GiniHealthTheme.Typography.Input</item>
     </style>
-    <style name="GiniHealthTheme.Widget.Button.PaymentProviderSelector" parent="Root.GiniHealthTheme.Widget.Button.PaymentProviderSelector"/>
+    <style name="GiniHealthTheme.Widget.Button.PaymentProviderSelector" parent="Root.GiniHealthTheme.Widget.Button.PaymentProviderSelector">
+        <item name="android:paddingStart">@dimen/ghs_large</item>
+        <item name="android:paddingEnd">@dimen/ghs_large</item>
+    </style>
     
     <style name="Root.GiniHealthTheme.Widget.Button.PaymentProviderPicker" parent="GiniHealthTheme.Widget.Button.TransparentBackground">
         <item name="android:textAppearance">@style/GiniHealthTheme.Typography.Body1</item>
diff --git a/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/bankselectionbottomsheet/BankSelectionBottomSheetTest.kt b/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/bankselectionbottomsheet/BankSelectionBottomSheetTest.kt
index 09f228d91a..9a25062257 100644
--- a/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/bankselectionbottomsheet/BankSelectionBottomSheetTest.kt
+++ b/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/bankselectionbottomsheet/BankSelectionBottomSheetTest.kt
@@ -1,8 +1,12 @@
 package net.gini.android.health.sdk.bankselectionbottomsheet
 
+import android.content.Context
 import androidx.fragment.app.testing.launchFragmentInContainer
 import androidx.recyclerview.widget.RecyclerView
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth
@@ -10,7 +14,11 @@ import io.mockk.every
 import io.mockk.mockk
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.test.runTest
+import net.gini.android.health.api.GiniHealthAPI
+import net.gini.android.health.api.HealthApiDocumentManager
 import net.gini.android.health.api.models.PaymentProvider
+import net.gini.android.health.sdk.GiniHealth
 import net.gini.android.health.sdk.R
 import net.gini.android.health.sdk.bankselection.BankSelectionBottomSheet
 import net.gini.android.health.sdk.paymentcomponent.PaymentComponent
@@ -18,6 +26,7 @@ import net.gini.android.health.sdk.paymentcomponent.PaymentProviderAppsState
 import net.gini.android.health.sdk.paymentcomponent.SelectedPaymentProviderAppState
 import net.gini.android.health.sdk.paymentprovider.PaymentProviderApp
 import net.gini.android.health.sdk.paymentprovider.PaymentProviderAppColors
+import net.gini.android.health.sdk.util.GiniLocalization
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
@@ -27,7 +36,11 @@ import org.junit.runner.RunWith
 @ExperimentalCoroutinesApi
 @RunWith(AndroidJUnit4::class)
 class BankSelectionBottomSheetTest {
-
+    private var context: Context? = null
+    private var paymentComponentWithLocale: PaymentComponent? = null
+    private lateinit var giniHealth: GiniHealth
+    private val giniHealthAPI: GiniHealthAPI = mockk(relaxed = true) { GiniHealthAPI::class.java }
+    private val documentManager: HealthApiDocumentManager = mockk { HealthApiDocumentManager::class.java }
     private var paymentComponent: PaymentComponent? = null
     private var paymentProvider1 = PaymentProviderApp(
         name = "payment provider",
@@ -79,12 +92,17 @@ class BankSelectionBottomSheetTest {
 
     @Before
     fun setup() {
+        context = ApplicationProvider.getApplicationContext()
+        every { giniHealthAPI.documentManager } returns documentManager
         paymentComponent = mockk(relaxed = true)
+        giniHealth = GiniHealth(giniHealthAPI)
     }
 
     @After
     fun tearDown() {
         paymentComponent = null
+        paymentComponentWithLocale = null
+        context = null
     }
 
     @Test
@@ -106,4 +124,42 @@ class BankSelectionBottomSheetTest {
         // Then
         onView(withId(R.id.ghs_payment_provider_apps_list)).check { view, _ -> Truth.assertThat((view as RecyclerView).adapter!!.itemCount).isEqualTo(3) }
     }
+
+    @Test
+    fun `shows text values in english if that is set to GiniHealth`() = runTest {
+        // Given
+        giniHealth.setSDKLanguage(GiniLocalization.ENGLISH, context!!)
+        paymentComponentWithLocale = PaymentComponent(context!!, giniHealth)
+
+        // When
+        launchFragmentInContainer {
+            BankSelectionBottomSheet.newInstance(paymentComponentWithLocale!!)
+        }
+
+        // Then
+        onView(withId(R.id.ghs_title_label)).check(ViewAssertions.matches(ViewMatchers.withText("Your Bank")))
+        onView(withId(R.id.ghs_subtitle_label)).check(ViewAssertions.matches(ViewMatchers.withText
+            ("You can only pay the bill if you have an account with one of the banks listed below.")
+        ))
+        onView(withId(R.id.ghs_more_information_label)).check(ViewAssertions.matches(ViewMatchers.withText("More information.")))
+    }
+
+    @Test
+    fun `shows text values in german if that is set to GiniHealth`() = runTest {
+        // Given
+        giniHealth.setSDKLanguage(GiniLocalization.GERMAN, context!!)
+        paymentComponentWithLocale = PaymentComponent(context!!, giniHealth)
+
+        // When
+        launchFragmentInContainer {
+            BankSelectionBottomSheet.newInstance(paymentComponentWithLocale!!)
+        }
+
+        // Then
+        onView(withId(R.id.ghs_title_label)).check(ViewAssertions.matches(ViewMatchers.withText("Ihre Bank")))
+        onView(withId(R.id.ghs_subtitle_label)).check(ViewAssertions.matches(ViewMatchers.withText
+            ("Sie können die Rechnung nur bezahlen, wenn Sie ein Konto bei einer der unten aufgeführten Banken haben.")
+        ))
+        onView(withId(R.id.ghs_more_information_label)).check(ViewAssertions.matches(ViewMatchers.withText("Mehr Informationen.")))
+    }
 }
\ No newline at end of file
diff --git a/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/moreinformation/MoreInformationTest.kt b/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/moreinformation/MoreInformationTest.kt
index ba726a5391..732e10a134 100644
--- a/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/moreinformation/MoreInformationTest.kt
+++ b/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/moreinformation/MoreInformationTest.kt
@@ -1,9 +1,13 @@
 package net.gini.android.health.sdk.moreinformation
 
+import android.content.Context
 import android.widget.ExpandableListView
 import androidx.fragment.app.testing.launchFragmentInContainer
 import androidx.recyclerview.widget.RecyclerView
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
@@ -12,12 +16,17 @@ import io.mockk.mockk
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.test.runTest
+import net.gini.android.health.api.GiniHealthAPI
+import net.gini.android.health.api.HealthApiDocumentManager
 import net.gini.android.health.api.models.PaymentProvider
+import net.gini.android.health.sdk.GiniHealth
 import net.gini.android.health.sdk.R
 import net.gini.android.health.sdk.paymentcomponent.PaymentComponent
 import net.gini.android.health.sdk.paymentcomponent.PaymentProviderAppsState
 import net.gini.android.health.sdk.paymentprovider.PaymentProviderApp
 import net.gini.android.health.sdk.paymentprovider.PaymentProviderAppColors
+import net.gini.android.health.sdk.util.GiniLocalization
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -26,11 +35,21 @@ import org.junit.runner.RunWith
 @RunWith(AndroidJUnit4::class)
 class MoreInformationTest {
     private var paymentComponent: PaymentComponent? = null
+    private var context: Context? = null
+    private lateinit var paymentComponentWithLocale: PaymentComponent
+    private lateinit var giniHealth: GiniHealth
+    private val giniHealthAPI: GiniHealthAPI = mockk(relaxed = true) { GiniHealthAPI::class.java }
+    private val documentManager: HealthApiDocumentManager = mockk { HealthApiDocumentManager::class.java }
 
     @Before
     fun setup() {
+        context = ApplicationProvider.getApplicationContext()
+        every { giniHealthAPI.documentManager } returns documentManager
+        giniHealth = GiniHealth(giniHealthAPI)
         paymentComponent = mockk(relaxed = true)
         every { paymentComponent!!.paymentProviderAppsFlow } returns MutableStateFlow<PaymentProviderAppsState>(mockk()).asStateFlow()
+        every { paymentComponent!!.giniHealth.localizedContext } returns context
+        every { paymentComponent!!.giniHealthLanguage } returns null
     }
 
     @Test
@@ -108,4 +127,36 @@ class MoreInformationTest {
         // Then
         onView(withId(R.id.ghs_faq_list)).check { view, _ -> assertThat ((view as ExpandableListView).adapter!!.count).isEqualTo(fragment.faqList.size) }
     }
+
+    @Test
+    fun `shows text values in english if that is set to GiniHealth`() = runTest {
+        // Given
+        giniHealth.setSDKLanguage(GiniLocalization.ENGLISH, context!!)
+        paymentComponentWithLocale = PaymentComponent(context!!, giniHealth)
+
+        // When
+        launchFragmentInContainer {
+            MoreInformationFragment.newInstance(paymentComponentWithLocale!!)
+        }
+
+        // Then
+        onView(withId(R.id.ghs_more_information_title)).check(ViewAssertions.matches(ViewMatchers.withText("Pay bills easily with the banking app.")))
+        onView(withId(R.id.ghs_faq_title)).check(ViewAssertions.matches(ViewMatchers.withText("Frequently asked questions")))
+    }
+
+    @Test
+    fun `shows text values in german if that is set to GiniHealth`() = runTest {
+        // Given
+        giniHealth.setSDKLanguage(GiniLocalization.GERMAN, context!!)
+        paymentComponentWithLocale = PaymentComponent(context!!, giniHealth)
+
+        // When
+        launchFragmentInContainer {
+            MoreInformationFragment.newInstance(paymentComponentWithLocale)
+        }
+
+        // Then
+        onView(withId(R.id.ghs_more_information_title)).check(ViewAssertions.matches(ViewMatchers.withText("Rechnungen ganz einfach mit der Banking-App bezahlen.")))
+        onView(withId(R.id.ghs_faq_title)).check(ViewAssertions.matches(ViewMatchers.withText("Häufig gestellte Fragen")))
+    }
 }
\ No newline at end of file
diff --git a/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/paymentComponent/PaymentComponentTest.kt b/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/paymentComponent/PaymentComponentTest.kt
index 5966236dde..c51e1c6b73 100644
--- a/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/paymentComponent/PaymentComponentTest.kt
+++ b/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/paymentComponent/PaymentComponentTest.kt
@@ -1,6 +1,7 @@
 package net.gini.android.health.sdk.paymentComponent
 
 import android.content.Context
+import android.content.SharedPreferences
 import android.content.pm.PackageManager
 import android.content.res.Resources
 import androidx.test.core.app.ApplicationProvider.getApplicationContext
@@ -25,6 +26,7 @@ import net.gini.android.health.api.GiniHealthAPI
 import net.gini.android.health.api.HealthApiDocumentManager
 import net.gini.android.health.api.models.PaymentProvider
 import net.gini.android.health.sdk.GiniHealth
+import net.gini.android.health.sdk.GiniHealth.GiniHealthPreferences
 import net.gini.android.health.sdk.paymentcomponent.PaymentComponent
 import net.gini.android.health.sdk.paymentcomponent.PaymentComponentPreferences
 import net.gini.android.health.sdk.paymentcomponent.PaymentProviderAppsState
@@ -36,12 +38,15 @@ import net.gini.android.health.sdk.paymentprovider.getPaymentProviderApps
 import net.gini.android.health.sdk.review.ReviewConfiguration
 import net.gini.android.health.sdk.review.ReviewFragment
 import net.gini.android.health.sdk.test.ViewModelTestCoroutineRule
+import net.gini.android.health.sdk.util.GiniLocalization
 import net.gini.android.health.sdk.util.extensions.generateBitmapDrawableIcon
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import java.util.Locale
+
 
 @ExperimentalCoroutinesApi
 @RunWith(AndroidJUnit4::class)
@@ -236,10 +241,16 @@ class PaymentComponentTest {
         )
         val mockedContext = createMockedContextAndSetDependencies(paymentProviderList, paymentProviderAppList)
         mockkStatic(PackageManager::getInstalledPaymentProviderApps)
+
         every { mockedContext.packageManager.getInstalledPaymentProviderApps() } returns emptyList()
 
+        val preferences: SharedPreferences = mockk()
+        every { mockedContext.getSharedPreferences("GiniHealthPreferences", Context.MODE_PRIVATE) } returns preferences
+        every { preferences.getString("SDK_LANGUAGE_PREFS_KEY", null) } returns null
+
         //When
         val paymentComponent = PaymentComponent(mockedContext, giniHealth!!)
+
         paymentComponent.loadPaymentProviderApps()
 
         // Then
@@ -285,6 +296,9 @@ class PaymentComponentTest {
             buildPaymentProviderApp(paymentProvider2, false),
         )
         val mockedContext = createMockedContextAndSetDependencies(paymentProviderList, paymentProviderAppList)
+        val preferences: SharedPreferences = mockk()
+        every { mockedContext.getSharedPreferences("GiniHealthPreferences", Context.MODE_PRIVATE) } returns preferences
+        every { preferences.getString("SDK_LANGUAGE_PREFS_KEY", null) } returns null
 
         //When
         val paymentComponent = PaymentComponent(mockedContext, giniHealth!!)
@@ -492,6 +506,9 @@ class PaymentComponentTest {
             buildPaymentProviderApp(paymentProvider2, false),
         )
         val mockedContext = createMockedContextAndSetDependencies(paymentProviderList, paymentProviderAppList)
+        val preferences: SharedPreferences = mockk()
+        every { mockedContext.getSharedPreferences("GiniHealthPreferences", Context.MODE_PRIVATE) } returns preferences
+        every { preferences.getString("SDK_LANGUAGE_PREFS_KEY", null) } returns null
 
         val paymentComponent = PaymentComponent(mockedContext, giniHealth!!)
         paymentComponent.loadPaymentProviderApps()
diff --git a/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/paymentComponent/PaymentComponentViewTest.kt b/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/paymentComponent/PaymentComponentViewTest.kt
index 72244f77ff..eff5932810 100644
--- a/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/paymentComponent/PaymentComponentViewTest.kt
+++ b/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/paymentComponent/PaymentComponentViewTest.kt
@@ -10,15 +10,22 @@ import androidx.core.view.isVisible
 import androidx.lifecycle.Lifecycle
 import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
+import com.google.android.material.button.MaterialButton
 import com.google.common.truth.Truth
+import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify
 import kotlinx.coroutines.test.runTest
+import net.gini.android.health.api.GiniHealthAPI
+import net.gini.android.health.api.HealthApiDocumentManager
+import net.gini.android.health.sdk.GiniHealth
 import net.gini.android.health.sdk.R
 import net.gini.android.health.sdk.paymentcomponent.PaymentComponent
 import net.gini.android.health.sdk.paymentcomponent.PaymentComponentConfiguration
 import net.gini.android.health.sdk.paymentcomponent.PaymentComponentView
+import net.gini.android.health.sdk.util.GiniLocalization
 import org.junit.After
+import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -31,14 +38,22 @@ class PaymentComponentViewTest {
     private var scenario: ActivityScenario<Activity>? = null
     private lateinit var paymentComponent: PaymentComponent
     private lateinit var paymentComponentBrandedOff: PaymentComponent
+    private lateinit var paymentComponentWithLocale: PaymentComponent
     private lateinit var paymentComponentListener: PaymentComponent.Listener
+    private lateinit var giniHealth: GiniHealth
+    private val giniHealthAPI: GiniHealthAPI = mockk(relaxed = true) { GiniHealthAPI::class.java }
+    private val documentManager: HealthApiDocumentManager = mockk { HealthApiDocumentManager::class.java }
 
     @Before
     fun setUp() {
+        every { giniHealthAPI.documentManager } returns documentManager
         context = ApplicationProvider.getApplicationContext()
         context!!.setTheme(R.style.GiniHealthTheme)
+        giniHealth = GiniHealth(giniHealthAPI)
+
         paymentComponent = PaymentComponent(context!!, mockk())
         paymentComponentBrandedOff = PaymentComponent(context!!, mockk(), PaymentComponentConfiguration(isPaymentComponentBranded = false))
+        paymentComponentWithLocale = PaymentComponent(context!!, giniHealth)
         paymentComponentListener = mockk(relaxed = true)
         paymentComponent.listener = paymentComponentListener
 
@@ -71,7 +86,6 @@ class PaymentComponentViewTest {
             }
         }
     }
-
     @Test
     fun `calls onBankPickerClicked method of listener when clicking on select bank button`() = runTest {
         // Given
@@ -161,4 +175,38 @@ class PaymentComponentViewTest {
             Truth.assertThat((paymentComponentView.findViewById<FrameLayout>(R.id.ghs_powered_by_gini)!!).isVisible).isEqualTo(false)
         }
     }
+
+    @Test
+    fun `shows text values in english if that is set to GiniHealth`() = runTest {
+        // Given
+        giniHealth.setSDKLanguage(GiniLocalization.ENGLISH, context!!)
+
+        scenario?.onActivity { activity ->
+            val paymentComponentView = PaymentComponentView(activity, null)
+            paymentComponentView.paymentComponent = paymentComponentWithLocale
+            paymentComponentView.isPayable = true
+            paymentComponentView.prepareForReuse()
+
+            // Then
+            assertEquals("English text", "More information.", paymentComponentView.findViewById<TextView>(R.id.ghs_more_information)!!.text.toString())
+            assertEquals("English text", "Pay the invoice", paymentComponentView.findViewById<MaterialButton>(R.id.ghs_pay_invoice_button)!!.text.toString())
+        }
+    }
+
+    @Test
+    fun `shows text values in german if that is set to GiniHealth`() = runTest {
+        // Given
+        giniHealth.setSDKLanguage(GiniLocalization.GERMAN, context!!)
+
+        scenario?.onActivity { activity ->
+            val paymentComponentView = PaymentComponentView(activity, null)
+            paymentComponentView.prepareForReuse()
+            paymentComponentView.paymentComponent = paymentComponentWithLocale
+            paymentComponentView.isPayable = true
+
+            // Then
+            assertEquals("German text", "Mehr Informationen.", paymentComponentView.findViewById<TextView>(R.id.ghs_more_information)!!.text.toString())
+            assertEquals("German text", "Rechnung bezahlen", paymentComponentView.findViewById<MaterialButton>(R.id.ghs_pay_invoice_button)!!.text.toString())
+        }
+    }
 }
diff --git a/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/review/ReviewFragmentTest.kt b/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/review/ReviewFragmentTest.kt
index 2bc7f2c67d..e7eba15262 100644
--- a/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/review/ReviewFragmentTest.kt
+++ b/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/review/ReviewFragmentTest.kt
@@ -25,7 +25,6 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.test.advanceTimeBy
 import kotlinx.coroutines.test.runTest
 import net.gini.android.health.api.models.PaymentProvider
 import net.gini.android.health.sdk.GiniHealth
@@ -161,6 +160,8 @@ class ReviewFragmentTest {
 
         val paymentComponent = mockk<PaymentComponent>()
         every { paymentComponent.recheckWhichPaymentProviderAppsAreInstalled() } returns Unit
+        every { paymentComponent.giniHealth.localizedContext } returns ApplicationProvider.getApplicationContext()
+        every { paymentComponent.giniHealthLanguage } returns null
 
         viewModel = mockk(relaxed = true)
         configureMockViewModel(viewModel)
@@ -205,6 +206,8 @@ class ReviewFragmentTest {
         every { paymentComponent.selectedPaymentProviderAppFlow } returns MutableStateFlow(
             SelectedPaymentProviderAppState.AppSelected(paymentProviderApp)
         )
+        every { paymentComponent.giniHealth.localizedContext } returns ApplicationProvider.getApplicationContext()
+        every { paymentComponent.giniHealthLanguage } returns null
 
         viewModel = mockk(relaxed = true)
         configureMockViewModel(viewModel)
@@ -212,6 +215,7 @@ class ReviewFragmentTest {
         every { viewModel.isPaymentButtonEnabled } returns flowOf(true)
         every { viewModel.paymentProviderApp } returns MutableStateFlow(paymentProviderApp)
         every { viewModel.paymentNextStep } returns paymentNextStepSharedFlow
+        every { viewModel.validatePaymentDetails() } returns true
 
         val listener = mockk<ReviewFragmentListener>(relaxed = true)
 
@@ -249,6 +253,8 @@ class ReviewFragmentTest {
         every { paymentComponent.selectedPaymentProviderAppFlow } returns MutableStateFlow(
             SelectedPaymentProviderAppState.AppSelected(paymentProviderApp)
         )
+        every { paymentComponent.giniHealth.localizedContext } returns ApplicationProvider.getApplicationContext()
+        every { paymentComponent.giniHealthLanguage } returns null
 
         viewModel = mockk(relaxed = true)
         configureMockViewModel(viewModel)
@@ -256,6 +262,7 @@ class ReviewFragmentTest {
         every { viewModel.paymentProviderApp } returns MutableStateFlow(paymentProviderApp)
         every { viewModel.isPaymentButtonEnabled } returns flowOf(true)
         every { viewModel.paymentNextStep } returns paymentNextStepSharedFlow
+        every { viewModel.validatePaymentDetails() } returns true
 
         launchFragmentInContainer(themeResId = R.style.GiniHealthTheme) {
             ReviewFragment.newInstance(
@@ -290,6 +297,8 @@ class ReviewFragmentTest {
 
         val paymentComponent = mockk<PaymentComponent>()
         every { paymentComponent.recheckWhichPaymentProviderAppsAreInstalled() } returns Unit
+        every { paymentComponent.giniHealth.localizedContext } returns ApplicationProvider.getApplicationContext()
+        every { paymentComponent.giniHealthLanguage } returns null
 
         viewModel = mockk(relaxed = true)
         configureMockViewModel(viewModel)
diff --git a/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/review/installApp/InstallAppBottomSheetTest.kt b/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/review/installApp/InstallAppBottomSheetTest.kt
index 2e433bb586..108fe0466c 100644
--- a/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/review/installApp/InstallAppBottomSheetTest.kt
+++ b/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/review/installApp/InstallAppBottomSheetTest.kt
@@ -1,9 +1,13 @@
 package net.gini.android.health.sdk.review.installApp
 
+import android.content.Context
 import android.view.View
 import androidx.fragment.app.testing.launchFragmentInContainer
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth
@@ -12,10 +16,15 @@ import io.mockk.mockk
 import io.mockk.verify
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.test.runTest
+import net.gini.android.health.api.GiniHealthAPI
+import net.gini.android.health.api.HealthApiDocumentManager
+import net.gini.android.health.sdk.GiniHealth
 import net.gini.android.health.sdk.R
 import net.gini.android.health.sdk.paymentcomponent.PaymentComponent
 import net.gini.android.health.sdk.paymentcomponent.SelectedPaymentProviderAppState
 import net.gini.android.health.sdk.paymentprovider.PaymentProviderApp
+import net.gini.android.health.sdk.review.openWith.OpenWithBottomSheet
+import net.gini.android.health.sdk.util.GiniLocalization
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -25,6 +34,9 @@ class InstallAppBottomSheetTest {
 
     private lateinit var paymentProviderApp: PaymentProviderApp
     private lateinit var paymentComponent: PaymentComponent
+    private var paymentComponentWithLocale: PaymentComponent? = null
+    private lateinit var giniHealth: GiniHealth
+    private val giniHealthAPI: GiniHealthAPI = mockk(relaxed = true) { GiniHealthAPI::class.java }
 
     @Before
     fun setup() {
@@ -34,6 +46,7 @@ class InstallAppBottomSheetTest {
 
         paymentComponent = mockk<PaymentComponent>()
         every { paymentComponent.recheckWhichPaymentProviderAppsAreInstalled() } returns Unit
+        every { paymentComponent.giniHealth.localizedContext } returns ApplicationProvider.getApplicationContext()
     }
 
     @Test
@@ -106,4 +119,58 @@ class InstallAppBottomSheetTest {
         // Then
         verify(exactly = 1) { listener.onForwardToBankSelected() }
     }
+
+    @Test
+    fun `shows text values in english if that is set to GiniHealth`() = runTest {
+        // Given
+        val context: Context = ApplicationProvider.getApplicationContext()
+        val documentManager: HealthApiDocumentManager = mockk { HealthApiDocumentManager::class.java }
+        every { giniHealthAPI.documentManager } returns documentManager
+        giniHealth = GiniHealth(giniHealthAPI)
+        giniHealth.setSDKLanguage(GiniLocalization.ENGLISH, context)
+        paymentComponentWithLocale = PaymentComponent(context, giniHealth)
+
+        // When
+        val bottomSheet = InstallAppBottomSheet.newInstance(
+            paymentComponentWithLocale!!,
+            mockk(),
+            0
+        )
+
+        launchFragmentInContainer(themeResId = R.style.GiniHealthTheme) {
+            bottomSheet
+        }
+
+        // Then
+        onView(withId(R.id.ghs_install_app_title)).check(ViewAssertions.matches(ViewMatchers.withSubstring("Invoice")))
+        onView(withId(R.id.ghs_install_app_details)).check(ViewAssertions.matches(ViewMatchers.withSubstring("Note:")))
+        onView(withId(R.id.ghs_forward_button)).check(ViewAssertions.matches(ViewMatchers.withText("Forward")))
+    }
+
+    @Test
+    fun `shows text values in german if that is set to GiniHealth`() = runTest {
+        // Given
+        val context: Context = ApplicationProvider.getApplicationContext()
+        val documentManager: HealthApiDocumentManager = mockk { HealthApiDocumentManager::class.java }
+        every { giniHealthAPI.documentManager } returns documentManager
+        giniHealth = GiniHealth(giniHealthAPI)
+        giniHealth.setSDKLanguage(GiniLocalization.GERMAN, context)
+        paymentComponentWithLocale = PaymentComponent(context, giniHealth)
+
+        // When
+        val bottomSheet = InstallAppBottomSheet.newInstance(
+            paymentComponentWithLocale!!,
+            mockk(),
+            0
+        )
+
+        launchFragmentInContainer(themeResId = R.style.GiniHealthTheme) {
+            bottomSheet
+        }
+
+        // Then
+        onView(withId(R.id.ghs_install_app_title)).check(ViewAssertions.matches(ViewMatchers.withSubstring("Rechnungsdaten")))
+        onView(withId(R.id.ghs_install_app_details)).check(ViewAssertions.matches(ViewMatchers.withSubstring("Hinweis:")))
+        onView(withId(R.id.ghs_forward_button)).check(ViewAssertions.matches(ViewMatchers.withText("Weiter")))
+    }
 }
\ No newline at end of file
diff --git a/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/review/openWith/OpenWithBottomSheetTest.kt b/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/review/openWith/OpenWithBottomSheetTest.kt
index 3417a8ced2..4a4f8ae28a 100644
--- a/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/review/openWith/OpenWithBottomSheetTest.kt
+++ b/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/review/openWith/OpenWithBottomSheetTest.kt
@@ -1,29 +1,50 @@
 package net.gini.android.health.sdk.review.openWith
 
+import android.content.Context
 import androidx.fragment.app.testing.launchFragmentInContainer
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify
 import kotlinx.coroutines.test.runTest
+import net.gini.android.health.api.GiniHealthAPI
+import net.gini.android.health.api.HealthApiDocumentManager
+import net.gini.android.health.sdk.GiniHealth
 import org.junit.Test
 import org.junit.runner.RunWith
 import net.gini.android.health.sdk.R
+import net.gini.android.health.sdk.bankselection.BankSelectionBottomSheet
+import net.gini.android.health.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.health.sdk.paymentprovider.PaymentProviderApp
+import net.gini.android.health.sdk.util.GiniLocalization
+import org.junit.Before
 
 @RunWith(AndroidJUnit4::class)
 class OpenWithBottomSheetTest {
+
+    private lateinit var paymentComponent: PaymentComponent
+    private var paymentComponentWithLocale: PaymentComponent? = null
+    private lateinit var giniHealth: GiniHealth
+    private val giniHealthAPI: GiniHealthAPI = mockk(relaxed = true) { GiniHealthAPI::class.java }
+
     @Test
     fun `listener method called when 'Forward' button tapped`() = runTest {
         // Given
+        paymentComponent = mockk<PaymentComponent>()
+        every { paymentComponent.giniHealth.localizedContext } returns ApplicationProvider.getApplicationContext()
         val listener: OpenWithForwardListener = mockk()
         every { listener.onForwardSelected() } returns mockk()
 
         launchFragmentInContainer(themeResId = R.style.GiniHealthTheme) {
             OpenWithBottomSheet.newInstance(
                 mockk(relaxed = true),
+                paymentComponent,
                 listener
             )
         }
@@ -34,4 +55,56 @@ class OpenWithBottomSheetTest {
         // Then
         verify { listener.onForwardSelected() }
     }
+
+    @Test
+    fun `shows text values in english if that is set to GiniHealth`() = runTest {
+        // Given
+        val context: Context = ApplicationProvider.getApplicationContext()
+        val documentManager: HealthApiDocumentManager = mockk { HealthApiDocumentManager::class.java }
+        every { giniHealthAPI.documentManager } returns documentManager
+        giniHealth = GiniHealth(giniHealthAPI)
+        giniHealth.setSDKLanguage(GiniLocalization.ENGLISH, context)
+        paymentComponentWithLocale = PaymentComponent(context, giniHealth)
+
+        // When
+        launchFragmentInContainer {
+            OpenWithBottomSheet.newInstance(
+                mockk(relaxed = true),
+                paymentComponentWithLocale,
+                mockk()
+            )
+        }
+
+        // Then
+        onView(withId(R.id.ghs_open_with_title)).check(ViewAssertions.matches(ViewMatchers.withSubstring("Invoice")))
+        onView(withId(R.id.ghs_open_with_details)).check(ViewAssertions.matches(ViewMatchers.withSubstring("In the")))
+        onView(withId(R.id.ghs_open_with_info)).check(ViewAssertions.matches(ViewMatchers.withSubstring("Tip")))
+        onView(withId(R.id.ghs_forward_button)).check(ViewAssertions.matches(ViewMatchers.withText("Forward")))
+    }
+
+    @Test
+    fun `shows text values in german if that is set to GiniHealth`() = runTest {
+        // Given
+        val context: Context = ApplicationProvider.getApplicationContext()
+        val documentManager: HealthApiDocumentManager = mockk { HealthApiDocumentManager::class.java }
+        every { giniHealthAPI.documentManager } returns documentManager
+        giniHealth = GiniHealth(giniHealthAPI)
+        giniHealth.setSDKLanguage(GiniLocalization.GERMAN, context)
+        paymentComponentWithLocale = PaymentComponent(context, giniHealth)
+
+        // When
+        launchFragmentInContainer {
+            OpenWithBottomSheet.newInstance(
+                mockk(relaxed = true),
+                paymentComponentWithLocale,
+                mockk()
+            )
+        }
+
+        // Then
+        onView(withId(R.id.ghs_open_with_title)).check(ViewAssertions.matches(ViewMatchers.withSubstring("Rechnungsdaten")))
+        onView(withId(R.id.ghs_open_with_details)).check(ViewAssertions.matches(ViewMatchers.withSubstring("Im nächsten")))
+        onView(withId(R.id.ghs_open_with_info)).check(ViewAssertions.matches(ViewMatchers.withSubstring("Tipp")))
+        onView(withId(R.id.ghs_forward_button)).check(ViewAssertions.matches(ViewMatchers.withText("Weiter")))
+    }
 }
\ No newline at end of file
diff --git a/merchant-sdk/LICENSE.md b/merchant-sdk/LICENSE.md
new file mode 100644
index 0000000000..adfb9b05e7
--- /dev/null
+++ b/merchant-sdk/LICENSE.md
@@ -0,0 +1 @@
+Moved to https://developer.gini.net/gini-mobile-android/merchant-sdk/sdk/html/license.html
\ No newline at end of file
diff --git a/merchant-sdk/README.md b/merchant-sdk/README.md
new file mode 100644
index 0000000000..3321c2502b
--- /dev/null
+++ b/merchant-sdk/README.md
@@ -0,0 +1,39 @@
+![Gini Merchant SDK for Android](./logo.png)
+
+Gini Merchant SDK for Android
+=============================
+
+The Gini Merchant SDK for Android provides all the UI and functionality needed to use the Gini Pay Connect payment
+method in Android apps. The payment information can be reviewed and paid using any available payment provider app (e.g.,
+banking app).
+
+The Gini Merchant API provides a secure channel for sharing payment related information between clients.
+
+Documentation
+-------------
+
+* [Integration Guide](https://developer.gini.net/gini-mobile-android/merchant-sdk/sdk)
+
+Example Apps
+------------
+
+### Merchant Example App
+
+You can see a sample usage of the Gini Merchant SDK in the `:merchant-sdk:example-app` module. 
+
+It requires Gini Merchant API credentials which are injected automatically if you create this file `merchant-sdk/example-app/local.properties` with the following properties:
+```
+clientId=*******
+clientSecret=*******
+```
+
+### Bank Example App
+
+An example bank app is available in the [Gini Bank SDK](https://github.com/gini/gini-mobile-android/tree/main/bank-sdk) called
+[`example-app`](https://github.com/gini/gini-mobile-android/tree/main/bank-sdk/example-app).
+
+License
+-------
+
+The Gini Merchant SDK for Android is available under a commercial license.
+See the LICENSE file for more info.
diff --git a/merchant-sdk/example-app/.gitignore b/merchant-sdk/example-app/.gitignore
new file mode 100644
index 0000000000..6e39412206
--- /dev/null
+++ b/merchant-sdk/example-app/.gitignore
@@ -0,0 +1 @@
+client.properties
\ No newline at end of file
diff --git a/merchant-sdk/example-app/README.md b/merchant-sdk/example-app/README.md
new file mode 100644
index 0000000000..d0c8f5cd28
--- /dev/null
+++ b/merchant-sdk/example-app/README.md
@@ -0,0 +1,42 @@
+Gini Merchant SDK Example App
+=============================
+
+This example app provides you with a sample usage of the Gini Merchant SDK.
+
+Before using the Gini Merchant SDK example app, you need to set your Gini Merchant API client id and secret by creating a
+`local.properties` file in this folder containing a `clientId` and a `clientSecret` property.
+
+ProGuard 
+========
+ 
+A sample ProGuard configuration file is included in the example app's directory called `proguard-rules.pro`. 
+ 
+The release build is configured to run ProGuard. You need a keystore with a key to sign it. Create a keystore with a key and provide them in
+the `gradle.properties` or as arguments for the build command:
+
+``` 
+$ ./gradlew merchant-sdk:example-app:assembleRelease \ 
+    -PreleaseKeystoreFile=<path to keystore> \ 
+    -PreleaseKeystorePassword=<keystore password> \ 
+    -PreleaseKeyAlias=<key alias> \ 
+    -PreleaseKeyPassword=<key password> \
+    -PclientId=<Gini API client id> \
+    -PclientSecret=<Gini API client secret>
+``` 
+
+Flavors
+=======
+
+The example app has three flavors: `dev`, `prod` and `qa`. The `dev` flavor is used by default. The `prod` flavor
+is used for creating release builds which can be shared with clients while the `qa` flavor is used for creating release builds
+for QA purposes. The difference between `prod` and `qa` is that `qa` allows using custom SSL root certificates for
+SSL proxies (e.g. Charles Proxy).
+
+Payment Providers for testing the Merchant SDK
+============================================
+
+Payment Providers for testing are provided by the Gini Bank SDK's example app. Run `bundle exec fastlane install_test_payment_provider_apps` in the repository root to install test payment provider apps 
+on all running emulators and connected devices. You can run `bundle exec fastlane uninstall_test_payment_provider_apps`
+to uninstall the test payment provider apps.
+
+Please view the Gini Bank SDK example app's readme at `bank-sdk/example-app/README.md` for more details.
diff --git a/merchant-sdk/example-app/build.gradle.kts b/merchant-sdk/example-app/build.gradle.kts
new file mode 100644
index 0000000000..f7ad42a67e
--- /dev/null
+++ b/merchant-sdk/example-app/build.gradle.kts
@@ -0,0 +1,140 @@
+import net.gini.gradle.CreatePropertiesTask
+import net.gini.gradle.PropertiesPlugin
+import net.gini.gradle.readLocalPropertiesToMap
+
+plugins {
+    id("com.android.application")
+    kotlin("android")
+    kotlin("kapt")
+}
+
+android {
+    namespace = "net.gini.android.merchant.sdk.exampleapp"
+    compileSdk = libs.versions.android.compileSdk.get().toInt()
+
+    // after upgrading to AGP 8, we need this to have the defaultConfig block
+    buildFeatures {
+        buildConfig = true
+    }
+    defaultConfig {
+        applicationId = "net.gini.android.merchant.sdk.exampleapp"
+        minSdk = libs.versions.android.minSdk.get().toInt()
+        targetSdk =libs.versions.android.targetSdk.get().toInt()
+
+        versionName = version as String
+        versionCode = (properties["versionCode"] as? String)?.toInt() ?: 0
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        vectorDrawables {
+            useSupportLibrary = true
+        }
+    }
+
+    signingConfigs {
+        create("release") {
+            storeFile = file(properties["releaseKeystoreFile"] ?: "")
+            storePassword = (properties["releaseKeystorePassword"] as? String) ?: ""
+            keyAlias = (properties["releaseKeyAlias"] as? String) ?: ""
+            keyPassword = (properties["releaseKeyPassword"] as? String) ?: ""
+        }
+    }
+
+    buildTypes {
+        getByName("release") {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+
+            signingConfig = signingConfigs.getByName("release")
+        }
+    }
+    flavorDimensions += "environment"
+    productFlavors {
+        create("prod") {
+            dimension = "environment"
+        }
+        create("dev") {
+            isDefault = true
+            dimension = "environment"
+        }
+        create("qa") {
+            dimension = "environment"
+        }
+    }
+    buildFeatures {
+        viewBinding = true
+    }
+    compileOptions {
+        sourceCompatibility(JavaVersion.VERSION_1_8)
+        targetCompatibility(JavaVersion.VERSION_1_8)
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+        // Fix for "Inheritance from an interface with '@JvmDefault' members is only allowed with -Xjvm-default option"
+        // https://issuetracker.google.com/issues/217593040#comment6
+        freeCompilerArgs = listOf("-Xjvm-default=all")
+    }
+    packaging {
+        resources {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        }
+    }
+}
+
+// after upgrading to AGP 8, we need this, otherwise, gradle will complain to use the same jdk version as your machine (17 which is bundled with Android Studio)
+// https://youtrack.jetbrains.com/issue/KT-55947/Unable-to-set-kapt-jvm-target-version
+tasks.withType(type = org.jetbrains.kotlin.gradle.internal.KaptGenerateStubsTask::class) {
+    kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
+}
+
+dependencies {
+
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.activity.ktx)
+    implementation(libs.androidx.fragment.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.lifecycle.viewmodel.ktx)
+    implementation(libs.material)
+    implementation(libs.androidx.constraintlayout)
+    implementation(libs.koin.androidx.scope)
+    implementation(libs.koin.androidx.viewmodel)
+    implementation(libs.koin.androidx.fragment)
+    implementation(libs.insetter)
+    implementation(libs.datastore.preferences)
+    implementation(libs.moshi.core)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(project(":merchant-sdk:sdk"))
+
+    kapt(libs.moshi.codegen)
+    implementation(libs.logback.android.core)
+    implementation(libs.logback.android.classic) {
+        // workaround issue #73
+        exclude(group = "com.google.android", module = "android")
+    }
+
+    testImplementation(libs.junit)
+
+    androidTestImplementation(libs.androidx.test.junit)
+    androidTestImplementation(libs.androidx.test.espresso.core)
+}
+
+apply<PropertiesPlugin>()
+
+tasks.register<CreatePropertiesTask>("injectClientCredentials") {
+    val propertiesMap = mutableMapOf<String, String>()
+
+    doFirst {
+        propertiesMap.clear()
+        propertiesMap.putAll(readLocalPropertiesToMap(project, listOf("clientId", "clientSecret")))
+    }
+
+    destinations.put(
+        file("src/main/resources/client.properties"),
+        propertiesMap
+    )
+}
+
+afterEvaluate {
+    tasks.filter { it.name.startsWith("assemble", ignoreCase = true) }.forEach {
+        it.dependsOn(tasks.getByName("injectClientCredentials"))
+    }
+}
diff --git a/merchant-sdk/example-app/gradle.properties b/merchant-sdk/example-app/gradle.properties
new file mode 100644
index 0000000000..8560c28e41
--- /dev/null
+++ b/merchant-sdk/example-app/gradle.properties
@@ -0,0 +1,8 @@
+version=1.0.0
+versionCode=1
+
+# Signing
+releaseKeystoreFile=merchant_sdk_example.jks
+releaseKeystorePassword=***
+releaseKeyAlias=merchant_sdk_example
+releaseKeyPassword=***
diff --git a/merchant-sdk/example-app/merchant_sdk_example.jks b/merchant-sdk/example-app/merchant_sdk_example.jks
new file mode 100644
index 0000000000..a66a85e925
Binary files /dev/null and b/merchant-sdk/example-app/merchant_sdk_example.jks differ
diff --git a/merchant-sdk/example-app/proguard-rules.pro b/merchant-sdk/example-app/proguard-rules.pro
new file mode 100644
index 0000000000..481bb43481
--- /dev/null
+++ b/merchant-sdk/example-app/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/androidTest/java/net/gini/pay/app/ExampleInstrumentedTest.kt b/merchant-sdk/example-app/src/androidTest/java/net/gini/pay/app/ExampleInstrumentedTest.kt
new file mode 100644
index 0000000000..28e44466ae
--- /dev/null
+++ b/merchant-sdk/example-app/src/androidTest/java/net/gini/pay/app/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package net.gini.pay.app
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("net.gini.pay.app", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/dev/AndroidManifest.xml b/merchant-sdk/example-app/src/dev/AndroidManifest.xml
new file mode 100644
index 0000000000..e76c158e0e
--- /dev/null
+++ b/merchant-sdk/example-app/src/dev/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application android:networkSecurityConfig="@xml/network_security_config" />
+
+</manifest>
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/dev/res/xml/network_security_config.xml b/merchant-sdk/example-app/src/dev/res/xml/network_security_config.xml
new file mode 100644
index 0000000000..f81d491896
--- /dev/null
+++ b/merchant-sdk/example-app/src/dev/res/xml/network_security_config.xml
@@ -0,0 +1,8 @@
+<network-security-config>
+    <base-config cleartextTrafficPermitted="false">
+        <trust-anchors>
+            <certificates src="system" />
+            <certificates src="user" />
+        </trust-anchors>
+    </base-config>
+</network-security-config>
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/main/AndroidManifest.xml b/merchant-sdk/example-app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..188c336c70
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/AndroidManifest.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="net.gini.android.merchant.sdk.exampleapp">
+
+    <application
+        android:name=".ExampleApplication"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme"
+        tools:ignore="AllowBackup">
+        <activity android:name=".MainActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="payment-requester"
+                    android:scheme="ginipay-business" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".upload.UploadActivity"
+            android:screenOrientation="portrait"
+            android:exported="false" />
+        <activity
+            android:name=".review.ReviewActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme"
+            android:windowSoftInputMode="adjustResize"
+            android:exported="false" />
+        <activity
+            android:name=".orders.ui.OrdersActivity"
+            android:screenOrientation="portrait"
+            android:label="@string/title_activity_orders"
+            android:exported="false" />
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/filepaths" />
+        </provider>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/main/ic_launcher-playstore.png b/merchant-sdk/example-app/src/main/ic_launcher-playstore.png
new file mode 100644
index 0000000000..16e6d83730
Binary files /dev/null and b/merchant-sdk/example-app/src/main/ic_launcher-playstore.png differ
diff --git a/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/ExampleApplication.kt b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/ExampleApplication.kt
new file mode 100644
index 0000000000..21cc501932
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/ExampleApplication.kt
@@ -0,0 +1,20 @@
+package net.gini.android.merchant.sdk.exampleapp
+
+import android.app.Application
+import net.gini.android.merchant.sdk.exampleapp.di.giniModule
+import net.gini.android.merchant.sdk.exampleapp.di.viewModelModule
+import org.koin.android.ext.koin.androidContext
+import org.koin.core.context.startKoin
+
+class ExampleApplication : Application() {
+
+    override fun onCreate() {
+        super.onCreate()
+
+        startKoin {
+            androidContext(this@ExampleApplication)
+            fileProperties("/client.properties")
+            modules(giniModule, viewModelModule)
+        }
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/MainActivity.kt b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/MainActivity.kt
new file mode 100644
index 0000000000..ebe945fc9e
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/MainActivity.kt
@@ -0,0 +1,70 @@
+package net.gini.android.merchant.sdk.exampleapp
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import ch.qos.logback.classic.Logger
+import ch.qos.logback.classic.LoggerContext
+import ch.qos.logback.classic.android.LogcatAppender
+import ch.qos.logback.classic.encoder.PatternLayoutEncoder
+import net.gini.android.merchant.sdk.exampleapp.configuration.ConfigurationFragment
+import net.gini.android.merchant.sdk.exampleapp.databinding.ActivityMainBinding
+import net.gini.android.merchant.sdk.exampleapp.orders.ui.OrdersActivity
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.slf4j.LoggerFactory
+
+class MainActivity : AppCompatActivity() {
+
+    private val viewModel: MainViewModel by viewModel()
+    private lateinit var binding: ActivityMainBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityMainBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        binding.invoicesScreen.setOnClickListener {
+            startActivity(Intent(this, OrdersActivity::class.java).apply {
+                viewModel.getFlowConfiguration()?.let {
+                    putExtra(FLOW_CONFIGURATION, it)
+                }
+            })
+        }
+
+        with(binding.giniMerchantVersion) {
+            text = "${getString(R.string.gini_merchant_version)} ${net.gini.android.merchant.sdk.BuildConfig.VERSION_NAME}"
+            setOnClickListener {
+                openConfigurationScreen()
+            }
+        }
+
+        configureLogging()
+    }
+
+    private fun openConfigurationScreen() {
+        supportFragmentManager.beginTransaction()
+            .add(binding.configurationContainer.id, ConfigurationFragment.newInstance(), ConfigurationFragment::class.java.name)
+            .addToBackStack(ConfigurationFragment::class.java.name)
+            .commit()
+    }
+
+    private fun configureLogging() {
+        val lc = LoggerFactory.getILoggerFactory() as LoggerContext
+        lc.reset()
+        val layoutEncoder = PatternLayoutEncoder()
+        layoutEncoder.context = lc
+        layoutEncoder.pattern = "%-5level %file:%line [%thread] - %msg%n"
+        layoutEncoder.start()
+        val logcatAppender = LogcatAppender()
+        logcatAppender.context = lc
+        logcatAppender.encoder = layoutEncoder
+        logcatAppender.start()
+        val root = LoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME) as Logger
+        root.addAppender(logcatAppender)
+    }
+
+    companion object {
+        private val LOG = LoggerFactory.getLogger(MainActivity::class.java)
+        val FLOW_CONFIGURATION = "flow_configuration"
+    }
+}
diff --git a/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/MainViewModel.kt b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/MainViewModel.kt
new file mode 100644
index 0000000000..b447d43a50
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/MainViewModel.kt
@@ -0,0 +1,15 @@
+package net.gini.android.merchant.sdk.exampleapp
+
+import androidx.lifecycle.ViewModel
+import net.gini.android.merchant.sdk.integratedFlow.PaymentFlowConfiguration
+
+class MainViewModel: ViewModel() {
+
+    private var flowConfiguration: PaymentFlowConfiguration? = null
+
+    fun saveConfiguration(flowConfig: PaymentFlowConfiguration) {
+        flowConfiguration = flowConfig
+    }
+
+    fun getFlowConfiguration() = flowConfiguration
+}
diff --git a/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/configuration/ConfigurationFragment.kt b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/configuration/ConfigurationFragment.kt
new file mode 100644
index 0000000000..f3b52748b4
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/configuration/ConfigurationFragment.kt
@@ -0,0 +1,49 @@
+package net.gini.android.merchant.sdk.exampleapp.configuration
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import net.gini.android.merchant.sdk.exampleapp.MainViewModel
+import net.gini.android.merchant.sdk.exampleapp.databinding.FragmentConfigurationBinding
+import net.gini.android.merchant.sdk.integratedFlow.PaymentFlowConfiguration
+
+
+class ConfigurationFragment: Fragment() {
+
+    private lateinit var binding: FragmentConfigurationBinding
+    private val viewModel by activityViewModels<MainViewModel>()
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = FragmentConfigurationBinding.inflate(layoutInflater)
+        with(binding) {
+            setupSwitchListeners()
+        }
+        return binding.root
+    }
+
+    private fun FragmentConfigurationBinding.setupSwitchListeners() {
+        gmsShowReviewFragment.setOnCheckedChangeListener { _, _ ->
+            saveConfiguration()
+        }
+    }
+
+    private fun saveConfiguration() {
+        viewModel.saveConfiguration(
+            PaymentFlowConfiguration(
+                shouldShowReviewFragment = binding.gmsShowReviewFragment.isChecked,
+                shouldHandleErrorsInternally = true,
+            )
+        )
+    }
+
+    companion object {
+        fun newInstance() = ConfigurationFragment()
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/di/GiniModule.kt b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/di/GiniModule.kt
new file mode 100644
index 0000000000..08b4f4bac7
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/di/GiniModule.kt
@@ -0,0 +1,8 @@
+package net.gini.android.merchant.sdk.exampleapp.di
+
+import net.gini.android.merchant.sdk.GiniMerchant
+import org.koin.dsl.module
+
+val giniModule = module {
+    single { GiniMerchant(get(), getProperty("clientId"), getProperty("clientSecret"), "example.com") }
+}
diff --git a/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/di/ViewModel.kt b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/di/ViewModel.kt
new file mode 100644
index 0000000000..3295d8755f
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/di/ViewModel.kt
@@ -0,0 +1,17 @@
+package net.gini.android.merchant.sdk.exampleapp.di
+
+import net.gini.android.merchant.sdk.exampleapp.MainViewModel
+import net.gini.android.merchant.sdk.exampleapp.orders.data.HardcodedOrdersLocalDataSource
+import net.gini.android.merchant.sdk.exampleapp.orders.data.OrdersRepository
+import net.gini.android.merchant.sdk.exampleapp.orders.ui.OrderDetailsViewModel
+import net.gini.android.merchant.sdk.exampleapp.orders.ui.OrdersViewModel
+import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.dsl.module
+
+val viewModelModule = module {
+    viewModel { MainViewModel() }
+    viewModel { OrdersViewModel(get(), get()) }
+    viewModel { OrderDetailsViewModel() }
+    factory { OrdersRepository(get()) }
+    factory { HardcodedOrdersLocalDataSource() }
+}
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/orders/data/HardcodedOrdersLocalDataSource.kt b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/orders/data/HardcodedOrdersLocalDataSource.kt
new file mode 100644
index 0000000000..a2b878142f
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/orders/data/HardcodedOrdersLocalDataSource.kt
@@ -0,0 +1,41 @@
+package net.gini.android.merchant.sdk.exampleapp.orders.data
+
+import net.gini.android.merchant.sdk.exampleapp.orders.data.model.Order
+
+class HardcodedOrdersLocalDataSource {
+
+    fun getOrders(): List<Order> {
+        return listOf(
+            Order(
+                iban = "DE75201207003100124444",
+                recipient = "OTTO GMBH & CO KG",
+                amount = "709.97:EUR",
+                purpose = "RF7411164022"
+            ),
+            Order(
+                iban = "DE14200800000816170700",
+                recipient = "Tchibo GmbH",
+                amount = "54.97:EUR",
+                purpose = "10020302020"
+            ),
+            Order(
+                iban = "DE86210700200123010101",
+                recipient = "Zalando SE",
+                amount = "126.62:EUR",
+                purpose = "938929192"
+            ),
+            Order(
+                iban = "DE68201207003100755555",
+                recipient = "bonprix Handelsgesellschaft mbH",
+                amount = "114.88:EUR",
+                purpose = "020329984871123"
+            ),
+            Order(
+                iban = "DE13760700120500154000",
+                recipient = "Klarna",
+                amount = "80.13:EUR",
+                purpose = "00425818528311423079"
+            )
+        )
+    }
+}
diff --git a/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/orders/data/OrdersRepository.kt b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/orders/data/OrdersRepository.kt
new file mode 100644
index 0000000000..390ba41c9e
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/orders/data/OrdersRepository.kt
@@ -0,0 +1,15 @@
+package net.gini.android.merchant.sdk.exampleapp.orders.data
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+import net.gini.android.merchant.sdk.exampleapp.orders.data.model.Order
+
+class OrdersRepository(
+    hardcodedOrdersLocalDataSource: HardcodedOrdersLocalDataSource
+) {
+
+    val ordersFlow: Flow<List<Order>> = flow {
+        emit(hardcodedOrdersLocalDataSource.getOrders())
+    }
+
+}
diff --git a/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/orders/data/model/Order.kt b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/orders/data/model/Order.kt
new file mode 100644
index 0000000000..fb1ae6974f
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/orders/data/model/Order.kt
@@ -0,0 +1,3 @@
+package net.gini.android.merchant.sdk.exampleapp.orders.data.model
+
+data class Order(val iban: String, val recipient: String, val amount: String, val purpose: String)
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/orders/ui/OrderDetailsFragment.kt b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/orders/ui/OrderDetailsFragment.kt
new file mode 100644
index 0000000000..9ebc6fed3c
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/orders/ui/OrderDetailsFragment.kt
@@ -0,0 +1,106 @@
+package net.gini.android.merchant.sdk.exampleapp.orders.ui
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.widget.addTextChangedListener
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.google.android.material.textfield.TextInputEditText
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import net.gini.android.merchant.sdk.exampleapp.databinding.FragmentOrderDetailsBinding
+import net.gini.android.merchant.sdk.exampleapp.orders.data.model.Order
+import net.gini.android.merchant.sdk.util.setIntervalClickListener
+
+class OrderDetailsFragment : Fragment() {
+
+    private lateinit var binding: FragmentOrderDetailsBinding
+    private val ordersViewModel: OrdersViewModel by activityViewModels<OrdersViewModel>()
+    private val orderDetailsViewModel: OrderDetailsViewModel by viewModels()
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        super.onCreateView(inflater, container, savedInstanceState)
+        binding = FragmentOrderDetailsBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        viewLifecycleOwner.lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.RESUMED) {
+                launch {
+                    ordersViewModel.selectedOrderItem.collectLatest { orderItem ->
+                        if (orderItem == null) {
+                            return@collectLatest
+                        }
+                        showOrder(orderItem.order)
+                        orderDetailsViewModel.setOrder(orderItem.order)
+                    }
+                }
+                launch {
+                    orderDetailsViewModel.orderFlow.collectLatest { order ->
+                        showOrder(order)
+                    }
+                }
+                launch {
+                    ordersViewModel.finishPaymentFlow.collect {
+                        if (it == true) {
+                            requireActivity().supportFragmentManager.popBackStack()
+                            ordersViewModel.resetFinishPaymentFlow()
+                        }
+                    }
+                }
+            }
+        }
+        setupInputListeners()
+    }
+
+    private fun showOrder(order: Order) {
+        with(binding) {
+            recipient.setTextIfDifferent(order.recipient)
+            iban.setTextIfDifferent(order.iban)
+            amount.setTextIfDifferent(order.amount)
+            purpose.setTextIfDifferent(order.purpose)
+            payNowBtn.setIntervalClickListener {
+                ordersViewModel.startPaymentFlow(orderDetailsViewModel.getOrder())
+            }
+        }
+    }
+
+    private fun setupInputListeners() {
+        with(binding) {
+            recipient.addTextChangedListener { text ->
+                orderDetailsViewModel.updateRecipient(text.toString())
+            }
+            iban.addTextChangedListener { text ->
+                orderDetailsViewModel.updateIBAN(text.toString())
+            }
+            amount.addTextChangedListener { text ->
+                orderDetailsViewModel.updateAmount(text.toString())
+            }
+            purpose.addTextChangedListener { text ->
+                orderDetailsViewModel.updatePurpose(text.toString())
+            }
+        }
+    }
+
+    companion object {
+        fun newInstance() = OrderDetailsFragment()
+    }
+}
+
+private fun TextInputEditText.setTextIfDifferent(text: String) {
+    if (this.text.toString() != text) {
+        this.setText(text)
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/orders/ui/OrderDetailsViewModel.kt b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/orders/ui/OrderDetailsViewModel.kt
new file mode 100644
index 0000000000..a2cca28d55
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/orders/ui/OrderDetailsViewModel.kt
@@ -0,0 +1,41 @@
+package net.gini.android.merchant.sdk.exampleapp.orders.ui
+
+import androidx.lifecycle.ViewModel
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.debounce
+import net.gini.android.merchant.sdk.exampleapp.orders.data.model.Order
+import kotlin.time.Duration.Companion.milliseconds
+
+class OrderDetailsViewModel : ViewModel() {
+
+    private val _orderFlow = MutableStateFlow(Order("", "", "", ""))
+
+    @OptIn(FlowPreview::class)
+    val orderFlow = _orderFlow.asStateFlow().debounce(300.milliseconds)
+
+    fun setOrder(order: Order) {
+        _orderFlow.value = order
+    }
+
+    fun getOrder(): Order {
+        return _orderFlow.value
+    }
+
+    fun updateRecipient(recipient: String) {
+        _orderFlow.value = _orderFlow.value.copy(recipient = recipient)
+    }
+
+    fun updateIBAN(iban: String) {
+        _orderFlow.value = _orderFlow.value.copy(iban = iban)
+    }
+
+    fun updateAmount(amount: String) {
+        _orderFlow.value = _orderFlow.value.copy(amount = amount)
+    }
+
+    fun updatePurpose(purpose: String) {
+        _orderFlow.value = _orderFlow.value.copy(purpose = purpose)
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/orders/ui/OrdersActivity.kt b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/orders/ui/OrdersActivity.kt
new file mode 100644
index 0000000000..d80a771d1a
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/orders/ui/OrdersActivity.kt
@@ -0,0 +1,208 @@
+package net.gini.android.merchant.sdk.exampleapp.orders.ui
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import android.widget.TextView
+import android.widget.Toast
+import androidx.annotation.StringRes
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.IntentCompat
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import kotlinx.coroutines.launch
+import net.gini.android.merchant.sdk.GiniMerchant
+import net.gini.android.merchant.sdk.exampleapp.MainActivity
+import net.gini.android.merchant.sdk.exampleapp.R
+import net.gini.android.merchant.sdk.exampleapp.databinding.ActivityOrdersBinding
+import net.gini.android.merchant.sdk.exampleapp.orders.ui.model.OrderItem
+import net.gini.android.merchant.sdk.integratedFlow.PaymentFlowConfiguration
+import net.gini.android.merchant.sdk.integratedFlow.PaymentFragment
+import net.gini.android.merchant.sdk.util.DisplayedScreen
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.slf4j.LoggerFactory
+
+class OrdersActivity : AppCompatActivity() {
+
+    private val viewModel: OrdersViewModel by viewModel()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val binding = ActivityOrdersBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        setActivityTitle()
+
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                launch {
+                    viewModel.ordersFlow.collect { orders ->
+                        (binding.ordersList.adapter as OrdersAdapter).apply {
+                            dataSet = orders
+                            notifyDataSetChanged()
+                        }
+                        binding.noOrdersLabel.visibility =
+                            if (orders.isEmpty()) View.VISIBLE else View.GONE
+                    }
+                }
+                launch {
+                    viewModel.startIntegratedPaymentFlow.collect { containerFragment ->
+                        startIntegratedPaymentFlow(containerFragment)
+                    }
+                }
+                launch {
+                    viewModel.giniMerchant.eventsFlow.collect { event ->
+                        when (event) {
+                            is GiniMerchant.MerchantSDKEvents.OnScreenDisplayed -> {
+                                when (event.displayedScreen) {
+                                    DisplayedScreen.MoreInformationFragment -> setActivityTitle(net.gini.android.merchant.sdk.R.string.gms_more_information_fragment_title)
+                                    else -> { setActivityTitle(R.string.title_activity_orders) }
+                                }
+                            }
+                            is GiniMerchant.MerchantSDKEvents.OnErrorOccurred -> {
+                                AlertDialog.Builder(this@OrdersActivity)
+                                    .setTitle(R.string.error_message)
+                                    .setMessage(event.throwable.message)
+                                    .setPositiveButton(android.R.string.ok, null)
+                                    .show()
+                            }
+                            else -> {}
+                        }
+                    }
+                }
+                launch {
+                    viewModel.errorsFlow.collect {
+                        Toast.makeText(this@OrdersActivity, it, Toast.LENGTH_LONG).show()
+                    }
+                }
+            }
+        }
+
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+
+        viewModel.loadPaymentProviderApps()
+        viewModel.startObservingPaymentFlow()
+
+        IntentCompat.getParcelableExtra(intent, MainActivity.FLOW_CONFIGURATION, PaymentFlowConfiguration::class.java)?.let {
+            viewModel.setIntegratedFlowConfiguration(it)
+        }
+
+        binding.ordersList.layoutManager = LinearLayoutManager(this)
+        binding.ordersList.adapter = OrdersAdapter(emptyList()) { orderItem ->
+            viewModel.setSelectedOrderItem(orderItem)
+            showOrderDetailsFragment()
+        }
+        binding.ordersList.addItemDecoration(DividerItemDecoration(this, LinearLayout.VERTICAL))
+
+        supportFragmentManager.addOnBackStackChangedListener {
+            setActivityTitle()
+            invalidateOptionsMenu()
+        }
+    }
+
+    private fun setActivityTitle(@StringRes screenTitle: Int? = null) {
+        if (supportFragmentManager.backStackEntryCount == 0) {
+            title = getString(R.string.title_activity_orders)
+        } else if (supportFragmentManager.fragments.last() is OrderDetailsFragment) {
+            title = getString(R.string.title_fragment_order_details)
+        } else if (screenTitle != null){
+            title = getString(screenTitle)
+        }
+    }
+
+    private fun showOrderDetailsFragment() {
+        OrderDetailsFragment.newInstance().apply {
+            add()
+        }
+    }
+
+    private fun startIntegratedPaymentFlow(containerFragment: PaymentFragment) {
+        containerFragment.apply {
+            add()
+        }
+    }
+
+    private fun Fragment.add() {
+        supportFragmentManager.beginTransaction()
+            .add(R.id.fragment_container, this, this::class.java.simpleName)
+            .addToBackStack(this::class.java.simpleName)
+            .commit()
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        if (supportFragmentManager.backStackEntryCount == 0) {
+            menuInflater.inflate(R.menu.orders_menu, menu)
+        }
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            R.id.custom_order -> {
+                viewModel.setSelectedOrderItem(null)
+                showOrderDetailsFragment()
+                true
+            }
+            android.R.id.home -> {
+                onBackPressedDispatcher.onBackPressed()
+                true
+            }
+
+            else -> super.onOptionsItemSelected(item)
+        }
+    }
+
+    companion object {
+        private val LOG = LoggerFactory.getLogger(OrdersActivity::class.java)
+    }
+}
+
+class OrdersAdapter(
+    var dataSet: List<OrderItem>,
+    private val showOrderDetails: (OrderItem) -> Unit,
+) :
+    RecyclerView.Adapter<OrdersAdapter.ViewHolder>() {
+
+    class ViewHolder(view: View) :
+        RecyclerView.ViewHolder(view) {
+        val recipient: TextView
+        val purpose: TextView
+        val amount: TextView
+
+        init {
+            recipient = view.findViewById(R.id.recipient)
+            purpose = view.findViewById(R.id.purpose)
+            amount = view.findViewById(R.id.amount)
+        }
+    }
+
+    override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): ViewHolder {
+        val view = LayoutInflater.from(viewGroup.context)
+            .inflate(R.layout.item_order, viewGroup, false)
+        return ViewHolder(view).also {  vh ->
+            vh.itemView.setOnClickListener {
+                showOrderDetails(dataSet[vh.adapterPosition])
+            }
+        }
+    }
+
+    override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
+        val orderItem = dataSet[position]
+
+        viewHolder.recipient.text = orderItem.recipient ?: ""
+        viewHolder.purpose.text = orderItem.purpose ?: ""
+        viewHolder.amount.text = orderItem.amount ?: ""
+
+    }
+
+    override fun getItemCount() = dataSet.size
+}
diff --git a/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/orders/ui/OrdersViewModel.kt b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/orders/ui/OrdersViewModel.kt
new file mode 100644
index 0000000000..58cfa50331
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/orders/ui/OrdersViewModel.kt
@@ -0,0 +1,92 @@
+package net.gini.android.merchant.sdk.exampleapp.orders.ui
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+import net.gini.android.merchant.sdk.GiniMerchant
+import net.gini.android.merchant.sdk.exampleapp.orders.data.OrdersRepository
+import net.gini.android.merchant.sdk.exampleapp.orders.data.model.Order
+import net.gini.android.merchant.sdk.exampleapp.orders.ui.model.OrderItem
+import net.gini.android.merchant.sdk.integratedFlow.PaymentFlowConfiguration
+import net.gini.android.merchant.sdk.integratedFlow.PaymentFragment
+import org.slf4j.LoggerFactory
+
+class OrdersViewModel(
+    private val ordersRepository: OrdersRepository,
+    val giniMerchant: GiniMerchant
+) : ViewModel() {
+
+    val ordersFlow = ordersRepository.ordersFlow.map { orders ->
+        orders.map { order -> OrderItem.fromOrder(order) }
+    }
+
+    private val _selectedOrderItem: MutableStateFlow<OrderItem?> = MutableStateFlow(null)
+    val selectedOrderItem: StateFlow<OrderItem?> = _selectedOrderItem
+
+    private val _startIntegratedPaymentFlow = MutableSharedFlow<PaymentFragment>(
+        extraBufferCapacity = 1
+    )
+    val startIntegratedPaymentFlow = _startIntegratedPaymentFlow
+
+    private val _errorsFlow = MutableSharedFlow<String>(extraBufferCapacity = 1)
+    val errorsFlow: SharedFlow<String> = _errorsFlow
+
+    private var paymentFlowConfiguration: PaymentFlowConfiguration? = null
+
+    private var _finishPaymentFlow = MutableStateFlow<Boolean?>(null)
+    val finishPaymentFlow: StateFlow<Boolean?> = _finishPaymentFlow
+
+    fun startObservingPaymentFlow() = viewModelScope.launch {
+        giniMerchant.eventsFlow.collect { event ->
+            when (event) {
+                is GiniMerchant.MerchantSDKEvents.OnFinishedWithPaymentRequestCreated,
+                is GiniMerchant.MerchantSDKEvents.OnFinishedWithCancellation -> {
+                    _finishPaymentFlow.tryEmit(true)
+                }
+                else -> {}
+            }
+        }
+    }
+
+    fun loadPaymentProviderApps() {
+        viewModelScope.launch {
+            giniMerchant.loadPaymentProviderApps()
+        }
+    }
+
+    fun setSelectedOrderItem(orderItem: OrderItem?) = viewModelScope.launch {
+        _selectedOrderItem.emit(orderItem)
+    }
+
+    fun startPaymentFlow(order: Order) {
+        try {
+            _startIntegratedPaymentFlow.tryEmit(giniMerchant.createFragment(
+                recipient = order.recipient,
+                iban = order.iban,
+                purpose = order.purpose,
+                amount = order.amount.replace(":[A-Z]{3}$".toRegex(), ""),
+                flowConfiguration = paymentFlowConfiguration))
+        } catch (e: IllegalStateException) {
+            LOG.error(e.message)
+            _errorsFlow.tryEmit(e.message ?: "")
+        }
+    }
+
+    fun setIntegratedFlowConfiguration(flowConfiguration: PaymentFlowConfiguration) {
+        this.paymentFlowConfiguration = flowConfiguration
+    }
+
+    fun resetFinishPaymentFlow() {
+        _finishPaymentFlow.tryEmit(null)
+    }
+
+    companion object {
+        private val LOG = LoggerFactory.getLogger(OrdersViewModel::class.java)
+
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/orders/ui/model/OrderItem.kt b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/orders/ui/model/OrderItem.kt
new file mode 100644
index 0000000000..0427cf8f31
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/orders/ui/model/OrderItem.kt
@@ -0,0 +1,79 @@
+package net.gini.android.merchant.sdk.exampleapp.orders.ui.model
+
+import net.gini.android.merchant.sdk.exampleapp.orders.data.model.Order
+import java.math.BigDecimal
+import java.text.DecimalFormat
+import java.text.DecimalFormatSymbols
+import java.text.NumberFormat
+import java.text.ParseException
+import java.util.Currency
+import java.util.Locale
+
+private val PRICE_STRING_REGEX = "^-?[0-9]+([.,])[0-9]+\$".toRegex()
+
+data class OrderItem(
+    val order: Order,
+    val recipient: String,
+    val amount: String,
+    val purpose: String
+) {
+
+    companion object {
+        fun fromOrder(order: Order): OrderItem {
+            return OrderItem(
+                order = order,
+                recipient = order.recipient,
+                amount = parseAmount(order.amount),
+                purpose = order.purpose
+            )
+        }
+
+        private fun parseAmount(amount: String): String = amount.split(":").let { substrings ->
+            if (substrings.size != 2) {
+                throw java.lang.NumberFormatException(
+                    "Invalid price format. Expected <Price>:<Currency Code>, but got: $amount"
+                )
+            }
+            val price = parsePrice(substrings[0])
+            val currency = Currency.getInstance(substrings[1])
+
+            val numberFormat = NumberFormat.getCurrencyInstance()
+            numberFormat.maximumFractionDigits = 2
+            numberFormat.currency = currency
+
+            return numberFormat.format(price)
+        }
+
+        private fun parsePrice(price: String): BigDecimal =
+            if (price matches PRICE_STRING_REGEX) {
+                when {
+                    price.contains(".") -> {
+                        parsePriceWithLocale(price, Locale.ENGLISH)
+                    }
+
+                    price.contains(",") -> {
+                        parsePriceWithLocale(price, Locale.GERMAN)
+                    }
+
+                    else -> {
+                        throw NumberFormatException("Unknown number format locale")
+                    }
+                }
+            } else {
+                throw NumberFormatException("Invalid number format")
+            }
+
+        private fun parsePriceWithLocale(price: String, locale: Locale) = DecimalFormat(
+            "0.00",
+            DecimalFormatSymbols.getInstance(locale)
+        )
+            .apply { isParseBigDecimal = true }
+            .run {
+                try {
+                    parse(price) as BigDecimal
+                } catch (e: ParseException) {
+                    throw NumberFormatException(e.message)
+                }
+            }
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/util/Extensions.kt b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/util/Extensions.kt
new file mode 100644
index 0000000000..91b041fe48
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/java/net/gini/android/merchant/sdk/exampleapp/util/Extensions.kt
@@ -0,0 +1,14 @@
+package net.gini.android.merchant.sdk.exampleapp.util
+
+import java.io.ByteArrayOutputStream
+import java.io.InputStream
+
+fun InputStream.getBytes(): ByteArray {
+    val byteBuffer = ByteArrayOutputStream()
+    val buffer = ByteArray(1024)
+    var len: Int
+    while (this.read(buffer).also { len = it } != -1) {
+        byteBuffer.write(buffer, 0, len)
+    }
+    return byteBuffer.toByteArray()
+}
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/merchant-sdk/example-app/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 0000000000..2b068d1146
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/main/res/drawable/dot_selected.xml b/merchant-sdk/example-app/src/main/res/drawable/dot_selected.xml
new file mode 100644
index 0000000000..0c6887a6c8
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/res/drawable/dot_selected.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape
+            android:innerRadius="0dp"
+            android:shape="ring"
+            android:thickness="@dimen/indicator_size"
+            android:useLevel="false">
+            <solid android:color="@color/gms_color_contrast_03"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/main/res/drawable/dot_unselected.xml b/merchant-sdk/example-app/src/main/res/drawable/dot_unselected.xml
new file mode 100644
index 0000000000..d8f74d490e
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/res/drawable/dot_unselected.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape
+            android:innerRadius="0dp"
+            android:shape="ring"
+            android:thickness="@dimen/indicator_size"
+            android:useLevel="false">
+            <solid android:color="@color/gms_color_03"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/main/res/drawable/gini_logo.xml b/merchant-sdk/example-app/src/main/res/drawable/gini_logo.xml
new file mode 100644
index 0000000000..6629120b64
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/res/drawable/gini_logo.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="114dp"
+    android:height="72dp"
+    android:viewportWidth="114"
+    android:viewportHeight="72">
+  <path
+      android:pathData="M107.41,0.02H107.68C107.77,0.02 107.86,0.02 107.95,0C108.09,0 108.22,0.02 108.35,0.04L108.41,0.05C108.66,0.07 108.88,0.12 109.11,0.19C109.66,0.33 110.2,0.56 110.68,0.89C111.16,1.19 111.59,1.59 111.95,2.03C112.34,2.48 112.64,2.97 112.84,3.53C113.11,4.19 113.25,4.93 113.25,5.66C113.25,5.9 113.23,6.11 113.21,6.35L113.21,6.35L113.21,6.35L113.2,6.41C113.18,6.66 113.14,6.9 113.07,7.13C112.93,7.69 112.7,8.25 112.39,8.75C112.09,9.24 111.7,9.68 111.27,10.05C110.84,10.45 110.36,10.76 109.82,10.97C109.18,11.25 108.45,11.39 107.75,11.39C107.52,11.39 107.31,11.37 107.08,11.35L107.02,11.34C106.77,11.32 106.54,11.27 106.32,11.2C105.77,11.06 105.22,10.83 104.75,10.5C104.27,10.2 103.84,9.8 103.47,9.35C103.09,8.91 102.79,8.42 102.59,7.86C102.31,7.2 102.18,6.45 102.18,5.73C102.18,5.49 102.2,5.27 102.22,5.04V5.04V5.04L102.22,4.98C102.25,4.72 102.29,4.49 102.36,4.26C102.5,3.69 102.72,3.13 103.04,2.64C103.34,2.15 103.72,1.71 104.15,1.33C104.59,0.94 105.06,0.63 105.61,0.42C106.18,0.19 106.79,0.05 107.41,0.02ZM112.68,15.55V24.11L112.7,24.16V44.64C112.68,45.06 112.66,45.46 112.61,45.88C112.57,46.3 112.5,46.72 112.41,47.14C112.27,47.8 112.07,48.43 111.77,49.01C111.5,49.55 111.16,50.04 110.73,50.46C110.29,50.91 109.79,51.23 109.27,51.51C108.59,51.89 107.84,52.12 107.09,52.29C106.22,52.5 105.36,52.59 104.5,52.64C104.11,52.66 103.7,52.68 103.31,52.68H102.68V23.66C102.68,23.36 102.7,23.06 102.72,22.75L102.72,22.75C102.75,22.36 102.79,21.96 102.86,21.56C102.97,20.88 103.15,20.18 103.43,19.55C103.65,19.03 103.93,18.54 104.29,18.12C104.63,17.7 105.04,17.33 105.5,17.05C106.13,16.6 106.88,16.3 107.66,16.09C107.77,16.04 107.88,16.02 108,16L108.34,15.92C108.6,15.86 108.88,15.82 109.14,15.78L109.25,15.76C109.57,15.71 109.91,15.67 110.23,15.64C110.41,15.63 110.58,15.62 110.76,15.61C110.94,15.6 111.11,15.59 111.29,15.57C111.7,15.55 112.09,15.55 112.5,15.55H112.68ZM78.12,12.46C77.8,12.46 77.48,12.46 77.16,12.49C75,12.58 72.82,13.05 70.8,13.91C68.91,14.66 67.16,15.76 65.64,17.09C64.09,18.4 62.75,19.97 61.66,21.7C60.54,23.45 59.7,25.39 59.2,27.4C59,28.22 58.84,29.07 58.72,29.93C58.66,30.47 58.61,31.01 58.59,31.57C58.56,31.89 58.56,32.22 58.56,32.57V52.68H59.2C60.47,52.66 61.75,52.59 62.98,52.28C63.73,52.12 64.48,51.89 65.16,51.51C65.68,51.23 66.18,50.91 66.61,50.46C67.05,50.04 67.39,49.55 67.66,49.01C67.96,48.43 68.16,47.8 68.3,47.14C68.39,46.72 68.46,46.3 68.5,45.85C68.55,45.43 68.57,45.04 68.59,44.62V32.55C68.59,32.39 68.59,32.22 68.61,32.06C68.66,30.96 68.89,29.88 69.3,28.85C69.66,27.92 70.16,27.03 70.8,26.26C71.41,25.49 72.16,24.81 72.98,24.27C73.82,23.71 74.73,23.29 75.69,23.03C76.07,22.92 76.48,22.85 76.89,22.8L76.89,22.8C77.3,22.75 77.71,22.7 78.14,22.73C79.37,22.73 80.6,22.96 81.71,23.43C82.62,23.8 83.49,24.32 84.24,24.97C84.99,25.6 85.65,26.38 86.17,27.22C86.6,27.9 86.94,28.64 87.19,29.42C87.46,30.26 87.65,31.15 87.67,32.03V32.03C87.67,32.2 87.67,32.36 87.69,32.53V44.59C87.71,45.64 87.81,46.7 88.12,47.7C88.28,48.31 88.53,48.92 88.87,49.43C89.19,49.92 89.58,50.39 90.03,50.76C90.51,51.16 91.03,51.47 91.6,51.7C92.44,52.07 93.35,52.28 94.26,52.4C94.74,52.47 95.22,52.52 95.7,52.57L95.7,52.57L95.7,52.57C96.15,52.59 96.61,52.61 97.08,52.64H97.72V32.53C97.72,32.2 97.72,31.87 97.7,31.54C97.61,29.3 97.15,27.08 96.31,25C95.58,23.06 94.51,21.26 93.22,19.69C91.94,18.1 90.42,16.72 88.74,15.62C87.03,14.47 85.15,13.61 83.19,13.09C82.39,12.86 81.58,12.72 80.73,12.6C80.21,12.53 79.69,12.49 79.14,12.46C78.88,12.48 78.65,12.47 78.43,12.47C78.33,12.47 78.22,12.46 78.12,12.46ZM43.56,44.64V15.55C43.76,15.55 43.97,15.55 44.19,15.53C44.67,15.55 45.13,15.57 45.58,15.6L45.58,15.6L45.58,15.6C46.06,15.64 46.54,15.69 47.01,15.76C47.92,15.88 48.83,16.09 49.67,16.46C50.24,16.7 50.77,17 51.24,17.4C51.7,17.77 52.08,18.24 52.4,18.73C52.74,19.25 52.99,19.85 53.15,20.46C53.52,21.63 53.56,22.89 53.59,24.13V26.42V28.72V34.42V40.13V45.83V50.11V51.82V52.68H52.95C52.47,52.66 52.02,52.64 51.56,52.61C51.08,52.57 50.61,52.52 50.13,52.45C49.22,52.33 48.31,52.12 47.47,51.75C46.9,51.51 46.38,51.21 45.9,50.81C45.44,50.44 45.06,49.97 44.74,49.48C44.4,48.97 44.15,48.36 43.99,47.75C43.67,46.74 43.58,45.69 43.56,44.64Z"
+      android:fillColor="#009EDC"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M47.93,0.14C48.15,0.11 48.35,0.11 48.58,0.11C48.67,0.11 48.76,0.11 48.8,0C48.88,0.01 48.96,0.02 49.03,0.02C49.1,0.03 49.18,0.03 49.26,0.05C49.48,0.07 49.71,0.11 49.93,0.18C50.47,0.32 51.01,0.55 51.49,0.87C51.96,1.16 52.39,1.55 52.75,1.98C53.11,2.41 53.4,2.92 53.61,3.44C53.88,4.1 54.01,4.81 54.01,5.51C54.01,5.76 53.99,6.01 53.97,6.24C53.94,6.49 53.9,6.72 53.83,6.95C53.7,7.49 53.47,8.04 53.15,8.52C52.86,9 52.48,9.43 52.05,9.79C51.62,10.16 51.13,10.45 50.61,10.66C50.2,10.82 49.77,10.93 49.35,11C49.16,11.02 48.98,11.05 48.8,11.05H48.38C48.31,11.02 48.24,11.02 48.17,11.02C48.14,11.02 48.11,11.02 48.07,11.01C48.04,11.01 48,11 47.97,11C47.94,11 47.9,11 47.87,10.99C47.83,10.98 47.8,10.98 47.77,10.98C47.73,10.97 47.69,10.96 47.65,10.95C47.62,10.95 47.58,10.94 47.54,10.93H47.45C47.44,10.93 47.42,10.93 47.41,10.92C47.39,10.92 47.37,10.91 47.36,10.91C47.35,10.91 47.33,10.9 47.32,10.9C47.3,10.89 47.28,10.89 47.27,10.89C47.26,10.89 47.24,10.88 47.23,10.88C47.21,10.87 47.19,10.86 47.18,10.86C47.17,10.85 47.15,10.85 47.13,10.84C47.11,10.84 47.09,10.83 47.07,10.82H47.02C47,10.82 46.98,10.81 46.96,10.81C46.95,10.8 46.94,10.8 46.93,10.8C46.91,10.8 46.9,10.79 46.89,10.79C46.88,10.78 46.87,10.77 46.84,10.77C46.82,10.77 46.8,10.77 46.78,10.76C46.77,10.75 46.76,10.75 46.75,10.75C46.73,10.75 46.69,10.75 46.66,10.73C46.66,10.73 46.64,10.71 46.62,10.71C46.62,10.71 46.6,10.68 46.57,10.68C46.53,10.68 46.48,10.66 46.44,10.64L46.3,10.57L46.17,10.5C46.1,10.48 46.05,10.45 46.01,10.43C46.01,10.43 45.99,10.41 45.96,10.41C45.96,10.39 45.94,10.39 45.94,10.39C45.94,10.36 45.92,10.36 45.92,10.36C45.91,10.36 45.9,10.36 45.9,10.35C45.89,10.35 45.88,10.34 45.87,10.34C45.86,10.34 45.85,10.34 45.84,10.33C45.83,10.32 45.82,10.32 45.81,10.32C45.81,10.32 45.78,10.3 45.76,10.3C45.74,10.28 45.72,10.27 45.69,10.25C45.67,10.23 45.65,10.22 45.63,10.2C45.6,10.19 45.58,10.18 45.56,10.16C45.54,10.14 45.51,10.12 45.49,10.11C45.47,10.1 45.45,10.08 45.42,10.07C45.4,10.05 45.38,10.03 45.36,10.02C45.34,10.01 45.33,10 45.31,9.99C45.29,9.98 45.28,9.97 45.27,9.95C45.25,9.95 45.25,9.95 45.24,9.94C45.24,9.94 45.23,9.93 45.22,9.93C45.22,9.91 45.2,9.91 45.2,9.91C45.06,9.93 44.95,9.93 44.81,9.93C44.66,9.93 44.5,9.95 44.35,9.97C44.28,9.98 44.22,9.99 44.16,10C43.8,10.04 43.44,10.14 43.1,10.23C42.18,10.48 41.28,10.86 40.42,11.34C39.49,11.84 38.62,12.41 37.78,13.05C36.92,13.69 36.09,14.4 35.32,15.12C34.78,15.65 34.24,16.19 33.72,16.76C33.66,16.83 33.6,16.9 33.53,16.98C33.41,17.11 33.28,17.25 33.16,17.4C33.11,17.46 33.07,17.51 33.02,17.56C32.98,17.61 32.93,17.66 32.89,17.72L33.07,17.9C33.11,17.96 33.17,18.01 33.22,18.06C33.27,18.11 33.32,18.17 33.36,18.22C33.5,18.36 33.63,18.51 33.76,18.66C33.78,18.68 33.8,18.7 33.81,18.72C34.17,19.16 34.53,19.61 34.87,20.07C35.21,20.52 35.53,21 35.82,21.5C36.14,22 36.41,22.5 36.65,23.03C36.95,23.64 37.22,24.3 37.47,24.94L37.67,25.49C37.7,25.58 37.73,25.67 37.76,25.76C37.79,25.85 37.81,25.94 37.85,26.03C38.01,26.49 38.14,26.97 38.25,27.42C38.39,27.9 38.48,28.36 38.57,28.84C38.66,29.31 38.73,29.79 38.77,30.27C38.84,30.86 38.86,31.43 38.86,32.03C38.86,32.87 38.82,33.73 38.71,34.58C38.59,35.42 38.46,36.24 38.23,37.04C37.74,39 36.9,40.89 35.8,42.59C34.74,44.28 33.41,45.81 31.87,47.08C30.36,48.38 28.63,49.45 26.76,50.18C25.32,50.77 23.83,51.16 22.32,51.39C21.71,51.48 21.08,51.55 20.45,51.57C20.13,51.59 19.81,51.59 19.5,51.59H19.5H12.33C12.3,51.59 12.26,51.6 12.23,51.6C12.2,51.61 12.16,51.61 12.13,51.61C12.08,51.63 12.03,51.64 11.98,51.65C11.93,51.66 11.88,51.67 11.83,51.68C11.61,51.75 11.36,51.86 11.16,52C10.93,52.14 10.75,52.3 10.59,52.5C10.44,52.71 10.3,52.94 10.21,53.16C10.12,53.35 10.08,53.55 10.05,53.73C10.03,53.8 10.03,53.87 10.03,53.96V54.07V54.19C10.03,54.22 10.04,54.26 10.04,54.29C10.05,54.32 10.05,54.36 10.05,54.39C10.07,54.45 10.08,54.5 10.09,54.55C10.1,54.6 10.11,54.65 10.12,54.71C10.19,54.96 10.3,55.19 10.44,55.42C10.57,55.62 10.73,55.83 10.93,55.99C11.14,56.15 11.34,56.28 11.59,56.37C11.86,56.49 12.13,56.53 12.4,56.56H32.98C33.18,56.56 33.41,56.56 33.61,56.58C33.76,56.58 33.91,56.6 34.05,56.62C34.11,56.63 34.18,56.64 34.24,56.65C34.47,56.69 34.68,56.74 34.9,56.8C34.94,56.81 34.99,56.82 35.03,56.83C35.91,57.06 36.74,57.47 37.49,58.04C38.21,58.56 38.84,59.24 39.31,60C39.81,60.75 40.17,61.59 40.37,62.48C40.6,63.39 40.64,64.35 40.51,65.28C40.4,66.28 40.06,67.29 39.58,68.17C39.18,68.97 38.64,69.7 38.03,70.36C37.65,70.75 37.26,71.13 36.83,71.48C36.72,71.57 36.6,71.65 36.48,71.74C36.37,71.82 36.25,71.91 36.14,72C36.14,71.95 36.13,71.9 36.12,71.85C36.12,71.8 36.11,71.75 36.11,71.7C36.11,71.61 36.11,71.5 36.09,71.41C36.09,71.29 36.07,71.19 36.05,71.07C36.05,71.05 36.05,71.04 36.05,71.02C35.98,70.54 35.82,70.06 35.62,69.63C35.41,69.2 35.17,68.81 34.85,68.47C34.53,68.13 34.17,67.83 33.77,67.58C33.27,67.26 32.73,67.06 32.17,66.9C31.38,66.67 30.59,66.58 29.78,66.56H11.86L11.61,66.53H11.56L11.32,66.51H11.23L11.07,66.49H11.02L10.91,66.46H10.87L10.71,66.44H10.62L10.46,66.42H10.1L10.01,66.4H9.87L9.74,66.37L9.69,66.35L9.65,66.33L9.58,66.31L9.45,66.26L9.4,66.24C9.33,66.21 9.27,66.2 9.21,66.18C9.15,66.16 9.08,66.15 9.02,66.12C8.79,66.06 8.59,65.99 8.39,65.92L8.39,65.92C8.31,65.89 8.23,65.86 8.15,65.83C7.9,65.73 7.66,65.63 7.42,65.51C6.63,65.14 5.88,64.69 5.18,64.16C4.49,63.66 3.85,63.07 3.29,62.41C2.73,61.77 2.21,61.07 1.8,60.29C1.28,59.36 0.9,58.36 0.61,57.35C0.56,57.26 0.54,57.17 0.52,57.08L0.45,56.81C0.39,56.61 0.35,56.4 0.31,56.2C0.31,56.17 0.3,56.13 0.29,56.1C0.29,56.07 0.28,56.03 0.27,56C0.24,55.79 0.2,55.59 0.18,55.37C0.16,55.14 0.14,54.89 0.11,54.64C0.09,54.32 0.09,54.03 0.09,53.73C0.09,53.41 0.09,53.12 0.11,52.82C0.14,52.53 0.16,52.23 0.2,51.93C0.29,51.23 0.47,50.5 0.7,49.81C0.92,49.15 1.19,48.49 1.53,47.86C1.87,47.24 2.25,46.63 2.68,46.08C3,45.67 3.36,45.26 3.72,44.89L3.72,44.89C3.85,44.76 4.01,44.6 4.17,44.46C4.24,44.39 4.31,44.33 4.4,44.26C4.37,44.23 4.35,44.21 4.33,44.18C4.31,44.15 4.28,44.12 4.26,44.1C4.17,43.98 4.1,43.89 4.04,43.8C3.92,43.66 3.81,43.51 3.7,43.35C3.4,42.96 3.16,42.55 2.91,42.14C2.66,41.73 2.43,41.32 2.21,40.89C1.98,40.45 1.78,40.02 1.6,39.56C1.4,39.1 1.24,38.6 1.07,38.11C1.05,38.05 1.03,37.99 1.01,37.92C0.95,37.77 0.9,37.61 0.86,37.45L0.72,36.97C0.61,36.56 0.52,36.17 0.43,35.76C0.34,35.35 0.27,34.94 0.2,34.53C0.14,34.12 0.09,33.71 0.07,33.28C0.02,32.75 0,32.25 0,31.73C0,30.86 0.05,30.02 0.16,29.18C0.27,28.36 0.41,27.54 0.63,26.74C1.13,24.78 1.96,22.89 3.07,21.23C4.13,19.52 5.46,18.02 6.99,16.74C8.52,15.42 10.26,14.37 12.11,13.64C13.53,13.05 15.01,12.66 16.52,12.44C17.13,12.35 17.76,12.28 18.39,12.25C18.71,12.23 19.03,12.23 19.34,12.23H19.68C19.77,12.23 19.86,12.24 19.95,12.24C20.04,12.25 20.13,12.25 20.22,12.25C20.37,12.27 20.51,12.28 20.65,12.29C20.79,12.3 20.93,12.31 21.08,12.32C21.78,12.37 22.47,12.48 23.17,12.62C23.87,12.76 24.55,12.94 25.2,13.14C25.86,13.35 26.51,13.6 27.14,13.87C27.61,14.08 28.07,14.3 28.52,14.55C28.7,14.65 28.88,14.74 29.06,14.85C29.1,14.87 29.15,14.9 29.19,14.93C29.24,14.96 29.28,14.99 29.33,15.01L29.33,15.01C29.42,14.81 29.51,14.6 29.6,14.42C29.82,13.94 30.09,13.48 30.36,13.03C30.7,12.48 31.06,11.94 31.45,11.41C32.46,9.95 33.61,8.63 34.87,7.38C36.18,6.08 37.58,4.87 39.07,3.83C40.49,2.8 42,1.89 43.62,1.23C44.99,0.64 46.44,0.23 47.93,0.14ZM10.03,31.59V32.07C10.03,32.12 10.03,32.14 10.01,32.23V32.41C10.03,32.5 10.03,32.62 10.03,32.71C10.03,32.96 10.05,33.19 10.1,33.44C10.12,33.55 10.14,33.67 10.17,33.79C10.19,33.91 10.21,34.03 10.23,34.14C10.28,34.37 10.35,34.6 10.41,34.83L10.41,34.83C10.48,35.1 10.57,35.37 10.69,35.62C10.8,35.87 10.93,36.15 11.07,36.4C11.17,36.61 11.29,36.8 11.42,36.99C11.45,37.04 11.48,37.09 11.52,37.15C11.9,37.74 12.38,38.31 12.92,38.79C13.46,39.27 14.02,39.7 14.65,40.06C15.28,40.43 15.96,40.72 16.66,40.93C17.2,41.09 17.74,41.18 18.3,41.25C18.53,41.27 18.76,41.29 18.98,41.29H19.32C19.48,41.27 19.63,41.27 19.79,41.27C19.96,41.27 20.14,41.25 20.32,41.23C20.4,41.22 20.48,41.21 20.56,41.2C20.94,41.16 21.35,41.09 21.73,40.98C22.68,40.75 23.6,40.34 24.41,39.79C25.22,39.27 25.97,38.61 26.58,37.85C27.21,37.1 27.7,36.24 28.07,35.33C28.36,34.62 28.54,33.89 28.65,33.14C28.7,32.82 28.72,32.53 28.74,32.21C28.76,32.05 28.76,31.89 28.76,31.73V31.27C28.75,31.18 28.75,31.08 28.74,30.99C28.74,30.89 28.73,30.79 28.72,30.7L28.65,30.16C28.64,30.09 28.63,30.01 28.61,29.93C28.59,29.83 28.57,29.73 28.56,29.63C28.55,29.56 28.53,29.5 28.52,29.43C28.5,29.29 28.47,29.15 28.43,29.02C28.37,28.73 28.25,28.48 28.13,28.22C28.12,28.19 28.1,28.16 28.09,28.13C27.95,27.83 27.82,27.56 27.66,27.29C27.28,26.6 26.8,25.97 26.26,25.42C25.72,24.87 25.11,24.37 24.46,23.96C23.8,23.53 23.08,23.19 22.34,22.96C21.42,22.64 20.45,22.5 19.48,22.5C19.05,22.5 18.64,22.55 18.24,22.59C17.83,22.64 17.43,22.71 17.04,22.82C16.1,23.05 15.19,23.46 14.36,24.01C13.55,24.53 12.8,25.19 12.2,25.94C11.56,26.69 11.07,27.56 10.71,28.47C10.3,29.47 10.08,30.52 10.03,31.59Z"
+      android:fillColor="#009EDC"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/merchant-sdk/example-app/src/main/res/drawable/ic_close.xml b/merchant-sdk/example-app/src/main/res/drawable/ic_close.xml
new file mode 100644
index 0000000000..9f1eb74239
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/res/drawable/ic_close.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M16.7071,4.7071C17.0976,4.3166 17.0976,3.6834 16.7071,3.2929C16.3166,2.9024 15.6834,2.9024 15.2929,3.2929L10,8.5858L4.7071,3.2929C4.3166,2.9024 3.6834,2.9024 3.2929,3.2929C2.9024,3.6834 2.9024,4.3166 3.2929,4.7071L8.5858,10L3.2929,15.2929C2.9024,15.6834 2.9024,16.3166 3.2929,16.7071C3.6834,17.0976 4.3166,17.0976 4.7071,16.7071L10,11.4142L15.2929,16.7071C15.6834,17.0976 16.3166,17.0976 16.7071,16.7071C17.0976,16.3166 17.0976,15.6834 16.7071,15.2929L11.4142,10L16.7071,4.7071Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/merchant-sdk/example-app/src/main/res/drawable/ic_launcher_background.xml b/merchant-sdk/example-app/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 0000000000..ca3826a46c
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    android:height="108dp"
+    android:width="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#3DDC84"
+          android:pathData="M0,0h108v108h-108z"/>
+    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+</vector>
diff --git a/merchant-sdk/example-app/src/main/res/drawable/tab_pager_selector.xml b/merchant-sdk/example-app/src/main/res/drawable/tab_pager_selector.xml
new file mode 100644
index 0000000000..157d397828
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/res/drawable/tab_pager_selector.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/dot_selected" android:state_selected="true"/>
+    <item android:drawable="@drawable/dot_unselected"/>
+</selector>
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/main/res/layout/activity_main.xml b/merchant-sdk/example-app/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000000..989f0e438e
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="@dimen/gms_medium"
+    tools:context=".MainActivity">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <ImageView
+                android:id="@+id/iv_giniLogo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/gms_large_60"
+                android:src="@drawable/gini_logo"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/tv_welcomeToGini"
+                style="@style/Typography.Headline5"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/gms_large_32"
+                android:text="@string/welcome_to_gini"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/iv_giniLogo" />
+
+            <TextView
+                android:id="@+id/tv_exampleOfPhotoPayment"
+                style="@style/Typography.Body1"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/gms_large_48"
+                android:layout_marginVertical="@dimen/gms_medium_12"
+                android:gravity="center"
+                android:text="@string/example_of_merchant_sdk"
+                android:textAlignment="center"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_welcomeToGini" />
+
+            <Button
+                android:id="@+id/invoices_screen"
+                style="@style/Widget.Button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/orders_screen"
+                android:layout_marginBottom="@dimen/gms_large"
+                app:layout_constraintBottom_toTopOf="@id/gini_merchant_version"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
+            <TextView
+                android:id="@+id/gini_merchant_version"
+                style="@style/GiniMerchantTheme.Typography.Caption2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:layout_marginBottom="@dimen/gms_medium_12"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                tools:text="Gini Merchant SDK v2.0.0-stub1" />
+
+            <ProgressBar
+                android:id="@+id/loading_indicator"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:visibility="invisible"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </ScrollView>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/configuration_container"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/main/res/layout/activity_orders.xml b/merchant-sdk/example-app/src/main/res/layout/activity_orders.xml
new file mode 100644
index 0000000000..b660b0e702
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/res/layout/activity_orders.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".orders.ui.OrdersActivity">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/orders_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:itemCount="5"
+        tools:listitem="@layout/item_order" />
+
+    <TextView
+        android:id="@+id/no_orders_label"
+        style="@style/Typography.Body1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/no_orders"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/loading_indicator_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clickable="true"
+        android:visibility="invisible"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ProgressBar
+            android:id="@+id/loading_indicator"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="invisible"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/main/res/layout/fragment_configuration.xml b/merchant-sdk/example-app/src/main/res/layout/fragment_configuration.xml
new file mode 100644
index 0000000000..5ee043ad4f
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/res/layout/fragment_configuration.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:layout_marginHorizontal="@dimen/gms_medium_12"
+    android:layout_marginTop="@dimen/gms_medium_10"
+    android:background="?android:windowBackground"
+    >
+    <TextView
+        android:id="@+id/tv_relaunchForDefaultConfiguration"
+        style="@style/TextAppearance.MaterialComponents.Body1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/relaunch_to_use_default_configuration"
+        />
+
+    <TextView
+        android:id="@+id/tv_closeForConfigurationsToTakePlace"
+        style="@style/TextAppearance.MaterialComponents.Body1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/close_screen_for_configurations_to_take_place"
+        android:layout_marginTop="@dimen/gms_medium_12"
+        />
+
+    <com.google.android.material.divider.MaterialDivider
+        android:id="@+id/divider2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gms_medium" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/gms_show_review_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:checked="false"
+        android:text="@string/show_review_screen"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/main/res/layout/fragment_order_details.xml b/merchant-sdk/example-app/src/main/res/layout/fragment_order_details.xml
new file mode 100644
index 0000000000..b3e02fc339
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/res/layout/fragment_order_details.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/gms_payment_input_background_color"
+    android:clickable="true"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:orientation="vertical"
+    android:paddingHorizontal="@dimen/gms_large">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gms_large"
+        android:orientation="vertical"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/recipient_input_layout"
+            style="@style/Example.Widget.MaterialComponents.TextInputLayout.FilledBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/gms_medium"
+            android:hint="@string/recipient"
+            app:boxBackgroundColor="#ffffff">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/recipient"
+                android:layout_width="match_parent"
+                style="@style/Example.Widget.TextInputEditText"
+                android:textColor="@color/black"
+                android:layout_height="wrap_content" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/iban_input_layout"
+            style="@style/Example.Widget.MaterialComponents.TextInputLayout.FilledBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/gms_medium"
+            android:hint="@string/iban"
+            app:boxBackgroundColor="#ffffff">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/iban"
+                style="@style/Example.Widget.TextInputEditText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/amount_input_layout"
+            style="@style/Example.Widget.MaterialComponents.TextInputLayout.FilledBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/gms_medium"
+            android:hint="@string/amount"
+            app:boxBackgroundColor="#ffffff">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/amount"
+                style="@style/Example.Widget.TextInputEditText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/purpose_input_layout"
+            style="@style/Example.Widget.MaterialComponents.TextInputLayout.FilledBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/gms_medium"
+            android:hint="@string/purpose"
+            app:boxBackgroundColor="#ffffff">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/purpose"
+                style="@style/Example.Widget.TextInputEditText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/pay_now_btn"
+        style="@style/GiniMerchantTheme.Widget.Button.UnelevatedButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/gms_large"
+        android:text="@string/pay_now"
+        app:layout_constraintBottom_toBottomOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/main/res/layout/item_order.xml b/merchant-sdk/example-app/src/main/res/layout/item_order.xml
new file mode 100644
index 0000000000..901fbba61f
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/res/layout/item_order.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/recipient"
+        style="@style/Typography.Headline6"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/gms_large"
+        android:layout_marginTop="@dimen/gms_large"
+        android:ellipsize="end"
+        android:maxLines="1"
+        app:layout_constraintBottom_toTopOf="@id/purpose"
+        app:layout_constraintEnd_toStartOf="@id/amount"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Recipient Recipient Recipient Recipient Recipient Recipient " />
+
+    <TextView
+        android:id="@+id/purpose"
+        style="@style/Typography.Body1"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/gms_large"
+        android:layout_marginBottom="@dimen/gms_large"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/recipient"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:text="Purpose Purpose Purpose" />
+
+    <TextView
+        android:id="@+id/amount"
+        style="@style/Typography.Body1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/gms_medium"
+        android:layout_marginEnd="@dimen/gms_large"
+        android:textAlignment="textEnd"
+        android:textColor="@color/gms_accent_01"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/recipient"
+        app:layout_constraintTop_toTopOf="@id/recipient"
+        app:layout_constraintBottom_toBottomOf="@id/purpose"
+        tools:text="Amount" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/main/res/menu/orders_menu.xml b/merchant-sdk/example-app/src/main/res/menu/orders_menu.xml
new file mode 100644
index 0000000000..c53cfd76fa
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/res/menu/orders_menu.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:id="@+id/custom_order"
+        android:title="@string/custom_order"
+        app:showAsAction="always"/>
+</menu>
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/merchant-sdk/example-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000000..c4a603d4cc
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/merchant-sdk/example-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 0000000000..c4a603d4cc
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/main/res/mipmap-hdpi/ic_launcher.webp b/merchant-sdk/example-app/src/main/res/mipmap-hdpi/ic_launcher.webp
new file mode 100644
index 0000000000..b8b6fc1228
Binary files /dev/null and b/merchant-sdk/example-app/src/main/res/mipmap-hdpi/ic_launcher.webp differ
diff --git a/merchant-sdk/example-app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/merchant-sdk/example-app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
new file mode 100644
index 0000000000..4a0aef44d8
Binary files /dev/null and b/merchant-sdk/example-app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp differ
diff --git a/merchant-sdk/example-app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/merchant-sdk/example-app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
new file mode 100644
index 0000000000..9a349307b6
Binary files /dev/null and b/merchant-sdk/example-app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ
diff --git a/merchant-sdk/example-app/src/main/res/mipmap-mdpi/ic_launcher.webp b/merchant-sdk/example-app/src/main/res/mipmap-mdpi/ic_launcher.webp
new file mode 100644
index 0000000000..02fb483295
Binary files /dev/null and b/merchant-sdk/example-app/src/main/res/mipmap-mdpi/ic_launcher.webp differ
diff --git a/merchant-sdk/example-app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/merchant-sdk/example-app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
new file mode 100644
index 0000000000..342caf5ed1
Binary files /dev/null and b/merchant-sdk/example-app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp differ
diff --git a/merchant-sdk/example-app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/merchant-sdk/example-app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
new file mode 100644
index 0000000000..3f44532a67
Binary files /dev/null and b/merchant-sdk/example-app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ
diff --git a/merchant-sdk/example-app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/merchant-sdk/example-app/src/main/res/mipmap-xhdpi/ic_launcher.webp
new file mode 100644
index 0000000000..e9529c4f7b
Binary files /dev/null and b/merchant-sdk/example-app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ
diff --git a/merchant-sdk/example-app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/merchant-sdk/example-app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
new file mode 100644
index 0000000000..261717091e
Binary files /dev/null and b/merchant-sdk/example-app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp differ
diff --git a/merchant-sdk/example-app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/merchant-sdk/example-app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
new file mode 100644
index 0000000000..e08cc6b532
Binary files /dev/null and b/merchant-sdk/example-app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ
diff --git a/merchant-sdk/example-app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/merchant-sdk/example-app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
new file mode 100644
index 0000000000..41d2a1f0f5
Binary files /dev/null and b/merchant-sdk/example-app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ
diff --git a/merchant-sdk/example-app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/merchant-sdk/example-app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
new file mode 100644
index 0000000000..8ef0df930c
Binary files /dev/null and b/merchant-sdk/example-app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ
diff --git a/merchant-sdk/example-app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/merchant-sdk/example-app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
new file mode 100644
index 0000000000..13b6ee7e15
Binary files /dev/null and b/merchant-sdk/example-app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ
diff --git a/merchant-sdk/example-app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/merchant-sdk/example-app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
new file mode 100644
index 0000000000..f1aad3552e
Binary files /dev/null and b/merchant-sdk/example-app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ
diff --git a/merchant-sdk/example-app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/merchant-sdk/example-app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
new file mode 100644
index 0000000000..830fdabae4
Binary files /dev/null and b/merchant-sdk/example-app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ
diff --git a/merchant-sdk/example-app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/merchant-sdk/example-app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
new file mode 100644
index 0000000000..4b2b7b5411
Binary files /dev/null and b/merchant-sdk/example-app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ
diff --git a/merchant-sdk/example-app/src/main/res/values-en/strings.xml b/merchant-sdk/example-app/src/main/res/values-en/strings.xml
new file mode 100644
index 0000000000..4f90380ebb
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/res/values-en/strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Gini Merchant</string>
+    <string name="title_activity_orders">Orders</string>
+    <string name="title_fragment_order_details">Order Details</string>
+    <string name="no_orders">No orders</string>
+    <string name="custom_order">Custom Order</string>
+    <string name="welcome_to_gini">Welcome to Gini</string>
+    <string name="example_of_merchant_sdk">Example of Gini Pay Connect integration in the merchant app</string>
+
+    <string name="gms_privacy_policy_link_url">https://www.google.com</string>
+    <string name="relaunch_to_use_default_configuration">Please relaunch the app to use the default MerchantFlowConfiguration values.</string>
+    <string name="close_screen_for_configurations_to_take_place">The configuration changes will take effect after closing this screen.</string>
+    <string name="show_review_screen">Show the Review Screen</string>
+    <string name="amount_editable">Amount field is editable</string>
+    <string name="gini_merchant_version">Gini Merchant SDK v: </string>
+    <string name="error_message">Oops, something went wrong.</string>
+    <string name="recipient">Recipient</string>
+    <string name="iban">IBAN</string>
+    <string name="amount">Amount</string>
+    <string name="purpose">Purpose</string>
+    <string name="pay_now">Pay</string>
+    <string name="orders_screen">Orders Screen</string>
+
+    <string name="payment_component_two_rows">Display payment component on two rows</string>
+    <string name="check_returning_user">Check for returning user</string>
+</resources>
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/main/res/values-night/colors.xml b/merchant-sdk/example-app/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000000..449e4816c7
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/res/values-night/colors.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="gms_color_01">#212121</color>
+    <color name="gms_color_02">#121212</color>
+    <color name="gms_color_03">#313131</color>
+    <color name="gms_color_04">#4A4A4A</color>
+    <color name="gms_color_05">#626262</color>
+    <color name="gms_color_06">#7A7A7A</color>
+
+    <color name="gms_color_contrast_01">#FFFFFF</color>
+    <color name="gms_color_contrast_02">#F2F2F2</color>
+    <color name="gms_color_contrast_03">#E5E5E5</color>
+    <color name="gms_color_contrast_04">#D9D9D9</color>
+    <color name="gms_color_contrast_05">#CCCCCC</color>
+    <color name="gms_color_contrast_06">#BFBFBF</color>
+</resources>
diff --git a/merchant-sdk/example-app/src/main/res/values-night/styles.xml b/merchant-sdk/example-app/src/main/res/values-night/styles.xml
new file mode 100644
index 0000000000..175b27a273
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/res/values-night/styles.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- region App themes and styles -->
+
+    <style name="AppTheme" parent="Root.AppTheme">
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <!-- endregion -->
+
+</resources>
diff --git a/merchant-sdk/example-app/src/main/res/values/colors.xml b/merchant-sdk/example-app/src/main/res/values/colors.xml
new file mode 100644
index 0000000000..fdd7ef7a9e
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/res/values/colors.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FED023</color>
+
+    <color name="blue_light">#D1EEF8</color>
+    <color name="blue_dark">#274FBB</color>
+    <color name="blue">#368BD5</color>
+    <color name="red">#D9004B</color>
+    <color name="yellow">#F4C50A</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+    <color name="black30">#30000000</color>
+    <color name="black80">#CC000000</color>
+    <color name="gray10">#E6E7ED</color>
+
+    <color name="gms_input_stroke_default">@color/gray10</color>
+    <color name="gms_input_stroke_active">@color/blue</color>
+
+    <color name="gms_color_01">#FFFFFF</color>
+    <color name="gms_color_02">#F2F2F2</color>
+    <color name="gms_color_03">#E5E5E5</color>
+    <color name="gms_color_04">#D9D9D9</color>
+    <color name="gms_color_05">#CCCCCC</color>
+    <color name="gms_color_06">#BFBFBF</color>
+
+    <color name="gms_color_contrast_01">#000000</color>
+    <color name="gms_color_contrast_02">#121212</color>
+    <color name="gms_color_contrast_03">#313131</color>
+    <color name="gms_color_contrast_04">#4A4A4A</color>
+    <color name="gms_color_contrast_05">#626262</color>
+    <color name="gms_color_contrast_06">#7A7A7A</color>
+</resources>
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/main/res/values/dimens.xml b/merchant-sdk/example-app/src/main/res/values/dimens.xml
new file mode 100644
index 0000000000..633deb776f
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/res/values/dimens.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="indicator_size">4dp</dimen>
+    <dimen name="toolbar_height">56dp</dimen>
+    <dimen name="gms_page_padding_top">0dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/main/res/values/strings.xml b/merchant-sdk/example-app/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..34ba849ecd
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/res/values/strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Gini Merchant</string>
+    <string name="title_activity_orders">Bestellungen</string>
+    <string name="title_fragment_order_details">Bestelldetails</string>
+    <string name="no_orders">Keine Bestellungen</string>
+    <string name="custom_order">Sonderbest.</string>
+    <string name="welcome_to_gini">Willkommen bei Gini</string>
+    <string name="example_of_merchant_sdk">Beispiel für die Integration von Gini Pay Connect in der Händler-App</string>
+
+    <string name="gms_privacy_policy_link_url">https://www.google.com</string>
+    <string name="relaunch_to_use_default_configuration">Bitte starte die App neu, um die MerchantFlowConfiguration auf Standardwerte zurückzusetzen.</string>
+    <string name="close_screen_for_configurations_to_take_place">Die Konfigurationsänderungen werden nach dem Schließen dieses Bildschirms wirksam.</string>
+    <string name="show_review_screen">Review Screen anzeigen</string>
+    <string name="amount_editable">Betrag kann bearbeitet werden</string>
+    <string name="gini_merchant_version">Gini Merchant SDK v: </string>
+    <string name="error_message">Oh da ist was schief gelaufen.</string>
+    <string name="recipient">Empfänger</string>
+    <string name="iban">IBAN</string>
+    <string name="amount">Betrag</string>
+    <string name="purpose">Vwz.</string>
+    <string name="pay_now">Bezahlen</string>
+    <string name="orders_screen">Bestellungen</string>
+
+    <string name="payment_component_two_rows">Display payment component on two rows</string>
+    <string name="check_returning_user">Check for returning user</string>
+</resources>
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/main/res/values/styles.xml b/merchant-sdk/example-app/src/main/res/values/styles.xml
new file mode 100644
index 0000000000..6b6ccb78f0
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/res/values/styles.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- region App themes and styles -->
+
+    <style name="Root.AppTheme" parent="Theme.Material3.DayNight">
+        <item name="android:windowBackground">@color/gms_color_01</item>
+        <item name="colorPrimary">@color/gms_accent_01</item>
+        <item name="colorAccent">?attr/colorPrimary</item>
+        <item name="actionBarStyle">@style/ActionBar</item>
+        <item name="colorPrimaryDark">@color/gms_color_02</item>
+        <item name="colorOnPrimary">@color/gms_color_01</item>
+        <item name="backgroundColor">@color/gms_color_02</item>
+        <item name="colorOnBackground">@color/gms_color_contrast_02</item>
+        <item name="dividerColor">@color/gms_color_03</item>
+        <item name="colorSurface">@color/gms_color_03</item>
+        <item name="colorOnSurface">?attr/colorOnBackground</item>
+        <item name="colorSurfaceInverse">@color/gms_color_contrast_03</item>
+        <item name="colorOnSurfaceInverse">@color/gms_color_02</item>
+        <item name="colorSurfaceVariant">@color/gms_color_01</item>
+        <item name="colorOnSurfaceVariant">?attr/colorOnBackground</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+    <style name="AppTheme" parent="Root.AppTheme" />
+
+    <style name="Root.ActionBar" parent="Widget.Material3.ActionBar.Solid">
+        <item name="background">?attr/colorSurface</item>na
+    </style>
+
+    <style name="ActionBar" parent="Root.ActionBar" />
+
+    <style name="Typography.Headline5" parent="TextAppearance.MaterialComponents.Headline5">
+        <item name="android:textColor">@color/gms_color_contrast_01</item>
+    </style>
+
+    <style name="Typography.Headline6" parent="TextAppearance.MaterialComponents.Headline6">
+        <item name="android:textColor">@color/gms_color_contrast_01</item>
+    </style>
+
+    <style name="Typography.Body1" parent="TextAppearance.MaterialComponents.Body1">
+        <item name="android:textColor">@color/gms_color_contrast_01</item>
+    </style>
+
+    <style name="Widget.Button" parent="Widget.Material3.Button">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.Button</item>
+        <item name="cornerRadius">4dp</item>
+    </style>
+
+    <style name="ThemeOverlay.Button" parent="ThemeOverlay.Material3.Button">
+        <item name="colorContainer">@color/gms_color_04</item>
+        <item name="colorOnContainer">@color/gms_color_contrast_01</item>
+    </style>
+
+    <style name="Example.Widget.MaterialComponents.TextInputLayout.FilledBox" parent="@style/Root.GiniMerchantTheme.PaymentInputLayout">
+        <item name="android:textColorHint">@color/black</item>
+        <item name="android:textColor">@color/black</item>
+        <item name="textFillColor">@color/black</item>
+    </style>
+
+    <style name="Example.Widget.TextInputEditText" parent="@style/ThemeOverlay.Material3.TextInputEditText">
+        <item name="android:textColor">@color/black</item>
+    </style>
+
+    <!-- endregion -->
+
+</resources>
diff --git a/merchant-sdk/example-app/src/main/res/xml/filepaths.xml b/merchant-sdk/example-app/src/main/res/xml/filepaths.xml
new file mode 100644
index 0000000000..75102b6d0d
--- /dev/null
+++ b/merchant-sdk/example-app/src/main/res/xml/filepaths.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <files-path path="/" name="camera-pictures" />
+</paths>
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/qa/AndroidManifest.xml b/merchant-sdk/example-app/src/qa/AndroidManifest.xml
new file mode 100644
index 0000000000..e76c158e0e
--- /dev/null
+++ b/merchant-sdk/example-app/src/qa/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application android:networkSecurityConfig="@xml/network_security_config" />
+
+</manifest>
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/qa/res/xml/network_security_config.xml b/merchant-sdk/example-app/src/qa/res/xml/network_security_config.xml
new file mode 100644
index 0000000000..f81d491896
--- /dev/null
+++ b/merchant-sdk/example-app/src/qa/res/xml/network_security_config.xml
@@ -0,0 +1,8 @@
+<network-security-config>
+    <base-config cleartextTrafficPermitted="false">
+        <trust-anchors>
+            <certificates src="system" />
+            <certificates src="user" />
+        </trust-anchors>
+    </base-config>
+</network-security-config>
\ No newline at end of file
diff --git a/merchant-sdk/example-app/src/test/java/net/gini/pay/app/ExampleUnitTest.kt b/merchant-sdk/example-app/src/test/java/net/gini/pay/app/ExampleUnitTest.kt
new file mode 100644
index 0000000000..39f4f6914a
--- /dev/null
+++ b/merchant-sdk/example-app/src/test/java/net/gini/pay/app/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package net.gini.pay.app
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/logo.png b/merchant-sdk/logo.png
new file mode 100644
index 0000000000..e62a1d9776
Binary files /dev/null and b/merchant-sdk/logo.png differ
diff --git a/merchant-sdk/sdk/build.gradle.kts b/merchant-sdk/sdk/build.gradle.kts
new file mode 100644
index 0000000000..e7a0aa28b2
--- /dev/null
+++ b/merchant-sdk/sdk/build.gradle.kts
@@ -0,0 +1,150 @@
+
+import net.gini.gradle.CodeAnalysisPlugin
+import net.gini.gradle.DokkaPlugin
+import net.gini.gradle.PublishToMavenPlugin
+import net.gini.gradle.SBOMPlugin
+import net.gini.gradle.extensions.implementationProjectDependencyForSBOM
+import org.jetbrains.dokka.gradle.DokkaCollectorTask
+
+plugins {
+    id("com.android.library")
+    kotlin("android")
+    id("kotlin-parcelize")
+}
+
+android {
+    // after upgrading to AGP 8, we need this (copied from the module's AndroidManifest.xml)
+    namespace = "net.gini.android.merchant.sdk"
+    compileSdk = libs.versions.android.compileSdk.get().toInt()
+
+    // after upgrading to AGP 8, we need this to have the defaultConfig block
+    buildFeatures {
+        buildConfig = true
+    }
+    defaultConfig {
+        minSdk = libs.versions.android.minSdk.get().toInt()
+        targetSdk = libs.versions.android.targetSdk.get().toInt()
+
+        // Use the test runner with JUnit4 support
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+
+        buildConfigField("String", "VERSION_NAME", "\"$version\"")
+        buildConfigField("String", "VERSION_CODE", "\"${properties["versionCode"]}\"")
+
+        // Setting 'vectorDrawables.useSupportLibrary = true' prevents creating PNGs for vector drawables.
+        // This is needed to allow overriding of drawables either with other vector drawables added to 'drawable-anydpi'
+        // or with PNGs.
+        // If 'vectorDrawables.useSupportLibrary' is not set to 'true' then PNGs won't override vector drawables and
+        // overriding of vector drawables with other vector drawables only works on API Level 24 and higher if they
+        // are also added to 'drawable-anydpi-v24' in addition to 'drawable-anydpi'.
+        // Our min SDK level allows only Android versions which have runtime support for vector drawables
+        // so it's safe to prevent creating PNGs from vector drawables and we also reduce the apk size.
+        // TODO: when minSDK is raised to 24 or above delete PNGs for which we have vector drawables.
+        //       Background: for API Levels 21 to 23 we had to add PNGs for some vector drawables because
+        //       they were not rendered correctly.
+        vectorDrawables.useSupportLibrary = true
+    }
+
+    buildFeatures {
+        viewBinding = true
+    }
+
+    buildTypes {
+        getByName("debug") {
+            isTestCoverageEnabled = true
+            // Needed for instrumented tests
+            multiDexEnabled = true
+        }
+        getByName("release") {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility(JavaVersion.VERSION_1_8)
+        targetCompatibility(JavaVersion.VERSION_1_8)
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+        // required to prevent .kotlin_module file name collisions
+        // https://stackoverflow.com/a/56329676/276129
+        moduleName = "${properties["groupId"]}.${properties["artifactId"]}"
+        // Fix for "Inheritance from an interface with '@JvmDefault' members is only allowed with -Xjvm-default option"
+        // https://issuetracker.google.com/issues/217593040#comment6
+        freeCompilerArgs = listOf("-Xjvm-default=all")
+    }
+
+    testOptions {
+        execution = "ANDROIDX_TEST_ORCHESTRATOR"
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+        kotlinOptions {
+            jvmTarget = "1.8"
+        }
+    }
+    // After AGP 8, this replaces the tasks in PublishToMavenPlugin
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+            withJavadocJar()
+        }
+    }
+}
+
+// after upgrading to AGP 8, we need this, otherwise, gradle will complain to use the same jdk version as your machine (17 which is bundled with Android Studio)
+// https://youtrack.jetbrains.com/issue/KT-55947/Unable-to-set-kapt-jvm-target-version
+tasks.withType(type = org.jetbrains.kotlin.gradle.internal.KaptGenerateStubsTask::class) {
+    kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
+}
+
+dependencies {
+    val healthApiLibrary = project(":health-api-library:library")
+    if (properties["createSBOM"] == "true") {
+        implementationProjectDependencyForSBOM(healthApiLibrary)
+    } else {
+        implementation(healthApiLibrary)
+    }
+
+    api(libs.slf4j.api)
+    implementation(libs.kotlinx.coroutines.core)
+    implementation(libs.kotlinx.coroutines.android)
+    implementation(libs.androidx.lifecycle.common.java8)
+    implementation(libs.androidx.lifecycle.viewmodel.ktx)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.material)
+    implementation(libs.androidx.constraintlayout)
+    implementation(libs.androidx.fragment.ktx)
+    implementation(libs.androidx.viewpager2)
+    implementation(libs.photoview)
+    implementation(libs.insetter)
+    implementation(libs.datastore.preferences)
+
+    debugImplementation(libs.androidx.test.core.ktx)
+    debugImplementation(libs.androidx.fragment.testing)
+
+    testImplementation(libs.junit)
+    testImplementation(libs.mockk)
+    testImplementation(libs.kotlinx.coroutines.test)
+    testImplementation(libs.turbine)
+    testImplementation(libs.androidx.test.junit)
+    testImplementation(libs.robolectric)
+    testImplementation(libs.truth)
+    testImplementation(libs.androidx.test.espresso.core)
+    testImplementation(libs.androidx.test.espresso.intents)
+
+    androidTestImplementation(libs.androidx.test.junit)
+    androidTestImplementation(libs.androidx.test.espresso.core)
+}
+
+apply<PublishToMavenPlugin>()
+apply<DokkaPlugin>()
+apply<CodeAnalysisPlugin>()
+apply<SBOMPlugin>()
+
+tasks.getByName<DokkaCollectorTask>("dokkaHtmlSiblingCollector") {
+    this.moduleName.set("Gini Merchant SDK for Android")
+}
diff --git a/merchant-sdk/sdk/consumer-rules.pro b/merchant-sdk/sdk/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/merchant-sdk/sdk/detekt-baseline.xml b/merchant-sdk/sdk/detekt-baseline.xml
new file mode 100644
index 0000000000..d33ecaaf2f
--- /dev/null
+++ b/merchant-sdk/sdk/detekt-baseline.xml
@@ -0,0 +1,221 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<SmellBaseline>
+  <ManuallySuppressedIssues/>
+  <CurrentIssues>
+    <ID>ComplexCondition:GiniMerchant.kt$GiniMerchant$iban.isEmpty() || recipient.isEmpty() || amount.isEmpty() || purpose.isEmpty()</ID>
+    <ID>ComplexCondition:MoreInformationFragment.kt$MoreInformationFragment$(listView.isGroupExpanded(i) &amp;&amp; (i != group || isReload)) || !listView.isGroupExpanded(i) &amp;&amp; i == group</ID>
+    <ID>CyclomaticComplexMethod:PaymentDetails.kt$internal fun MutableMap&lt;String, CompoundExtraction>.withFeedback(paymentDetails: PaymentDetails): Map&lt;String, CompoundExtraction></ID>
+    <ID>CyclomaticComplexMethod:ReviewView.kt$ReviewView$private fun handleValidationResult(messages: List&lt;ValidationMessage>)</ID>
+    <ID>EmptyClassBlock:MerchantSDKFileProvider.kt$MerchantSDKFileProvider${ }</ID>
+    <ID>EmptyDefaultConstructor:GiniMerchant.kt$GiniMerchant.MerchantSDKEvents.OnFinishedWithCancellation$()</ID>
+    <ID>EmptyElseBlock:IntervalClickListener.kt$IntervalClickListener$if (view == null) return</ID>
+    <ID>EmptyFunctionBlock:Extensions.kt$&lt;no name provided>${ }</ID>
+    <ID>LongMethod:PaymentComponentView.kt$PaymentComponentView$override fun onAttachedToWindow()</ID>
+    <ID>MagicNumber:Context.kt$123</ID>
+    <ID>MagicNumber:Extensions.kt$&lt;no name provided>$100</ID>
+    <ID>MagicNumber:Extensions.kt$&lt;no name provided>$7</ID>
+    <ID>MagicNumber:GmsBottomSheetDialogFragment.kt$GmsBottomSheetDialogFragment$102</ID>
+    <ID>MagicNumber:IbanValidator.kt$10</ID>
+    <ID>MagicNumber:IbanValidator.kt$4</ID>
+    <ID>MagicNumber:InstallAppBottomSheet.kt$InstallAppBottomSheet$255</ID>
+    <ID>MagicNumber:MoreInformationFragment.kt$MoreInformationFragment$100</ID>
+    <ID>MagicNumber:OpenWithBottomSheet.kt$OpenWithBottomSheet$255</ID>
+    <ID>MagicNumber:PaymentComponent.kt$PaymentComponent$500</ID>
+    <ID>MagicNumber:PaymentComponentView.kt$PaymentComponentView$0.4f</ID>
+    <ID>MagicNumber:PaymentComponentView.kt$PaymentComponentView$255</ID>
+    <ID>MagicNumber:PaymentFlowViewModel.kt$PaymentFlowViewModel$50</ID>
+    <ID>MagicNumber:ReviewView.kt$ReviewView$0.4f</ID>
+    <ID>MagicNumber:ReviewView.kt$ReviewView$255</ID>
+    <ID>MagicNumber:ReviewView.kt$ReviewView$3</ID>
+    <ID>MagicNumber:Session.kt$Session.Companion$1000</ID>
+    <ID>MatchingDeclarationName:Errors.kt$NoPaymentDataExtracted : Throwable</ID>
+    <ID>MaxLineLength:BankSelectionBottomSheet.kt$BankSelectionBottomSheet$*</ID>
+    <ID>MaxLineLength:BankSelectionBottomSheet.kt$BankSelectionBottomSheet$internal</ID>
+    <ID>MaxLineLength:BankSelectionBottomSheet.kt$BankSelectionBottomSheet$private val viewModel: BankSelectionViewModel by viewModels { BankSelectionViewModel.Factory(paymentComponent, backListener) }</ID>
+    <ID>MaxLineLength:BankSelectionBottomSheet.kt$BankSelectionBottomSheet.Companion$*</ID>
+    <ID>MaxLineLength:BankSelectionBottomSheet.kt$BankSelectionBottomSheet.Companion$fun</ID>
+    <ID>MaxLineLength:BankSelectionBottomSheet.kt$PaymentProviderAppsAdapter$if (paymentProviderAppListItem.isSelected) ContextCompat.getDrawable(context, R.drawable.gms_checkmark) else null</ID>
+    <ID>MaxLineLength:BankSelectionBottomSheet.kt$PaymentProviderAppsAdapter$val view = GmsItemPaymentProviderAppBinding.inflate(parent.getLayoutInflaterWithGiniMerchantTheme(), parent, false)</ID>
+    <ID>MaxLineLength:BankSelectionBottomSheet.kt$PaymentProviderAppsAdapter.ViewHolder$class</ID>
+    <ID>MaxLineLength:BankSelectionViewModel.kt$BankSelectionViewModel$LOG.warn("Cannot show payment provider apps: PaymentComponent must be set before showing the BankSelectionBottomSheet")</ID>
+    <ID>MaxLineLength:BankSelectionViewModel.kt$BankSelectionViewModel$hasSamePaymentProviderId(paymentProviderApp.paymentProviderApp, selectedPaymentProviderAppState.paymentProviderApp)</ID>
+    <ID>MaxLineLength:BankSelectionViewModel.kt$BankSelectionViewModel$internal</ID>
+    <ID>MaxLineLength:BankSelectionViewModel.kt$BankSelectionViewModel$paymentComponent.selectedPaymentProviderAppFlow</ID>
+    <ID>MaxLineLength:BankSelectionViewModel.kt$BankSelectionViewModel.Factory$class</ID>
+    <ID>MaxLineLength:Context.kt$// Bitmap.createScaledBitmap returns original bitmap when width and height is the same as bitmap.width and bitmap.height. In one case (Pixel 7 Pro) iconSizePx was being resolved to exactly the same value as some of the bitmap's widths</ID>
+    <ID>MaxLineLength:Context.kt$// Only recycle if width is different than bitmap.width (can only check for width, as it's the same dimension for both with and height)</ID>
+    <ID>MaxLineLength:Context.kt$// Recycling this bitmap in this case leads to the app crashing when attempting to load the drawable into an ImageView</ID>
+    <ID>MaxLineLength:DocumentPageAdapter.kt$DocumentPageAdapter$HorizontalViewHolder(giniMerchant, GmsItemPageHorizontalBinding.inflate(LayoutInflater.from(parent.context), parent, false))</ID>
+    <ID>MaxLineLength:DocumentPageAdapter.kt$DocumentPageAdapter.PageViewHolder$imageView.setImageBitmap(BitmapFactory.decodeByteArray(imageResult.value, 0, imageResult.value.size))</ID>
+    <ID>MaxLineLength:DocumentPageAdapter.kt$DocumentPageAdapter.PageViewHolder$when</ID>
+    <ID>MaxLineLength:Extensions.kt$if (isErrorEnabled) editText?.setBackgroundResource(R.drawable.gms_payment_input_edit_text_error_background) else editText?.setBackgroundResource(R.drawable.gms_payment_input_edit_text_background)</ID>
+    <ID>MaxLineLength:Extensions.kt$internal</ID>
+    <ID>MaxLineLength:FlowBottomSheetsManager.kt$FlowBottomSheetsManager$fun</ID>
+    <ID>MaxLineLength:GiniMerchant.kt$GiniMerchant$*</ID>
+    <ID>MaxLineLength:GiniMerchant.kt$GiniMerchant$GiniHealthAPIBuilder(context, sessionManager = HealthApiSessionManagerAdapter(sessionManager), apiVersion = API_VERSION)</ID>
+    <ID>MaxLineLength:GiniMerchant.kt$GiniMerchant$fun</ID>
+    <ID>MaxLineLength:GiniMerchant.kt$GiniMerchant$if (iban.isEmpty() || recipient.isEmpty() || amount.isEmpty() || purpose.isEmpty()) throw IllegalStateException("Payment details are incomplete.")</ID>
+    <ID>MaxLineLength:GiniMerchant.kt$GiniMerchant.MerchantSDKEvents$OnFinishedWithPaymentRequestCreated : MerchantSDKEvents</ID>
+    <ID>MaxLineLength:GiniPaymentManager.kt$GiniPaymentManager$* Handles the validation of payment details, creation of payment request, sending feedback and emitting open bank event.</ID>
+    <ID>MaxLineLength:GiniPaymentManager.kt$GiniPaymentManager$GiniMerchant.PaymentState.Success(getPaymentRequest(paymentProviderApp, paymentDetails), paymentProviderApp.name)</ID>
+    <ID>MaxLineLength:GiniPaymentManager.kt$GiniPaymentManager$suspend</ID>
+    <ID>MaxLineLength:InstallAppBottomSheet.kt$InstallAppBottomSheet$"${paymentProviderApp.name} ${getString(R.string.gms_payment_provider_logo_content_description)}"</ID>
+    <ID>MaxLineLength:InstallAppBottomSheet.kt$InstallAppBottomSheet.Companion$*</ID>
+    <ID>MaxLineLength:InstallAppViewModel.kt$InstallAppViewModel$internal</ID>
+    <ID>MaxLineLength:InstallAppViewModel.kt$InstallAppViewModel.Factory$class</ID>
+    <ID>MaxLineLength:MoreInformationFragment.kt$MoreInformationFragment$if</ID>
+    <ID>MaxLineLength:MoreInformationFragment.kt$MoreInformationFragment$internal</ID>
+    <ID>MaxLineLength:MoreInformationFragment.kt$MoreInformationFragment$is MoreInformationViewModel.PaymentProviderAppsListState.Success</ID>
+    <ID>MaxLineLength:MoreInformationFragment.kt$MoreInformationFragment.Companion$fun</ID>
+    <ID>MaxLineLength:MoreInformationViewModel.kt$MoreInformationViewModel$LOG.warn("Cannot show payment provider apps: PaymentComponent must be set before showing the BankSelectionBottomSheet")</ID>
+    <ID>MaxLineLength:OpenWithBottomSheet.kt$OpenWithBottomSheet$binding.gmsOpenWithDetails.text = String.format(getString(R.string.gms_open_with_details), paymentProviderApp.name)</ID>
+    <ID>MaxLineLength:OpenWithBottomSheet.kt$OpenWithBottomSheet$binding.gmsOpenWithInfo.text = createSpannableString(String.format(getString(R.string.gms_open_with_info), paymentProviderApp.name, paymentProviderApp.name), paymentProviderApp.paymentProvider.playStoreUrl)</ID>
+    <ID>MaxLineLength:OpenWithBottomSheet.kt$OpenWithBottomSheet$binding.gmsOpenWithTitle.text = String.format(getString(R.string.gms_open_with_title), paymentProviderApp.name)</ID>
+    <ID>MaxLineLength:OpenWithBottomSheet.kt$OpenWithBottomSheet$internal</ID>
+    <ID>MaxLineLength:OpenWithBottomSheet.kt$OpenWithBottomSheet$private val viewModel by viewModels&lt;OpenWithViewModel> { OpenWithViewModel.Factory(paymentProviderApp, backListener) }</ID>
+    <ID>MaxLineLength:OpenWithBottomSheet.kt$OpenWithBottomSheet$setSpan(ForegroundColorSpan(requireContext().getColor(R.color.gms_open_with_details)),0,length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)</ID>
+    <ID>MaxLineLength:OpenWithBottomSheet.kt$OpenWithBottomSheet.Companion$fun</ID>
+    <ID>MaxLineLength:OpenWithPreferences.kt$OpenWithPreferences$fun getLiveCountForPaymentProviderId(paymentProviderId: String): Flow&lt;Int?></ID>
+    <ID>MaxLineLength:OpenWithViewModel.kt$OpenWithViewModel$internal</ID>
+    <ID>MaxLineLength:OpenWithViewModel.kt$OpenWithViewModel.Factory$class</ID>
+    <ID>MaxLineLength:PaymentComponent.kt$PaymentComponent$(_selectedPaymentProviderAppFlow.value as SelectedPaymentProviderAppState.AppSelected).paymentProviderApp</ID>
+    <ID>MaxLineLength:PaymentComponent.kt$PaymentComponent$*</ID>
+    <ID>MaxLineLength:PaymentComponent.kt$PaymentComponent$* A [StateFlow] which emits the state of the payment provider apps. See [PaymentProviderAppsState] for the possible states.</ID>
+    <ID>MaxLineLength:PaymentComponent.kt$PaymentComponent$* A [StateFlow] which emits the state of the selected payment provider app. See [SelectedPaymentProviderAppState] for the possible states.</ID>
+    <ID>MaxLineLength:PaymentComponent.kt$PaymentComponent$// Holds the state of the Payment Provider apps as received from the server - no processing is done on this list, to serve as a point of truth</ID>
+    <ID>MaxLineLength:PaymentComponent.kt$PaymentComponent$LOG.debug("Using previously selected payment provider app: {}", previouslySelectedPaymentProviderApp.name)</ID>
+    <ID>MaxLineLength:PaymentComponent.kt$PaymentComponent$internal</ID>
+    <ID>MaxLineLength:PaymentComponent.kt$PaymentComponent$private</ID>
+    <ID>MaxLineLength:PaymentComponent.kt$PaymentComponent$private suspend</ID>
+    <ID>MaxLineLength:PaymentComponent.kt$PaymentComponent$val</ID>
+    <ID>MaxLineLength:PaymentComponent.kt$PaymentComponent.Listener$*</ID>
+    <ID>MaxLineLength:PaymentComponentBottomSheet.kt$PaymentComponentBottomSheet$// if payment provider does not support GPC and review fragment will not be shown, we're in the case where we show `Open With Bottom Sheet` from the payment component directly</ID>
+    <ID>MaxLineLength:PaymentComponentBottomSheet.kt$PaymentComponentBottomSheet$if (viewModel.paymentProviderApp.value?.paymentProvider?.gpcSupported() == false &amp;&amp; !viewModel.reviewFragmentShown) return@launch</ID>
+    <ID>MaxLineLength:PaymentComponentBottomSheet.kt$PaymentComponentBottomSheet$private val viewModel by viewModels&lt;PaymentComponentBottomSheetViewModel> { PaymentComponentBottomSheetViewModel.Factory(paymentComponent, backListener, reviewFragmentShown) }</ID>
+    <ID>MaxLineLength:PaymentComponentBottomSheet.kt$PaymentComponentBottomSheet.Companion$internal fun newInstance(paymentComponent: PaymentComponent?, reviewFragmentShown: Boolean, backListener: BackListener)</ID>
+    <ID>MaxLineLength:PaymentComponentBottomSheetViewModel.kt$PaymentComponentBottomSheetViewModel$internal</ID>
+    <ID>MaxLineLength:PaymentComponentBottomSheetViewModel.kt$PaymentComponentBottomSheetViewModel.Factory$class</ID>
+    <ID>MaxLineLength:PaymentComponentView.kt$PaymentComponentView$*</ID>
+    <ID>MaxLineLength:PaymentComponentView.kt$PaymentComponentView$* The document id of the invoice item. This will be returned in the [PaymentComponent.Listener.onPayInvoiceClicked] method.</ID>
+    <ID>MaxLineLength:PaymentComponentView.kt$PaymentComponentView$LOG.debug("Collecting payment provider apps state and selected payment provider app from PaymentComponent")</ID>
+    <ID>MaxLineLength:PaymentComponentView.kt$PaymentComponentView$LOG.warn("Cannot show payment provider apps: PaymentComponent must be set before showing the PaymentComponentView")</ID>
+    <ID>MaxLineLength:PaymentComponentView.kt$PaymentComponentView$binding.gmsSelectBankPickerLayout.layoutParams.height = resources.getDimension(R.dimen.gms_payment_component_height).toInt()</ID>
+    <ID>MaxLineLength:PaymentComponentView.kt$PaymentComponentView$if</ID>
+    <ID>MaxLineLength:PaymentComponentView.kt$PaymentComponentView$payInvoiceButton = if (paymentComponent?.bankPickerRows == BankPickerRows.TWO) binding.gmsPayInvoiceButtonTwoRows else binding.gmsSingleRowBankSelection.gmsPayInvoiceButton</ID>
+    <ID>MaxLineLength:PaymentComponentView.kt$PaymentComponentView$payInvoiceButton.text = if (reviewFragmentWillBeShown) resources.getString(R.string.gms_continue_to_overview) else resources.getString(R.string.gms_pay_button)</ID>
+    <ID>MaxLineLength:PaymentComponentView.kt$PaymentComponentView$paymentProviderAppIconHolder = if (paymentComponent?.bankPickerRows == BankPickerRows.TWO) binding.gmsSelectBankPicker.gmsPaymentProviderAppIconHolder else binding.gmsSingleRowBankSelection.gmsPaymentProviderAppIconHolder</ID>
+    <ID>MaxLineLength:PaymentComponentView.kt$PaymentComponentView$pc.selectedPaymentProviderAppFlow</ID>
+    <ID>MaxLineLength:PaymentComponentView.kt$PaymentComponentView$selectBankButton = if (paymentComponent?.bankPickerRows == BankPickerRows.TWO) binding.gmsSelectBankPicker.gmsSelectBankButton else binding.gmsSingleRowBankSelection.gmsSelectBankButton</ID>
+    <ID>MaxLineLength:PaymentDetails.kt$internal</ID>
+    <ID>MaxLineLength:PaymentDetails.kt$internal fun MutableMap&lt;String, CompoundExtraction>.getPaymentExtraction(name: String)</ID>
+    <ID>MaxLineLength:PaymentDetails.kt$val</ID>
+    <ID>MaxLineLength:PaymentFlowViewModel.kt$PaymentFlowViewModel$if (paymentComponent.paymentProviderAppsFlow.value is PaymentProviderAppsState.Loading || paymentComponent.paymentProviderAppsFlow.value is PaymentProviderAppsState.Success) return@launch</ID>
+    <ID>MaxLineLength:PaymentFlowViewModel.kt$PaymentFlowViewModel$override suspend fun getPaymentRequest(): PaymentRequest</ID>
+    <ID>MaxLineLength:PaymentFlowViewModel.kt$PaymentFlowViewModel$override suspend fun getPaymentRequestDocument(paymentRequest: PaymentRequest): Resource&lt;ByteArray></ID>
+    <ID>MaxLineLength:PaymentFlowViewModel.kt$PaymentFlowViewModel$paymentComponent.bankPickerRows = if (it.paymentComponentOnTwoRows) BankPickerRows.TWO else BankPickerRows.SINGLE</ID>
+    <ID>MaxLineLength:PaymentFlowViewModel.kt$PaymentFlowViewModel.Factory$class</ID>
+    <ID>MaxLineLength:PaymentFlowViewModel.kt$PaymentFlowViewModel.Factory$return PaymentFlowViewModel(paymentComponent = paymentComponent, paymentDetails = paymentDetails,paymentFlowConfiguration = paymentFlowConfiguration, giniPaymentManager = GiniPaymentManager(giniMerchant), giniMerchant = giniMerchant) as T</ID>
+    <ID>MaxLineLength:PaymentFragment.kt$PaymentFlowConfiguration$*</ID>
+    <ID>MaxLineLength:PaymentFragment.kt$PaymentFragment$*</ID>
+    <ID>MaxLineLength:PaymentFragment.kt$PaymentFragment$// If ReviewFragment will be shown, it will hande the opening of the bank app. Otherwise, listen for the openBankState event and handle it here</ID>
+    <ID>MaxLineLength:PaymentFragment.kt$PaymentFragment$BankSelectionBottomSheet.newInstance(it, viewModel).show(childFragmentManager, BankSelectionBottomSheet::class.java.name)</ID>
+    <ID>MaxLineLength:PaymentFragment.kt$PaymentFragment$handleError(getString(R.string.gms_generic_error_message)) { viewModel.onPaymentButtonTapped(requireContext().externalCacheDir) }</ID>
+    <ID>MaxLineLength:PaymentFragment.kt$PaymentFragment$requireActivity()</ID>
+    <ID>MaxLineLength:PaymentFragment.kt$PaymentFragment.&lt;no name provided>$BankSelectionBottomSheet.newInstance(it, backListener = viewModel).show(childFragmentManager, BankSelectionBottomSheet::class.java.name)</ID>
+    <ID>MaxLineLength:PaymentFragment.kt$PaymentFragment.Companion$fun</ID>
+    <ID>MaxLineLength:PaymentFragment.kt$PaymentFragment.Companion$viewModelFactory : ViewModelProvider.Factory = PaymentFlowViewModel.Factory(giniMerchant.paymentComponent, paymentDetails, paymentFlowConfiguration, giniMerchant)</ID>
+    <ID>MaxLineLength:PaymentProviderApp.kt$internal</ID>
+    <ID>MaxLineLength:ReviewBottomSheet.kt$ReviewBottomSheet$private val viewModel: ReviewBottomSheetViewModel by viewModels { viewModelFactory ?: object : ViewModelProvider.Factory {} }</ID>
+    <ID>MaxLineLength:ReviewBottomSheetViewModel.kt$ReviewBottomSheetViewModel$internal</ID>
+    <ID>MaxLineLength:ReviewBottomSheetViewModel.kt$ReviewBottomSheetViewModel.Factory$class</ID>
+    <ID>MaxLineLength:ReviewBottomSheetViewModel.kt$ReviewBottomSheetViewModel.Factory$return ReviewBottomSheetViewModel(paymentComponent, reviewConfiguration, giniMerchant, giniPaymentManager, backListener) as T</ID>
+    <ID>MaxLineLength:ReviewComponent.kt$ReviewComponent$.</ID>
+    <ID>MaxLineLength:ReviewComponent.kt$ReviewComponent$nonEmptyValidationMessages.addAll(validateIban(paymentDetails.iban).filterIsInstance&lt;ValidationMessage.InvalidIban>())</ID>
+    <ID>MaxLineLength:ReviewConfiguration.kt$ReviewConfiguration$*</ID>
+    <ID>MaxLineLength:ReviewView.kt$ReviewView$// Padding the end of the text is needed to add space between the text and the image, and because setting the imageSpan replaces the character in the string, it does not add to the beginning or the end of it.</ID>
+    <ID>MaxLineLength:ReviewView.kt$ReviewView$amount.addTextChangedListener(onTextChanged = { text, _, _, _ -> reviewComponent?.setAmount(text.toString()) })</ID>
+    <ID>MaxLineLength:ReviewView.kt$ReviewView$binding.amount.focusable = if (reviewComponent?.reviewConfig?.isAmountFieldEditable == true) View.FOCUSABLE else View.NOT_FOCUSABLE</ID>
+    <ID>MaxLineLength:ReviewView.kt$ReviewView$binding.amountLayout.isEnabled = !isLoading &amp;&amp; reviewComponent?.reviewConfig?.isAmountFieldEditable ?: false</ID>
+    <ID>MaxLineLength:ReviewView.kt$ReviewView$purpose.addTextChangedListener(onTextChanged = { text, _, _, _ -> reviewComponent?.setPurpose(text.toString()) })</ID>
+    <ID>MaxLineLength:ReviewView.kt$ReviewView$recipient.addTextChangedListener(onTextChanged = { text, _, _, _ -> reviewComponent?.setRecipient(text.toString()) })</ID>
+    <ID>MaxLineLength:ReviewView.kt$ReviewView$spannableString.setSpan(imageSpan, spannableString.length - 1, spannableString.length, Spanned.SPAN_INCLUSIVE_INCLUSIVE)</ID>
+    <ID>MaxLineLength:SessionManager.kt$HealthApiSessionManagerAdapter$internal</ID>
+    <ID>MaxLineLength:SupportFragmentManager.kt$internal</ID>
+    <ID>MaxLineLength:UserPreferences.kt$UserPreferences$is String, (String is T) -> userPreference.value = sharedPreferences.getString(userPreference.id, "") as T</ID>
+    <ID>NestedBlockDepth:ReviewView.kt$ReviewView$private fun handleValidationResult(messages: List&lt;ValidationMessage>)</ID>
+    <ID>NewLineAtEndOfFile:AutoClearedValue.kt$net.gini.android.merchant.sdk.util.AutoClearedValue.kt</ID>
+    <ID>NewLineAtEndOfFile:BackListener.kt$net.gini.android.merchant.sdk.util.BackListener.kt</ID>
+    <ID>NewLineAtEndOfFile:BankSelectionBottomSheet.kt$net.gini.android.merchant.sdk.bankselection.BankSelectionBottomSheet.kt</ID>
+    <ID>NewLineAtEndOfFile:BottomSheetDialogFragment.kt$net.gini.android.merchant.sdk.util.extensions.BottomSheetDialogFragment.kt</ID>
+    <ID>NewLineAtEndOfFile:DisplayedScreen.kt$net.gini.android.merchant.sdk.util.DisplayedScreen.kt</ID>
+    <ID>NewLineAtEndOfFile:DocumentPageAdapter.kt$net.gini.android.merchant.sdk.review.pager.DocumentPageAdapter.kt</ID>
+    <ID>NewLineAtEndOfFile:Errors.kt$net.gini.android.merchant.sdk.review.error.Errors.kt</ID>
+    <ID>NewLineAtEndOfFile:Extensions.kt$net.gini.android.merchant.sdk.util.Extensions.kt</ID>
+    <ID>NewLineAtEndOfFile:FaqExpandableListAdapter.kt$net.gini.android.merchant.sdk.moreinformation.FaqExpandableListAdapter.kt</ID>
+    <ID>NewLineAtEndOfFile:File.kt$net.gini.android.merchant.sdk.util.extensions.File.kt</ID>
+    <ID>NewLineAtEndOfFile:FlowBottomSheetsManager.kt$net.gini.android.merchant.sdk.util.FlowBottomSheetsManager.kt</ID>
+    <ID>NewLineAtEndOfFile:Fragment.kt$net.gini.android.merchant.sdk.util.extensions.Fragment.kt</ID>
+    <ID>NewLineAtEndOfFile:GiniPaymentManager.kt$net.gini.android.merchant.sdk.util.GiniPaymentManager.kt</ID>
+    <ID>NewLineAtEndOfFile:GmsBottomSheetDialogFragment.kt$net.gini.android.merchant.sdk.util.GmsBottomSheetDialogFragment.kt</ID>
+    <ID>NewLineAtEndOfFile:IbanValidator.kt$net.gini.android.merchant.sdk.util.IbanValidator.kt</ID>
+    <ID>NewLineAtEndOfFile:InstallAppBottomSheet.kt$net.gini.android.merchant.sdk.review.installApp.InstallAppBottomSheet.kt</ID>
+    <ID>NewLineAtEndOfFile:InstallAppViewModel.kt$net.gini.android.merchant.sdk.review.installApp.InstallAppViewModel.kt</ID>
+    <ID>NewLineAtEndOfFile:IntervalClickListener.kt$net.gini.android.merchant.sdk.util.IntervalClickListener.kt</ID>
+    <ID>NewLineAtEndOfFile:IntervalClickListenerHelper.kt$net.gini.android.merchant.sdk.util.IntervalClickListenerHelper.kt</ID>
+    <ID>NewLineAtEndOfFile:MerchantSDKFileProvider.kt$net.gini.android.merchant.sdk.util.MerchantSDKFileProvider.kt</ID>
+    <ID>NewLineAtEndOfFile:MoreInformationFragment.kt$net.gini.android.merchant.sdk.moreinformation.MoreInformationFragment.kt</ID>
+    <ID>NewLineAtEndOfFile:MoreInformationViewModel.kt$net.gini.android.merchant.sdk.moreinformation.MoreInformationViewModel.kt</ID>
+    <ID>NewLineAtEndOfFile:OpenWithBottomSheet.kt$net.gini.android.merchant.sdk.review.openWith.OpenWithBottomSheet.kt</ID>
+    <ID>NewLineAtEndOfFile:OpenWithPreferences.kt$net.gini.android.merchant.sdk.review.openWith.OpenWithPreferences.kt</ID>
+    <ID>NewLineAtEndOfFile:OpenWithViewModel.kt$net.gini.android.merchant.sdk.review.openWith.OpenWithViewModel.kt</ID>
+    <ID>NewLineAtEndOfFile:Payment.kt$net.gini.android.merchant.sdk.api.payment.model.Payment.kt</ID>
+    <ID>NewLineAtEndOfFile:PaymentComponent.kt$net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent.kt</ID>
+    <ID>NewLineAtEndOfFile:PaymentComponentBottomSheet.kt$net.gini.android.merchant.sdk.paymentComponentBottomSheet.PaymentComponentBottomSheet.kt</ID>
+    <ID>NewLineAtEndOfFile:PaymentComponentBottomSheetViewModel.kt$net.gini.android.merchant.sdk.paymentComponentBottomSheet.PaymentComponentBottomSheetViewModel.kt</ID>
+    <ID>NewLineAtEndOfFile:PaymentComponentView.kt$net.gini.android.merchant.sdk.paymentcomponent.PaymentComponentView.kt</ID>
+    <ID>NewLineAtEndOfFile:PaymentDetails.kt$net.gini.android.merchant.sdk.api.payment.model.PaymentDetails.kt</ID>
+    <ID>NewLineAtEndOfFile:PaymentFlowViewModel.kt$net.gini.android.merchant.sdk.integratedFlow.PaymentFlowViewModel.kt</ID>
+    <ID>NewLineAtEndOfFile:PaymentNextStep.kt$net.gini.android.merchant.sdk.util.PaymentNextStep.kt</ID>
+    <ID>NewLineAtEndOfFile:PaymentRequest.kt$net.gini.android.merchant.sdk.api.payment.model.PaymentRequest.kt</ID>
+    <ID>NewLineAtEndOfFile:Resource.kt$net.gini.android.merchant.sdk.util.extensions.Resource.kt</ID>
+    <ID>NewLineAtEndOfFile:ResultWrapper.kt$net.gini.android.merchant.sdk.api.ResultWrapper.kt</ID>
+    <ID>NewLineAtEndOfFile:ReviewBottomSheet.kt$net.gini.android.merchant.sdk.review.reviewBottomSheet.ReviewBottomSheet.kt</ID>
+    <ID>NewLineAtEndOfFile:ReviewBottomSheetViewModel.kt$net.gini.android.merchant.sdk.review.reviewBottomSheet.ReviewBottomSheetViewModel.kt</ID>
+    <ID>NewLineAtEndOfFile:ReviewComponent.kt$net.gini.android.merchant.sdk.review.reviewComponent.ReviewComponent.kt</ID>
+    <ID>NewLineAtEndOfFile:ReviewConfiguration.kt$net.gini.android.merchant.sdk.review.ReviewConfiguration.kt</ID>
+    <ID>NewLineAtEndOfFile:ReviewView.kt$net.gini.android.merchant.sdk.review.reviewComponent.ReviewView.kt</ID>
+    <ID>NewLineAtEndOfFile:Session.kt$net.gini.android.merchant.sdk.api.authorization.model.Session.kt</ID>
+    <ID>NewLineAtEndOfFile:SessionManager.kt$net.gini.android.merchant.sdk.api.authorization.SessionManager.kt</ID>
+    <ID>NewLineAtEndOfFile:ShareWithBroadcastReceiver.kt$net.gini.android.merchant.sdk.util.ShareWithBroadcastReceiver.kt</ID>
+    <ID>NewLineAtEndOfFile:SupportFragmentManager.kt$net.gini.android.merchant.sdk.util.extensions.SupportFragmentManager.kt</ID>
+    <ID>NewLineAtEndOfFile:UserPreferences.kt$net.gini.android.merchant.sdk.preferences.UserPreferences.kt</ID>
+    <ID>ReturnCount:IbanValidator.kt$internal fun isValidIban(iban: String): Boolean</ID>
+    <ID>SwallowedException:PaymentFragment.kt$PaymentFragment$exception: ActivityNotFoundException</ID>
+    <ID>ThrowsCount:GiniPaymentManager.kt$GiniPaymentManager$suspend fun getPaymentRequest(paymentProviderApp: PaymentProviderApp?, paymentDetails: PaymentDetails): PaymentRequest</ID>
+    <ID>TooGenericExceptionCaught:FlowBottomSheetsManager.kt$FlowBottomSheetsManager$throwable: Throwable</ID>
+    <ID>TooGenericExceptionCaught:GiniPaymentManager.kt$GiniPaymentManager$throwable: Throwable</ID>
+    <ID>TooGenericExceptionCaught:PaymentComponent.kt$PaymentComponent$e: Exception</ID>
+    <ID>TooGenericExceptionCaught:ResultWrapper.kt$throwable: Throwable</ID>
+    <ID>TooGenericExceptionCaught:SessionManager.kt$HealthApiSessionManagerAdapter$e: Exception</ID>
+    <ID>TooGenericExceptionThrown:GiniMerchant.kt$GiniMerchant$throw Exception(extractionsResource.exception)</ID>
+    <ID>TooGenericExceptionThrown:GiniPaymentManager.kt$GiniPaymentManager$throw Exception("Cancelled")</ID>
+    <ID>TooGenericExceptionThrown:GiniPaymentManager.kt$GiniPaymentManager$throw Exception("Cannot create PaymentRequest: No GiniMerchant instance set")</ID>
+    <ID>TooGenericExceptionThrown:GiniPaymentManager.kt$GiniPaymentManager$throw Exception("Cannot create PaymentRequest: No selected payment provider app")</ID>
+    <ID>TooGenericExceptionThrown:GiniPaymentManager.kt$GiniPaymentManager$throw Exception("Cannot initiate payment: No GiniMerchant instance set")</ID>
+    <ID>TooGenericExceptionThrown:GiniPaymentManager.kt$GiniPaymentManager$throw Exception("Payment request ID is null")</ID>
+    <ID>TooGenericExceptionThrown:GiniPaymentManager.kt$GiniPaymentManager$throw Exception(createPaymentRequestResource.exception)</ID>
+    <ID>TooManyFunctions:Extensions.kt$net.gini.android.merchant.sdk.util.Extensions.kt</ID>
+    <ID>TooManyFunctions:PaymentComponentView.kt$PaymentComponentView : ConstraintLayout</ID>
+    <ID>TooManyFunctions:PaymentFlowViewModel.kt$PaymentFlowViewModel : ViewModelFlowBottomSheetsManagerBackListener</ID>
+    <ID>TooManyFunctions:PaymentFragment.kt$PaymentFragment : Fragment</ID>
+    <ID>TooManyFunctions:ReviewView.kt$ReviewView : ConstraintLayout</ID>
+    <ID>TopLevelPropertyNaming:IbanValidator.kt$private const val alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"</ID>
+    <ID>TopLevelPropertyNaming:PaymentProviderApp.kt$internal const val QueryUri = "$Scheme://$PaymentPath/id"</ID>
+    <ID>TopLevelPropertyNaming:PaymentProviderApp.kt$internal const val Scheme = "ginipay" // It has to match the scheme in query tag in manifest</ID>
+    <ID>TopLevelPropertyNaming:PaymentProviderApp.kt$private const val PaymentPath = "payment"</ID>
+    <ID>UnusedPrivateProperty:GiniMerchant.kt$GiniMerchant.Companion$private val LOG = LoggerFactory.getLogger(GiniMerchant::class.java)</ID>
+    <ID>UseCheckOrError:AutoClearedValue.kt$AutoClearedValue$throw IllegalStateException( "should never call auto-cleared-value get when it might not be available" )</ID>
+    <ID>UseCheckOrError:GiniMerchant.kt$GiniMerchant$throw IllegalStateException("Payment details are incomplete.")</ID>
+    <ID>VariableNaming:ShareWithBroadcastReceiver.kt$ShareWithBroadcastReceiver$val SHARE_WITH_INTENT_FILTER = "share_intent_filter"</ID>
+  </CurrentIssues>
+</SmellBaseline>
diff --git a/merchant-sdk/sdk/gradle.properties b/merchant-sdk/sdk/gradle.properties
new file mode 100644
index 0000000000..b7c7d294b6
--- /dev/null
+++ b/merchant-sdk/sdk/gradle.properties
@@ -0,0 +1,22 @@
+# Maven coordinates
+# groupId is in the root gradle.properties
+artifactId=gini-merchant-sdk
+version=1.0.0
+# Version code is visible only in the generated BuildConfig file
+versionCode=1000
+
+# Maven POM properties
+pomName=Gini Merchant SDK for Android
+pomDescription=The Gini Merchant SDK for Android provides all the UI and functionality needed to use the Gini Pay Connect payment method in Android apps.
+pomUrl=http://developer.gini.net/gini-mobile-android/merchant-sdk/sdk/html/
+pomLicenseName=Private License
+pomLicenseUrl=http://developer.gini.net/gini-mobile-android/merchant-sdk/sdk/html/license.html
+pomDeveloperId=alpar.gini
+pomDeveloperName=Alpar Szotyori
+pomDeveloperEmail=alpar@gini.net
+pomScmConnection=scm:git:github.com:gini/gini-mobile-android.git
+pomScmDeveloperConnection=scm:git:git@github.com:gini/gini-mobile-android.git
+pomScmUrl=https://github.com/gini/gini-mobile-android/tree/main/merchant-sdk
+
+# Android
+android.useAndroidX=true
diff --git a/merchant-sdk/sdk/module.md b/merchant-sdk/sdk/module.md
new file mode 100644
index 0000000000..2803f89665
--- /dev/null
+++ b/merchant-sdk/sdk/module.md
@@ -0,0 +1,3 @@
+# Module sdk
+
+## Gini Merchant SDK for Android
diff --git a/merchant-sdk/sdk/proguard-rules.pro b/merchant-sdk/sdk/proguard-rules.pro
new file mode 100644
index 0000000000..481bb43481
--- /dev/null
+++ b/merchant-sdk/sdk/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/androidTest/java/net/gini/pay/ginipaybusiness/ExampleInstrumentedTest.kt b/merchant-sdk/sdk/src/androidTest/java/net/gini/pay/ginipaybusiness/ExampleInstrumentedTest.kt
new file mode 100644
index 0000000000..dd76874dd0
--- /dev/null
+++ b/merchant-sdk/sdk/src/androidTest/java/net/gini/pay/ginipaybusiness/ExampleInstrumentedTest.kt
@@ -0,0 +1,22 @@
+package net.gini.pay.ginipaybusiness
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.*
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("net.gini.android.merchant.sdk", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/doc/.gitignore b/merchant-sdk/sdk/src/doc/.gitignore
new file mode 100644
index 0000000000..8eba6c8dd4
--- /dev/null
+++ b/merchant-sdk/sdk/src/doc/.gitignore
@@ -0,0 +1 @@
+src/
diff --git a/merchant-sdk/sdk/src/doc/Makefile b/merchant-sdk/sdk/src/doc/Makefile
new file mode 100644
index 0000000000..f8a435fa95
--- /dev/null
+++ b/merchant-sdk/sdk/src/doc/Makefile
@@ -0,0 +1,182 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = build
+
+# User-friendly check for sphinx-build
+ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
+$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
+endif
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  livehtml   to launch a lightweight webserver for previewing during editing on http://127.0.0.1:8000 with reload on file changes"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  xml        to make Docutils-native XML files"
+	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+	rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+livehtml:
+	@echo "Running sphinx-autobuild. Be productive, yes?"
+	sphinx-autobuild -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/GiniAPI.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/GiniAPI.qhc"
+
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/GiniAPI"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/GiniAPI"
+	@echo "# devhelp"
+
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+latexpdfja:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through platex and dvipdfmx..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+texinfo:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+gettext:
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
+
+xml:
+	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
+	@echo
+	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
+
+pseudoxml:
+	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
+	@echo
+	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
diff --git a/merchant-sdk/sdk/src/doc/make.bat b/merchant-sdk/sdk/src/doc/make.bat
new file mode 100644
index 0000000000..80534c442d
--- /dev/null
+++ b/merchant-sdk/sdk/src/doc/make.bat
@@ -0,0 +1,242 @@
+@ECHO OFF
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set BUILDDIR=build
+set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% source
+set I18NSPHINXOPTS=%SPHINXOPTS% source
+if NOT "%PAPER%" == "" (
+	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
+	set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
+)
+
+if "%1" == "" goto help
+
+if "%1" == "help" (
+	:help
+	echo.Please use `make ^<target^>` where ^<target^> is one of
+	echo.  html       to make standalone HTML files
+	echo.  dirhtml    to make HTML files named index.html in directories
+	echo.  singlehtml to make a single large HTML file
+	echo.  pickle     to make pickle files
+	echo.  json       to make JSON files
+	echo.  htmlhelp   to make HTML files and a HTML help project
+	echo.  qthelp     to make HTML files and a qthelp project
+	echo.  devhelp    to make HTML files and a Devhelp project
+	echo.  epub       to make an epub
+	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
+	echo.  text       to make text files
+	echo.  man        to make manual pages
+	echo.  texinfo    to make Texinfo files
+	echo.  gettext    to make PO message catalogs
+	echo.  changes    to make an overview over all changed/added/deprecated items
+	echo.  xml        to make Docutils-native XML files
+	echo.  pseudoxml  to make pseudoxml-XML files for display purposes
+	echo.  linkcheck  to check all external links for integrity
+	echo.  doctest    to run all doctests embedded in the documentation if enabled
+	goto end
+)
+
+if "%1" == "clean" (
+	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
+	del /q /s %BUILDDIR%\*
+	goto end
+)
+
+
+%SPHINXBUILD% 2> nul
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.http://sphinx-doc.org/
+	exit /b 1
+)
+
+if "%1" == "html" (
+	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
+	goto end
+)
+
+if "%1" == "dirhtml" (
+	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
+	goto end
+)
+
+if "%1" == "singlehtml" (
+	%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
+	goto end
+)
+
+if "%1" == "pickle" (
+	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can process the pickle files.
+	goto end
+)
+
+if "%1" == "json" (
+	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can process the JSON files.
+	goto end
+)
+
+if "%1" == "htmlhelp" (
+	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can run HTML Help Workshop with the ^
+.hhp project file in %BUILDDIR%/htmlhelp.
+	goto end
+)
+
+if "%1" == "qthelp" (
+	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can run "qcollectiongenerator" with the ^
+.qhcp project file in %BUILDDIR%/qthelp, like this:
+	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\GiniAPI.qhcp
+	echo.To view the help file:
+	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\GiniAPI.ghc
+	goto end
+)
+
+if "%1" == "devhelp" (
+	%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished.
+	goto end
+)
+
+if "%1" == "epub" (
+	%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The epub file is in %BUILDDIR%/epub.
+	goto end
+)
+
+if "%1" == "latex" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "latexpdf" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	cd %BUILDDIR%/latex
+	make all-pdf
+	cd %BUILDDIR%/..
+	echo.
+	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "latexpdfja" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	cd %BUILDDIR%/latex
+	make all-pdf-ja
+	cd %BUILDDIR%/..
+	echo.
+	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "text" (
+	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The text files are in %BUILDDIR%/text.
+	goto end
+)
+
+if "%1" == "man" (
+	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The manual pages are in %BUILDDIR%/man.
+	goto end
+)
+
+if "%1" == "texinfo" (
+	%SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo.
+	goto end
+)
+
+if "%1" == "gettext" (
+	%SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
+	goto end
+)
+
+if "%1" == "changes" (
+	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.The overview file is in %BUILDDIR%/changes.
+	goto end
+)
+
+if "%1" == "linkcheck" (
+	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Link check complete; look for any errors in the above output ^
+or in %BUILDDIR%/linkcheck/output.txt.
+	goto end
+)
+
+if "%1" == "doctest" (
+	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Testing of doctests in the sources finished, look at the ^
+results in %BUILDDIR%/doctest/output.txt.
+	goto end
+)
+
+if "%1" == "xml" (
+	%SPHINXBUILD% -b xml %ALLSPHINXOPTS% %BUILDDIR%/xml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The XML files are in %BUILDDIR%/xml.
+	goto end
+)
+
+if "%1" == "pseudoxml" (
+	%SPHINXBUILD% -b pseudoxml %ALLSPHINXOPTS% %BUILDDIR%/pseudoxml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The pseudo-XML files are in %BUILDDIR%/pseudoxml.
+	goto end
+)
+
+:end
diff --git a/merchant-sdk/sdk/src/doc/requirements.txt b/merchant-sdk/sdk/src/doc/requirements.txt
new file mode 100644
index 0000000000..528a22a538
--- /dev/null
+++ b/merchant-sdk/sdk/src/doc/requirements.txt
@@ -0,0 +1,2 @@
+-e git+https://github.com/gini/gini_sphinx_theme_vision.git#egg=gini_sphinx_theme-master
+docutils==0.17.1
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/doc/source/_static/logo_flat.png b/merchant-sdk/sdk/src/doc/source/_static/logo_flat.png
new file mode 100644
index 0000000000..28c495a388
Binary files /dev/null and b/merchant-sdk/sdk/src/doc/source/_static/logo_flat.png differ
diff --git a/merchant-sdk/sdk/src/doc/source/authentication.rst b/merchant-sdk/sdk/src/doc/source/authentication.rst
new file mode 100644
index 0000000000..e259f9d81c
--- /dev/null
+++ b/merchant-sdk/sdk/src/doc/source/authentication.rst
@@ -0,0 +1,12 @@
+Authentication
+==============
+
+The entry point for the Gini Merchant SDK is the ``GiniMerchant`` class.
+
+The ``GiniMerchant`` class can be built either with client credentials (clientId and clientSecret)
+or with a ``SessionManager`` if you have a token:
+
+- ``GiniMerchant(context: Context, clientId: String, clientSecret: String, emailDomain: String)``
+- ``GiniMerchant(context: Context, sessionManager: SessionManager)``
+
+``SessionManager`` is an interface which you need to implement to send the token.
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/doc/source/conf.py b/merchant-sdk/sdk/src/doc/source/conf.py
new file mode 100644
index 0000000000..7d92ff3d08
--- /dev/null
+++ b/merchant-sdk/sdk/src/doc/source/conf.py
@@ -0,0 +1,281 @@
+# -*- coding: utf-8 -*-
+#
+# Gini API documentation build configuration file, created by
+# sphinx-quickstart on Thu Jan 23 17:02:36 2014.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys
+import os
+
+import gini_sphinx_theme
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.insert(0, os.path.abspath('.'))
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = ['sphinx.ext.todo', 'sphinx.ext.extlinks']
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'Gini Merchant SDK for Android'
+copyright = u'2014-2024, Gini GmbH'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+#version = '2.0'
+# The full version, including alpha/beta/rc tags.
+#release = '2.0'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = []
+
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+# If true, keep warnings as "system message" paragraphs in the built documents.
+#keep_warnings = False
+
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+html_theme = 'gini_sphinx_theme'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+html_theme_options = {
+    "google_analytics_id": os.environ.get("GOOGLE_ANALYTICS_ID"),
+    "logo_path": "_static/logo_flat.png"
+}
+
+# Add any paths that contain custom themes here, relative to this directory.
+html_theme_path = [gini_sphinx_theme.get_html_theme_path()]
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Add any extra paths that contain custom files (such as robots.txt or
+# .htaccess) here, relative to this directory. These files are copied
+# directly to the root of the documentation.
+#html_extra_path = []
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+html_sidebars = {
+    '**': ['localtoc.html', 'searchbox.html']
+}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+html_use_index = False
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+html_show_sourcelink = False
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+html_show_copyright = False
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'GiniMerchantSDKDoc'
+
+
+# -- Options for LaTeX output ---------------------------------------------
+
+latex_elements = {
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+  ('index', 'GiniMerchantSDK.tex', u'Gini Merchant SDK Documentation',
+   u'Gini', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output ---------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+# man_pages = [
+#     ('index', 'giniapi', u'Gini API Documentation',
+#      [u'Gini'], 1)
+# ]
+
+# If true, show URL addresses after external links.
+#man_show_urls = False
+
+
+# -- Options for Texinfo output -------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+# texinfo_documents = [
+#   ('index', 'GiniAPI', u'Gini API Documentation',
+#    u'Gini', 'GiniAPI', 'One line description of project.',
+#    'Miscellaneous'),
+# ]
+
+# Documents to append as an appendix to all manuals.
+#texinfo_appendices = []
+
+# If false, no module index is generated.
+#texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#texinfo_show_urls = 'footnote'
+
+# If true, do not generate a @detailmenu in the "Top" node's menu.
+#texinfo_no_detailmenu = False
+
+todo_include_todos = os.environ.get("TODO", "1") == "1"
+
+# -- Inject versioned dokka link -------------------------------------------
+project_version = os.getenv("PROJECT_VERSION")
+
+if project_version != None:
+    version_path = "/%(project_version)s/" % {"project_version" : project_version}
+else:
+    version_path = "/"
+
+root_dokka_path = "https://developer.gini.net/gini-mobile-android/merchant-sdk/sdk%(version_path)sdokka/" % {"version_path" : version_path}
+
+extlinks = {
+    "root_dokka_path": (root_dokka_path + "%s", "%s"),
+}
diff --git a/merchant-sdk/sdk/src/doc/source/customization.rst b/merchant-sdk/sdk/src/doc/source/customization.rst
new file mode 100644
index 0000000000..2e986576a8
--- /dev/null
+++ b/merchant-sdk/sdk/src/doc/source/customization.rst
@@ -0,0 +1,230 @@
+UI Customization Guide
+======================
+
+..
+  Headers:
+  h1 =====
+  h2 -----
+  h3 ~~~~~
+  h4 +++++
+  h5 ^^^^^
+
+.. contents::
+   :depth: 1
+   :local:
+
+Overview of UI customization options
+------------------------------------
+
+Styles
+~~~~~~
+
+We leverage the power of Material Design to configure a theme for the SDK with a global color palette and typography
+that is applied on all the screens. By using global styles for the various widgets, we enable you to customize them in a
+single place. They are then consistently applied on all screens.
+
+Theme
++++++
+
+The theme style is based on Material Design v3 and is named ``GiniMerchantTheme``. To override the theme in your
+application, use ``Root.GiniMerchantTheme`` as the parent:
+
+.. code-block:: xml
+
+    <style name="GiniMerchantTheme" parent="Root.GiniMerchantTheme">
+      (...)
+    </style>
+
+Widgets
++++++++
+
+The style of buttons and other widgets is based on Material Design v3. To override them in your application, use the
+root style as the parent, for example:
+
+.. code-block:: xml
+
+    <style name="GiniMerchantTheme.Widget.Button.OutlinedButton" parent="Root.GiniMerchantTheme.Widget.Button.OutlinedButton">
+      (...)
+    </style>
+
+.. note::
+
+    If you wish to change the button height please override ``android:minHeight``. We are using ``android:minHeight`` to
+    support text resizing for accessibility.
+
+    You may also force the height to a certain dimension by overriding both
+    ``android:minHeight`` and ``android:height``, although we don't recommend this as it will prevent the button from increasing
+    height to fit larger font sizes.
+
+.. warning::
+
+    Material Design buttons include insets which will decrease the visible height of the buttons. You can override
+    ``android:insetTop`` and ``android:insetBottom`` to remove or adjust the vertical insets.
+
+Colors
+~~~~~~
+
+We provide a global color palette which you are free to override. The custom colors are then applied to all screens.
+Customization of colors is done via overriding of color resources. For example to override the color ``gms_accent_01`` add
+the following snippet to one of your resources XML file (e.g, ``colors.xml``):
+
+.. code-block:: xml
+
+    <color name="gms_accent_01">#424242</color>
+
+.. note::
+
+    If you overridde the ``GiniMerchantTheme``, the theme colors you set there override the color palette customization.
+
+Find the names of the color resources in the color palette (you can also view it in Figma `here
+<https://www.figma.com/design/L4VkRRCLQcUR6pvSe0axtE/Android-Gini-Merchant-SDK-1.0-UI-Customisation?node-id=12530-4709&t=SIAN8JzXJ0GIPfwg-0>`_):
+
+.. raw:: html
+
+    <iframe style="border: 1px solid rgba(0, 0, 0, 0.1);" width="600" height="450"
+    src="https://www.figma.com/embed?embed_host=share&url=https://www.figma.com/design/L4VkRRCLQcUR6pvSe0axtE/Android-Gini-Merchant-SDK-1.0-UI-Customisation?node-id=12530-5745&t=SIAN8JzXJ0GIPfwg-0"
+    allowfullscreen></iframe>
+
+|
+
+Images
+~~~~~~
+
+Customizing of images is done via overriding of drawable resources. Find the drawable resource names in the
+screen-by-screen UI customisation sections below. We mostly use vector drawables.
+Due to the limitations of vector drawables, some images had to be added as PNGs.
+
+.. note::
+
+    If you use vector drawables, add them to the ``drawable-anydpi`` and ``drawable-night-anydpi`` folders so that they also
+    override any density specific PNGs.
+
+If you want to override specific SDK images:
+
+1. Add your own images to your app's ``res/drawable-*`` folders using the image names from the UI customization guide.
+   It is important to name the images you wish to override exactly as shown in the UI customization guide, otherwise
+   overriding won't work.
+2. If you use vector drawables, add them to the ``drawable-anydpi`` (``drawable-night-anydpi`` for dark mode) folders so
+   that they also override any density specific images.
+
+Typography
+~~~~~~~~~~~
+
+We provide global typography based on text appearance styles from Material Design v2. To override them in your
+application, use the root style as the parent, for example:
+
+.. code-block:: xml
+
+    <style name="GiniMerchantTheme.Typography.Body1" parent="Root.GiniMerchantTheme.Typography.Body1">
+       (...)
+    </style>
+
+.. note::
+
+
+    If you override the ``GiniMerchantTheme``, the text appearances you set there override the typography customization. The
+    same applies to the override of widget styles where you set a custom text appearance.
+
+    We use ``android:lineSpacingMultiplier`` in combination with ``android:textSize`` to support resizing text for accessibility and avoid overlapping text.
+
+Preview our typography and find the names of the style resources (you can also view it in Figma `here
+<https://www.figma.com/design/L4VkRRCLQcUR6pvSe0axtE/Android-Gini-Merchant-SDK-1.0-UI-Customisation?node-id=12530-5837&t=SIAN8JzXJ0GIPfwg-0>`_):
+
+.. raw:: html
+
+    <iframe style="border: 1px solid rgba(0, 0, 0, 0.1);" width="600" height="450"
+    src="https://www.figma.com/embed?embed_host=share&url=https://www.figma.com/design/L4VkRRCLQcUR6pvSe0axtE/Android-Gini-Merchant-SDK-1.0-UI-Customisation?node-id=12530-5837&t=SIAN8JzXJ0GIPfwg-0"
+    allowfullscreen></iframe>
+
+|
+
+Text
+~~~~
+
+Text customization is done via overriding of string resources.
+
+Dark mode
+~~~~~~~~~~
+
+To customize resources for dark mode, add them to resource folders containing the ``-night`` resource qualifier. If you
+decide to customize the color palette, please ensure that the text colors are also set in contrast to the background
+colors.
+
+UI customization options
+------------------------
+
+Payment Component
+~~~~~~~~~~~~~~~~~
+
+You can also view the UI customisation guide in Figma `here
+<https://www.figma.com/design/L4VkRRCLQcUR6pvSe0axtE/Android-Gini-Merchant-SDK-1.0-UI-Customisation?node-id=12530-4843&t=SIAN8JzXJ0GIPfwg-0>`_.
+
+.. note::
+
+    To copy text from Figma you need to have a Figma account. If you don't have one, you can create one for free.
+
+.. raw:: html
+
+    <iframe style="border: 1px solid rgba(0, 0, 0, 0.1);" width="600" height="450"
+    src="https://www.figma.com/embed?embed_host=share&url=https://www.figma.com/design/L4VkRRCLQcUR6pvSe0axtE/Android-Gini-Merchant-SDK-1.0-UI-Customisation?node-id=12530-4843&t=SIAN8JzXJ0GIPfwg-0"
+    allowfullscreen></iframe>
+
+|
+
+Bank Selection Bottom Sheet
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You can also view the UI customisation guide in Figma `here
+<https://www.figma.com/design/L4VkRRCLQcUR6pvSe0axtE/Android-Gini-Merchant-SDK-1.0-UI-Customisation?node-id=12530-4904&t=SIAN8JzXJ0GIPfwg-0>`_.
+
+.. note::
+
+    To copy text from Figma you need to have a Figma account. If you don't have one, you can create one for free.
+
+.. raw:: html
+
+    <iframe style="border: 1px solid rgba(0, 0, 0, 0.1);" width="600" height="450"
+    src="https://www.figma.com/embed?embed_host=share&url=https://www.figma.com/design/L4VkRRCLQcUR6pvSe0axtE/Android-Gini-Merchant-SDK-1.0-UI-Customisation?node-id=12530-4904&t=SIAN8JzXJ0GIPfwg-0"
+    allowfullscreen></iframe>
+
+|
+
+Payment Feature Info Screen
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You can also view the UI customisation guide in Figma `here
+<https://www.figma.com/design/L4VkRRCLQcUR6pvSe0axtE/Android-Gini-Merchant-SDK-1.0-UI-Customisation?node-id=12530-4931&t=SIAN8JzXJ0GIPfwg-0>`_.
+
+.. warning::
+
+    You need to override the ``gms_privacy_policy_link_url`` string resource to provide a link to your company's privacy
+    policy page. This link will be shown to users in the answer to the "Who or what is Gini?" question.
+
+.. note::
+
+    To copy text from Figma you need to have a Figma account. If you don't have one, you can create one for free.
+
+.. raw:: html
+
+    <iframe style="border: 1px solid rgba(0, 0, 0, 0.1);" width="600" height="450"
+    src="https://www.figma.com/embed?embed_host=share&url=https://www.figma.com/design/L4VkRRCLQcUR6pvSe0axtE/Android-Gini-Merchant-SDK-1.0-UI-Customisation?node-id=12530-4931&t=SIAN8JzXJ0GIPfwg-0"
+    allowfullscreen></iframe>
+
+|
+
+Payment Review Screen
+~~~~~~~~~~~~~~~~~~~~~
+
+You can also view the UI customisation guide in Figma `here
+<https://www.figma.com/design/L4VkRRCLQcUR6pvSe0axtE/Android-Gini-Merchant-SDK-1.0-UI-Customisation?node-id=12530-5024&t=SIAN8JzXJ0GIPfwg-0>`_.
+
+.. note::
+
+    To copy text from Figma you need to have a Figma account. If you don't have one, you can create one for free.
+
+.. raw:: html
+
+    <iframe style="border: 1px solid rgba(0, 0, 0, 0.1);" width="600" height="450"
+    src="https://www.figma.com/embed?embed_host=share&url=https://www.figma.com/design/L4VkRRCLQcUR6pvSe0axtE/Android-Gini-Merchant-SDK-1.0-UI-Customisation?node-id=12530-5024&t=SIAN8JzXJ0GIPfwg-0"
+    allowfullscreen></iframe>
+
diff --git a/merchant-sdk/sdk/src/doc/source/event-tracking.rst b/merchant-sdk/sdk/src/doc/source/event-tracking.rst
new file mode 100644
index 0000000000..0f62b7470b
--- /dev/null
+++ b/merchant-sdk/sdk/src/doc/source/event-tracking.rst
@@ -0,0 +1,19 @@
+Event Tracking
+==============
+
+GiniMerchant
+----------
+
+The ``GiniMerchant`` class exposes a kotlin flow which you can collect to track events:
+
+* ``eventsFlow`` is a ``SharedFlow`` of ``MerchantSDKEvents``. It emits the following events:
+   * ``NoAction`` is the idle state
+   * ``OnLoading`` when communicating with the Gini Merchant API (e.g., creating a payment request).
+   * ``OnScreenDisplayed(displayedScreen)`` when there is a change in the screens displayed within the payment flow.
+   * ``OnFinishedWithPaymentRequestCreated(paymentRequestId, paymentProviderName)`` when the payment request is ready and the user is redirected to the bank.
+   * ``OnFinishedWithCancellation`` when the payment flow was cancelled. Can be either from an internal error, or from exiting the payment flow without finalising it.
+   * ``OnErrorOccurred(throwable)`` when there was an error within the payment flow.
+
+.. note::
+
+    ``OnFinishedWithPaymentRequestCreated`` and ``OnFinishedWithCancellation`` can be checked for to remove the ``PaymentFragment`` from the hierarchy.
diff --git a/merchant-sdk/sdk/src/doc/source/flow.rst b/merchant-sdk/sdk/src/doc/source/flow.rst
new file mode 100644
index 0000000000..1c129c55d6
--- /dev/null
+++ b/merchant-sdk/sdk/src/doc/source/flow.rst
@@ -0,0 +1,58 @@
+Flow
+====
+
+``GiniMerchant`` and ``PaymentFragment`` are the main classes for interacting with the Gini Merchant SDK. ``GiniMerchant``
+manages interaction with the Gini Merchant API and ``PaymentFragment`` handles the data and the logic for displaying related screens.
+
+.. contents:: The recommended flow is:
+   :local:
+
+Create the GiniMerchant instance
+------------------------------
+
+The ``GiniMerchant`` class can be built either with client credentials (clientId and clientSecret)
+or with a ``SessionManager`` if you have a token:
+
+- ``GiniMerchant(context: Context, clientId: String, clientSecret: String, emailDomain: String)``
+- ``GiniMerchant(context: Context, sessionManager: SessionManager)``
+
+``SessionManager`` is an interface which you need to implement to send the token.
+
+Load payment providers
+----------------------
+
+You can call ``giniMerchant.loadPaymentProviderApps()`` to load the available payment providers and to check which ones are installed on the user's device.
+
+This step is optional, as the method is called when starting the payment flow. Calling it beforehand will lead to a faster load of the payment flow.
+
+Create the PaymentFragment instance
+------------------------------------
+
+Create an instance of ``PaymentFragment`` and load it into the hierarchy.
+
+For creating an instance of the ``PaymentFragment`` you need to use the ``createFragment`` method provided by ``GiniMerchant``, passing in the payment details (IBAN, Amount, Purpose and Recipient).
+The ``GiniMerchantSDK`` expects the payment details to not be empty, and will throw an ``IllegalStateException`` if any of the fields are empty.
+
+.. code-block:: kotlin
+
+    val paymentFragment = giniMerchant.createFragment(iban, recipient, amount, purpose)
+
+.. note::
+
+    Optionally, you can pass in an instance of ``PaymentFlowConfiguration``.
+
+    The ``PaymentFlowConfiguration`` class contains the following options:
+
+    - ``shouldHandleErrorsInternally``: If set to ``true``, ``GiniMerchant`` will handle errors internally and show
+      snackbars for errors. If set to ``false``, errors will be ignored by the ``GiniMerchant``. In this case the flows
+      exposed by ``GiniMerchant`` should be observed for errors. Default value is ``true``.
+    - ``showReviewFragment``: If set to ``true``, the user will be able to review the payment details before continuing with the payment. Default value is ``false``.
+
+.. note::
+
+    Users will have the chance to edit their payment information in their banking app, even if ``showReviewFragment`` is set to false.
+
+Event Tracking
+--------------
+
+``GiniMerchant`` exposes ``eventFlow``, which can be collected by client apps to be aware of state / events / errors happening within the SDK.
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/doc/source/images/testing/BankSDKExampleAppPaymentDetails.png b/merchant-sdk/sdk/src/doc/source/images/testing/BankSDKExampleAppPaymentDetails.png
new file mode 100644
index 0000000000..2c0c862144
Binary files /dev/null and b/merchant-sdk/sdk/src/doc/source/images/testing/BankSDKExampleAppPaymentDetails.png differ
diff --git a/merchant-sdk/sdk/src/doc/source/images/testing/BankSDKExampleAppReturnToBusinessApp.png b/merchant-sdk/sdk/src/doc/source/images/testing/BankSDKExampleAppReturnToBusinessApp.png
new file mode 100644
index 0000000000..340e72456c
Binary files /dev/null and b/merchant-sdk/sdk/src/doc/source/images/testing/BankSDKExampleAppReturnToBusinessApp.png differ
diff --git a/merchant-sdk/sdk/src/doc/source/images/testing/BankSelectionBottomSheet.png b/merchant-sdk/sdk/src/doc/source/images/testing/BankSelectionBottomSheet.png
new file mode 100644
index 0000000000..0d5e2d45c5
Binary files /dev/null and b/merchant-sdk/sdk/src/doc/source/images/testing/BankSelectionBottomSheet.png differ
diff --git a/merchant-sdk/sdk/src/doc/source/images/testing/MoreInformationScreen.png b/merchant-sdk/sdk/src/doc/source/images/testing/MoreInformationScreen.png
new file mode 100644
index 0000000000..c6b0a9f553
Binary files /dev/null and b/merchant-sdk/sdk/src/doc/source/images/testing/MoreInformationScreen.png differ
diff --git a/merchant-sdk/sdk/src/doc/source/images/testing/PaymentComponentScreen.png b/merchant-sdk/sdk/src/doc/source/images/testing/PaymentComponentScreen.png
new file mode 100644
index 0000000000..7896b7cf7b
Binary files /dev/null and b/merchant-sdk/sdk/src/doc/source/images/testing/PaymentComponentScreen.png differ
diff --git a/merchant-sdk/sdk/src/doc/source/images/testing/PaymentReviewScreen.png b/merchant-sdk/sdk/src/doc/source/images/testing/PaymentReviewScreen.png
new file mode 100644
index 0000000000..46bf27dc54
Binary files /dev/null and b/merchant-sdk/sdk/src/doc/source/images/testing/PaymentReviewScreen.png differ
diff --git a/merchant-sdk/sdk/src/doc/source/images/testing/bank_payment_details.png b/merchant-sdk/sdk/src/doc/source/images/testing/bank_payment_details.png
new file mode 100644
index 0000000000..62fdc8e100
Binary files /dev/null and b/merchant-sdk/sdk/src/doc/source/images/testing/bank_payment_details.png differ
diff --git a/merchant-sdk/sdk/src/doc/source/images/testing/bank_resolved_payment.png b/merchant-sdk/sdk/src/doc/source/images/testing/bank_resolved_payment.png
new file mode 100644
index 0000000000..54c907e965
Binary files /dev/null and b/merchant-sdk/sdk/src/doc/source/images/testing/bank_resolved_payment.png differ
diff --git a/merchant-sdk/sdk/src/doc/source/images/testing/business_review_fragment.png b/merchant-sdk/sdk/src/doc/source/images/testing/business_review_fragment.png
new file mode 100644
index 0000000000..281ddad584
Binary files /dev/null and b/merchant-sdk/sdk/src/doc/source/images/testing/business_review_fragment.png differ
diff --git a/merchant-sdk/sdk/src/doc/source/index.rst b/merchant-sdk/sdk/src/doc/source/index.rst
new file mode 100644
index 0000000000..6d95c27415
--- /dev/null
+++ b/merchant-sdk/sdk/src/doc/source/index.rst
@@ -0,0 +1,23 @@
+Gini Merchant SDK for Android
+===========================
+
+The Gini Merchant SDK for Android provides all the UI and functionality needed to use the Gini Pay Connect payment
+method in Android apps. The payment information can be reviewed and paid using any available payment provider app (e.g.,
+banking app).
+
+The Gini Merchant API provides a secure channel for sharing payment related information between clients.
+
+Table of contents
+-----------------
+
+.. toctree::
+    :maxdepth: 1
+
+    setup
+    authentication
+    flow
+    event-tracking
+    testing
+    customization
+    reference
+    license
diff --git a/merchant-sdk/sdk/src/doc/source/license.rst b/merchant-sdk/sdk/src/doc/source/license.rst
new file mode 100644
index 0000000000..2fa8bd51ad
--- /dev/null
+++ b/merchant-sdk/sdk/src/doc/source/license.rst
@@ -0,0 +1,68 @@
+=======
+License
+=======
+
+The Gini Merchant SDK for Android is licensed under a Private License and
+also integrates several third party libraries. 
+
+.. IMPORTANT::
+   Always make sure to ship all license notices and permissions with your application.
+
+::
+
+   Copyright (c) 2014-2022, Gini GmbH
+   All rights reserved.
+   
+   The Gini Merchant SDK is licensed through Gini GmbH ("Gini") and may not be
+   used, altered or copied in any way without explicit permission by Gini. The
+   terms of usage are defined in a separate usage agreement between Gini and the
+   licensee, where the licensee can gain access to a non-exclusive,
+   non-transferable usage right which is restricted for the time of a contractual
+   relationship between Gini and the licensee.
+
+   For license related inquiries contact Gini via the email address 
+   technical-support@gini.net.
+
+
+Licenses and Acknowledgements for Incorporated Software
+=======================================================
+
+This project makes use of the following third party libraries:
+
+PhotoView
+---------
+
+::
+
+   Copyright 2018 Chris Banes
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+Insetter
+--------
+
+::
+
+   Copyright 2019 Google LLC.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/doc/source/reference.rst b/merchant-sdk/sdk/src/doc/source/reference.rst
new file mode 100644
index 0000000000..303ca658f8
--- /dev/null
+++ b/merchant-sdk/sdk/src/doc/source/reference.rst
@@ -0,0 +1,6 @@
+Reference Docs
+==============
+
+You can view the reference documentation here:
+
+* :root_dokka_path:`Gini Merchant SDK reference documentation <index.html>`
diff --git a/merchant-sdk/sdk/src/doc/source/setup.rst b/merchant-sdk/sdk/src/doc/source/setup.rst
new file mode 100644
index 0000000000..423f17071b
--- /dev/null
+++ b/merchant-sdk/sdk/src/doc/source/setup.rst
@@ -0,0 +1,46 @@
+Getting started
+===============
+
+Installation
+------------
+
+Add our sdk to your dependencies:
+
+build.gradle:
+
+.. code-block:: groovy
+
+    dependencies {
+        implementation 'net.gini.android:gini-merchant-sdk:1.0.0'
+    }
+
+Gini Pay Deep Link For Your App
+-------------------------------
+
+In order for banking apps to be able to return the user to your app after the payment has been resolved you can
+register one of your activities to respond to a deep link scheme known by the Gini Merchant API.
+
+You should already have a scheme and host from us. Please contact us in case you don't have them.
+
+The following is an example for the deep link ``ginipay-business://payment-requester``:
+
+.. code-block:: xml
+
+    <activity android:name=".YourActivity">
+        <intent-filter>
+            <action android:name="android.intent.action.VIEW" />
+
+            <category android:name="android.intent.category.DEFAULT" />
+            
+            <data
+                android:host="payment-requester" 
+                android:scheme="ginipay-business" />
+        </intent-filter>
+    </activity>
+
+Gini Merchant API Client Credentials
+-------------------------------
+
+You should have received Gini Merchant API client credentials from us. Please get in touch with us in case you don't have them.
+
+Continue to `Authentication <authentication.html>`_ to see how to use the client credentials to initialize the Gini Merchant SDK.
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/doc/source/testing.rst b/merchant-sdk/sdk/src/doc/source/testing.rst
new file mode 100644
index 0000000000..807b0ac5c5
--- /dev/null
+++ b/merchant-sdk/sdk/src/doc/source/testing.rst
@@ -0,0 +1,132 @@
+Testing
+=======
+
+Requirements
+------------
+
+Example banking app
+~~~~~~~~~~~~~~~~~~~
+
+An example banking app is available in the `Gini Bank SDK <https://github.com/gini/gini-mobile-android/tree/main/bank-sdk>`_
+repository called ``example-app``.
+
+You can use the same Gini Merchant API client credentials in the example banking app as in your app, if not otherwise
+specified.
+
+Development Gini Merchant API client credentials
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In order to test using the Gini Bank SDK's example banking app, you will need to use development client credentials in
+your app for the Gini Merchant SDK. This will make sure the Gini Merchant SDK receives test payment providers that work
+with the Gini Bank SDK's example banking app.
+
+End to end testing
+------------------
+
+Example banking app
+~~~~~~~~~~~~~~~~~~~
+
+After you've set the client credentials in the Gini Bank SDK example app you can install it on your device by using the
+``devPaymentProvider1Debug`` build flavor. This will allow the Gini Merchant SDK to detect it as the banking app for
+the ``Gini-Test-Payment-Provider``.
+
+.. note::
+    You can also install the Gini Bank SDK example app's ``devPaymentProvider2Debug`` and ``devPaymentProvider3Debug`` build
+    variants to test with two additional example banking apps named ``GiniBank`` and ``Bank``.
+
+Payment fragment
+~~~~~~~~~~~~~~~~~
+
+By following the `flow guide <flow.html>`_ you should be showing the ``PaymentFragment`` when wanting to pay an order. The following screenshot shows a sample invoice for which
+the ``PaymentFragment`` is shown.
+
+.. image:: images/testing/PaymentComponentScreen.png
+    :alt: Screenshot of an order with PayymentFragment showing the Gini-Test-Payment-Provider.
+    :width: 200px
+    :align: center
+
+|
+
+Bank picker
+~~~~~~~~~~~
+
+You should see the ``Gini-Test-Payment-Provider`` preselected in ``PaymentFragment`` everytime when starting the flow.  By clicking the picker
+you should see the ``BankSelectionBottomSheet`` with the list of available banking apps (including
+``Gini-Test-Payment-Provider`` and other testing and production apps).
+
+.. image:: images/testing/BankSelectionBottomSheet.png
+    :alt: Screenshot of BankPickerBottomSheet where Gini-Test-Payment-Provider is selected.
+    :width: 200px
+    :align: center
+
+|
+
+More information and FAQ
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+By clicking the ``More information`` button in ``BankSelectionBottomSheet`` you should see the
+``MoreInformationFragment`` with information about the payment feature and an FAQ section.
+
+.. image:: images/testing/MoreInformationScreen.png
+    :alt: Screenshot of the More Information and FAQ screen.
+    :width: 200px
+    :align: center
+
+|
+
+Payment review
+~~~~~~~~~~~~~~~
+
+If the ``PaymentFragment`` was created with an instance of ``PaymentFlowConfiguration`` with the ``showReviewFragment`` option set to true,
+by clicking the "Pay the invoice" button on the ``PaymentFragment`` you should see the ``ReviewFragment``. It
+shows the payment information. It also allows editing the amount. The "To the
+banking app" button should have the icon and colors of the banking app, which was selected in the
+``BankSelectionBottomSheet``.
+
+.. image:: images/testing/PaymentReviewScreen.png
+    :alt: Screenshot of the Payment Review screen showing the Gini-Test-Payment-Provider.
+    :width: 200px
+    :align: center
+
+|
+
+Execute payment
+~~~~~~~~~~~~~~~
+
+When clicking the "To the banking app" button on the ``ReviewFragment`` you should be redirected to the example banking
+app where the payment information will be fetched from Gini (including any changes you made on the
+``ReviewFragment``). Press the "Pay" button to execute a test payment which will mark the payment as paid in the
+Gini Merchant API.
+
+.. image:: images/testing/BankSDKExampleAppPaymentDetails.png
+    :alt: Screenshot of the example banking app showing the same payment information as the Payment Review screen previously.
+    :width: 200px
+    :align: center
+
+|
+
+Return to your app
+~~~~~~~~~~~~~~~~~~~
+
+After the test payment has been executed, the example banking app should show a "Return to Business" button which should
+take you back to your app.
+
+With these steps completed you have verified that your app, the Gini Merchant API, the Gini Merchant SDK and the Gini Bank
+SDK work together correctly.
+
+.. image:: images/testing/BankSDKExampleAppReturnToBusinessApp.png
+    :alt: Screenshot of the example banking app showing the "Return to Business" button with the same extractions as previously.
+    :width: 200px
+    :align: center
+
+|
+
+Testing in production
+---------------------
+
+The steps are almost the same with the only difference, that instead of the development client credentials you will need
+to use production credentials in your app. This will make sure the Gini Merchant SDK receives only real payment providers
+which open real banking apps.
+
+You will also need to install a banking app which uses the Gini Bank SDK. You should be able to install these from the
+list shown by clicking the bank picker button in the ``PaymentFragment``.
diff --git a/merchant-sdk/sdk/src/main/AndroidManifest.xml b/merchant-sdk/sdk/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..e4e729aabf
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/AndroidManifest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="net.gini.android.merchant.sdk">
+
+    <application>
+        <provider
+            android:name=".util.MerchantSDKFileProvider"
+            android:authorities="${applicationId}.merchant.sdk.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+        <receiver android:name=".util.ShareWithBroadcastReceiver" android:exported="false"/>
+    </application>
+
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.VIEW"/>
+            <!-- It has to match the scheme in Bank.kt -->
+            <data android:scheme="ginipay" android:host="payment"/>
+        </intent>
+    </queries>
+
+</manifest>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/GiniMerchant.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/GiniMerchant.kt
new file mode 100644
index 0000000000..d2f7c9b636
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/GiniMerchant.kt
@@ -0,0 +1,239 @@
+package net.gini.android.merchant.sdk
+
+import android.content.Context
+import android.os.Parcelable
+import androidx.annotation.VisibleForTesting
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.parcelize.Parcelize
+import net.gini.android.core.api.models.Document
+import net.gini.android.health.api.GiniHealthAPI
+import net.gini.android.health.api.GiniHealthAPIBuilder
+import net.gini.android.merchant.sdk.api.ResultWrapper
+import net.gini.android.merchant.sdk.api.authorization.HealthApiSessionManagerAdapter
+import net.gini.android.merchant.sdk.api.authorization.SessionManager
+import net.gini.android.merchant.sdk.api.payment.model.PaymentDetails
+import net.gini.android.merchant.sdk.api.payment.model.PaymentRequest
+import net.gini.android.merchant.sdk.integratedFlow.PaymentFlowConfiguration
+import net.gini.android.merchant.sdk.integratedFlow.PaymentFragment
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.merchant.sdk.util.DisplayedScreen
+import org.slf4j.LoggerFactory
+
+/**
+ *  [GiniMerchant] is one of the main classes for interacting with the Gini Merchant SDK. It provides a way to create the [PaymentFragment],
+ *  which is the entrypoint to the Merchant SDK.
+ *
+ *  [eventsFlow] is used by the [PaymentFragment] to observe its state, but it is public
+ *  so that it can be observed anywhere, the main purpose for this is to observe screen changes and finish events.
+ */
+
+class GiniMerchant(
+    private val context: Context,
+    private val clientId: String = "",
+    private val clientSecret: String = "",
+    private val emailDomain: String = "",
+    private val sessionManager: SessionManager? = null,
+    private val merchantApiBaseUrl: String = MERCHANT_BASE_URL,
+    private val userCenterApiBaseUrl: String? = null,
+    private val debuggingEnabled: Boolean = false,
+) {
+
+    // Lazily initialized backing field for giniHealthAPI to allow mocking it for tests.
+    private var _giniHealthAPI: GiniHealthAPI? = null
+    internal val giniHealthAPI: GiniHealthAPI
+        get() {
+            _giniHealthAPI?.let { return it }
+                ?: run {
+                    val healthAPI = if (sessionManager == null) {
+                        GiniHealthAPIBuilder(
+                            context,
+                            clientId,
+                            clientSecret,
+                            emailDomain,
+                            apiVersion = API_VERSION
+                        )
+                    } else {
+                        GiniHealthAPIBuilder(context, sessionManager = HealthApiSessionManagerAdapter(sessionManager), apiVersion = API_VERSION)
+                    }.apply {
+                        setApiBaseUrl(merchantApiBaseUrl)
+                        if (userCenterApiBaseUrl != null) {
+                            setUserCenterApiBaseUrl(userCenterApiBaseUrl)
+                        }
+                        setDebuggingEnabled(debuggingEnabled)
+                    }.build()
+                    _giniHealthAPI = healthAPI
+                    return healthAPI
+                }
+        }
+
+    internal var paymentComponent = PaymentComponent(context, healthAPI = giniHealthAPI)
+
+    private val _paymentFlow = MutableStateFlow<ResultWrapper<PaymentDetails>>(ResultWrapper.Loading())
+
+    /**
+     * A flow for getting extracted [PaymentDetails] for the document set for review (see [setDocumentForReview]).
+     *
+     * It always starts with [ResultWrapper.Loading] when setting a document.
+     * [PaymentDetails] will be wrapped in [ResultWrapper.Success], otherwise the throwable will
+     * be in a [ResultWrapper.Error].
+     *
+     * It never completes.
+     */
+    internal val paymentFlow: StateFlow<ResultWrapper<PaymentDetails>> = _paymentFlow
+
+    /**
+     * A flow that exposes events from the Merchant SDK. You can collect this flow to be informed about events such as errors,
+     * successful payment requests or which screen is being displayed.
+     */
+
+    private val _eventsFlow: MutableSharedFlow<MerchantSDKEvents> = MutableSharedFlow(extraBufferCapacity = 1)
+
+    val eventsFlow: SharedFlow<MerchantSDKEvents> = _eventsFlow
+
+    @VisibleForTesting
+    internal fun replaceHealthApiInstance(giniHealthAPI: GiniHealthAPI) {
+        _giniHealthAPI = giniHealthAPI
+    }
+
+    /**
+     * Creates and returns the [PaymentFragment]. Checks if [iban], [recipient], [amount] and [purpose] are empty and throws [IllegalStateException] if any of them are.
+     *
+     * @param iban - the iban of the recipient
+     * @param recipient
+     * @param amount - the amount to be paid
+     * @param purpose - the purpose of the payment
+     * @param flowConfiguration - optional parameter with the [PaymentFlowConfiguration]
+     */
+    fun createFragment(iban: String, recipient: String, amount: String, purpose: String, flowConfiguration: PaymentFlowConfiguration? = null): PaymentFragment {
+        if (iban.isEmpty() || recipient.isEmpty() || amount.isEmpty() || purpose.isEmpty()) throw IllegalStateException("Payment details are incomplete.")
+
+        val paymentDetails = PaymentDetails(
+            recipient = recipient,
+            iban = iban,
+            purpose = purpose,
+            amount = amount
+        )
+
+        val paymentFragment = PaymentFragment.newInstance(
+            giniMerchant = this,
+            paymentDetails = paymentDetails,
+            paymentFlowConfiguration = flowConfiguration ?: PaymentFlowConfiguration()
+        )
+        _paymentFlow.tryEmit(ResultWrapper.Success(paymentDetails))
+        return paymentFragment
+    }
+
+    internal fun emitSDKEvent(state: PaymentState) {
+        when (state) {
+            is PaymentState.Success -> _eventsFlow.tryEmit(
+                MerchantSDKEvents.OnFinishedWithPaymentRequestCreated(
+                    state.paymentRequest.id,
+                    state.paymentProviderName
+                )
+            )
+
+            is PaymentState.Error -> _eventsFlow.tryEmit(MerchantSDKEvents.OnErrorOccurred(state.throwable))
+            PaymentState.Loading -> _eventsFlow.tryEmit(MerchantSDKEvents.OnLoading)
+            PaymentState.NoAction -> _eventsFlow.tryEmit(MerchantSDKEvents.NoAction)
+        }
+    }
+
+    internal fun setDisplayedScreen(displayedScreen: DisplayedScreen) {
+        _eventsFlow.tryEmit(MerchantSDKEvents.OnScreenDisplayed(displayedScreen))
+    }
+
+    internal fun setFlowCancelled() {
+        _eventsFlow.tryEmit(MerchantSDKEvents.OnFinishedWithCancellation())
+    }
+
+    /**
+     * Loads payment provider apps - can be used before starting the payment flow for faster loading
+     */
+    suspend fun loadPaymentProviderApps() = paymentComponent.loadPaymentProviderApps()
+
+    private sealed class CapturedArguments : Parcelable {
+        @Parcelize
+        class DocumentInstance(val value: Document) : CapturedArguments()
+
+        @Parcelize
+        class DocumentId(val id: String, val paymentDetails: PaymentDetails? = null) : CapturedArguments()
+    }
+
+    /**
+     * State of the payment request
+     */
+    sealed class PaymentState {
+        /**
+         * Not performing any operation.
+         */
+        object NoAction : PaymentState()
+
+        /**
+         * Request is in progress.
+         */
+        object Loading : PaymentState()
+
+        /**
+         * Payment request was completed successfully
+         *
+         * @param paymentRequest - the payment request
+         * @param paymentProviderName - the name of the payment provider with which the request was created
+         */
+        class Success(val paymentRequest: PaymentRequest, val paymentProviderName: String) : PaymentState()
+
+        /**
+         * Payment request returned an error.
+         */
+        class Error(val throwable: Throwable) : PaymentState()
+    }
+
+    /**
+     * Different events that can be emitted by the MerchantSDK.
+     */
+    sealed class MerchantSDKEvents {
+        object NoAction: MerchantSDKEvents()
+
+        /**
+         * Signal loading started.
+         */
+        object OnLoading: MerchantSDKEvents()
+
+        /**
+         * A change of screens within the [PaymentFragment].
+         *
+         * @param [displayedScreen] - the newly displayed screen. Can be observed to update the activity title.
+         */
+        class OnScreenDisplayed(val displayedScreen: DisplayedScreen): MerchantSDKEvents()
+
+        /**
+         * Payment request finished with success.
+         *
+         * @param [paymentRequestId] - the id of the payment request
+         * @param [paymentProviderName] - the selected payment provider name
+         */
+        class OnFinishedWithPaymentRequestCreated(val paymentRequestId: String,
+                                                  val paymentProviderName: String): MerchantSDKEvents()
+
+        /**
+         * Payment request was cancelled. Can be either from the server, or by cancelling the payment flow.
+         */
+        class OnFinishedWithCancellation(): MerchantSDKEvents()
+
+        /**
+         * An error occurred during the payment request.
+         */
+        class OnErrorOccurred(val throwable: Throwable): MerchantSDKEvents()
+    }
+
+    companion object {
+        const val API_VERSION = 1
+
+        private val LOG = LoggerFactory.getLogger(GiniMerchant::class.java)
+
+        internal const val SHARE_WITH_INTENT_FILTER = "share_intent_filter"
+        internal const val MERCHANT_BASE_URL = "https://merchant-api.gini.net/"
+    }
+}
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/api/ResultWrapper.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/api/ResultWrapper.kt
new file mode 100644
index 0000000000..1ba7693545
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/api/ResultWrapper.kt
@@ -0,0 +1,37 @@
+package net.gini.android.merchant.sdk.api
+
+import net.gini.android.core.api.Resource
+
+/**
+ * Represents the result of processing a document to get its extractions.
+ * Wraps the result of the extraction request.
+ */
+internal sealed class ResultWrapper<out T> {
+
+    /**
+     * Request completed successfully and extractions were returned.
+     */
+    class Success<T>(val value: T) : ResultWrapper<T>()
+
+    /**
+     * Request was unable to complete - returns the cause of the error
+     */
+    class Error<T>(val error: Throwable) : ResultWrapper<T>()
+
+    /**
+     * Request did not complete yet.
+     */
+    class Loading<T> : ResultWrapper<T>()
+}
+
+internal suspend inline fun <T> wrapToResult(crossinline block: suspend () -> Resource<T>): ResultWrapper<T> {
+    return try {
+        when(val resource = block()) {
+            is Resource.Cancelled -> ResultWrapper.Error(Exception("Cancelled"))
+            is Resource.Error -> ResultWrapper.Error(resource.exception ?: Exception(resource.message))
+            is Resource.Success -> ResultWrapper.Success(resource.data)
+        }
+    } catch (throwable: Throwable) {
+        ResultWrapper.Error(throwable)
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/api/authorization/SessionManager.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/api/authorization/SessionManager.kt
new file mode 100644
index 0000000000..c623eba1da
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/api/authorization/SessionManager.kt
@@ -0,0 +1,31 @@
+package net.gini.android.merchant.sdk.api.authorization
+
+import net.gini.android.core.api.Resource
+import net.gini.android.merchant.sdk.api.authorization.model.Session
+
+/**
+ * Interface for managing [Session]s.
+ *
+ * Implement this interface and pass it to the [GiniMerchant] constructor to provide your own session management.
+ */
+interface SessionManager {
+    suspend fun getSession(): Result<Session>
+}
+
+internal class HealthApiSessionManagerAdapter(private val sessionManager: SessionManager): net.gini.android.core.api.authorization.SessionManager {
+
+    override suspend fun getSession(): Resource<net.gini.android.core.api.authorization.Session> {
+        return try {
+            val session = sessionManager.getSession().getOrThrow()
+            Resource.Success(
+                net.gini.android.core.api.authorization.Session(
+                    session.accessToken,
+                    session.expirationDate
+                )
+            )
+        } catch (e: Exception) {
+            Resource.Error(message = e.message, exception = Exception(e))
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/api/authorization/model/Session.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/api/authorization/model/Session.kt
new file mode 100644
index 0000000000..b9969c4979
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/api/authorization/model/Session.kt
@@ -0,0 +1,16 @@
+package net.gini.android.merchant.sdk.api.authorization.model
+
+import java.util.Date
+
+/**
+ * The session is the value object for the session of a user.
+ */
+class Session(
+    /** The session's access token.  */
+    val accessToken: String,
+    /** The expiration date of the access token.  */
+    expirationDate: Date
+) {
+    /** The expiration date of the access token.  */
+    val expirationDate: Date = Date(expirationDate.time)
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/api/payment/model/Payment.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/api/payment/model/Payment.kt
new file mode 100644
index 0000000000..0042b47219
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/api/payment/model/Payment.kt
@@ -0,0 +1,13 @@
+package net.gini.android.merchant.sdk.api.payment.model
+
+/**
+ * Holds information about a payment.
+ */
+internal data class Payment(
+    val paidAt: String,
+    val recipient: String,
+    val iban: String,
+    val amount: String,
+    val purpose: String,
+    val bic: String? = null,
+)
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/api/payment/model/PaymentDetails.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/api/payment/model/PaymentDetails.kt
new file mode 100644
index 0000000000..ef4eb1544a
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/api/payment/model/PaymentDetails.kt
@@ -0,0 +1,22 @@
+package net.gini.android.merchant.sdk.api.payment.model
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+/**
+ * Represents the payment details of an order.
+ */
+@Parcelize
+data class PaymentDetails(
+    val recipient: String,
+    val iban: String,
+    val amount: String,
+    val purpose: String,
+): Parcelable
+
+internal fun PaymentDetails.overwriteEmptyFields(value: PaymentDetails): PaymentDetails = this.copy(
+    recipient = if (recipient.trim().isEmpty()) value.recipient else recipient,
+    iban = if (iban.trim().isEmpty()) value.iban else iban,
+    amount = if (amount.trim().isEmpty()) value.amount else amount,
+    purpose = if (purpose.trim().isEmpty()) value.purpose else purpose,
+)
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/api/payment/model/PaymentRequest.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/api/payment/model/PaymentRequest.kt
new file mode 100644
index 0000000000..49ed0b820a
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/api/payment/model/PaymentRequest.kt
@@ -0,0 +1,46 @@
+package net.gini.android.merchant.sdk.api.payment.model
+
+///**
+// * A payment request used for starting the bank app. Only the id is sent, but it is associated with a bank.
+// */
+//data class PaymentRequest(
+//    val id: String,
+//    val bankApp: PaymentProviderApp,
+//)
+
+/**
+ * Holds information about a payment request.
+ */
+data class PaymentRequest(
+    val id: String,
+    val paymentProviderId: String?,
+    val requesterUri: String?,
+    val recipient: String,
+    val iban: String,
+    val bic: String?,
+    val amount: String,
+    val purpose: String,
+    val status: Status,
+) {
+    enum class Status {
+        OPEN, PAID, INVALID
+    }
+}
+
+internal fun net.gini.android.core.api.models.PaymentRequest.toPaymentRequest(
+    paymentRequestId: String,
+) = PaymentRequest(
+    id = paymentRequestId,
+    paymentProviderId = paymentProviderId,
+    requesterUri = requesterUri,
+    recipient = recipient,
+    iban = iban,
+    bic = bic,
+    amount = amount,
+    purpose = purpose,
+    status = when (status) {
+        net.gini.android.core.api.models.PaymentRequest.Status.OPEN -> PaymentRequest.Status.OPEN
+        net.gini.android.core.api.models.PaymentRequest.Status.PAID -> PaymentRequest.Status.PAID
+        net.gini.android.core.api.models.PaymentRequest.Status.INVALID -> PaymentRequest.Status.INVALID
+    }
+)
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/bankselection/BankSelectionBottomSheet.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/bankselection/BankSelectionBottomSheet.kt
new file mode 100644
index 0000000000..7f2857800e
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/bankselection/BankSelectionBottomSheet.kt
@@ -0,0 +1,189 @@
+package net.gini.android.merchant.sdk.bankselection
+
+import android.app.Dialog
+import android.content.DialogInterface
+import android.graphics.Paint
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.google.android.material.imageview.ShapeableImageView
+import kotlinx.coroutines.launch
+import net.gini.android.health.api.models.PaymentProvider
+import net.gini.android.merchant.sdk.R
+import net.gini.android.merchant.sdk.databinding.GmsBottomSheetBankSelectionBinding
+import net.gini.android.merchant.sdk.databinding.GmsItemPaymentProviderAppBinding
+import net.gini.android.merchant.sdk.integratedFlow.PaymentFragment
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderApp
+import net.gini.android.merchant.sdk.util.BackListener
+import net.gini.android.merchant.sdk.util.GmsBottomSheetDialogFragment
+import net.gini.android.merchant.sdk.util.autoCleared
+import net.gini.android.merchant.sdk.util.extensions.setBackListener
+import net.gini.android.merchant.sdk.util.getLayoutInflaterWithGiniMerchantTheme
+import net.gini.android.merchant.sdk.util.setIntervalClickListener
+import net.gini.android.merchant.sdk.util.wrappedWithGiniMerchantTheme
+import org.slf4j.LoggerFactory
+
+/**
+ * The [BankSelectionBottomSheet] displays a list of available banks for the user to choose from. If a banking app is not
+ * installed it will also display its Play Store link.
+ */
+internal class BankSelectionBottomSheet private constructor(private val paymentComponent: PaymentComponent?, private val backListener: BackListener? = null) :
+    GmsBottomSheetDialogFragment() {
+
+    constructor() : this(null)
+
+    private var binding: GmsBottomSheetBankSelectionBinding by autoCleared()
+    private val viewModel: BankSelectionViewModel by viewModels { BankSelectionViewModel.Factory(paymentComponent, backListener) }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        binding = GmsBottomSheetBankSelectionBinding.inflate(inflater, container, false)
+
+        binding.gmsPaymentProviderAppsList.layoutManager = LinearLayoutManager(requireContext())
+        binding.gmsPaymentProviderAppsList.adapter =
+            PaymentProviderAppsAdapter(emptyList(), object : PaymentProviderAppsAdapter.OnItemClickListener {
+                override fun onItemClick(paymentProviderApp: PaymentProviderApp) {
+                    LOG.debug("Selected payment provider app: {}", paymentProviderApp.name)
+
+                    viewModel.setSelectedPaymentProviderApp(paymentProviderApp)
+                    this@BankSelectionBottomSheet.dismiss()
+                    (this@BankSelectionBottomSheet.parentFragment as PaymentFragment).handleBackFlow()
+                }
+            })
+
+        binding.gmsCloseButton.setOnClickListener {
+            viewModel.backListener?.backCalled()
+            dismiss()
+        }
+
+        binding.gmsMoreInformationLabel.apply {
+            paintFlags = binding.gmsMoreInformationLabel.paintFlags or Paint.UNDERLINE_TEXT_FLAG
+            setOnClickListener {
+                viewModel.paymentComponent?.listener?.onMoreInformationClicked()
+                dismiss()
+            }
+        }
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        viewModel.start()
+
+        viewLifecycleOwner.lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                viewModel.paymentProviderAppsListFlow.collect { paymentProviderAppsListState ->
+                    when (paymentProviderAppsListState) {
+                        is PaymentProviderAppsListState.Error -> {
+                            dismiss()
+                        }
+
+                        PaymentProviderAppsListState.Loading -> {}
+
+                        is PaymentProviderAppsListState.Success -> {
+                            (binding.gmsPaymentProviderAppsList.adapter as PaymentProviderAppsAdapter).apply {
+                                dataSet = paymentProviderAppsListState.paymentProviderAppsList
+                                notifyDataSetChanged()
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    override fun onCancel(dialog: DialogInterface) {
+        viewModel.backListener?.backCalled()
+        super.onCancel(dialog)
+    }
+
+    override fun onStart() {
+        super.onStart()
+        viewModel.recheckWhichPaymentProviderAppsAreInstalled()
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val dialog = super.onCreateDialog(savedInstanceState)
+        viewModel.backListener?.let {
+            (dialog as BottomSheetDialog).setBackListener(it)
+        }
+        return dialog
+    }
+
+    companion object {
+        private val LOG = LoggerFactory.getLogger(BankSelectionBottomSheet::class.java)
+
+        /**
+         * Create a new instance of the [BankSelectionBottomSheet].
+         *
+         * @param paymentComponent the [PaymentComponent] which contains the list of payment provider apps and handles the
+         * payment provider app selection
+         */
+        fun newInstance(paymentComponent: PaymentComponent, backListener: BackListener? = null): BankSelectionBottomSheet {
+            return BankSelectionBottomSheet(paymentComponent, backListener)
+        }
+    }
+}
+
+internal class PaymentProviderAppsAdapter(
+    var dataSet: List<PaymentProviderAppListItem>,
+    val onItemClickListener: OnItemClickListener
+) : RecyclerView.Adapter<PaymentProviderAppsAdapter.ViewHolder>() {
+
+    class ViewHolder(binding: GmsItemPaymentProviderAppBinding, onClickListener: OnClickListener) : RecyclerView.ViewHolder(binding.root) {
+        val button: Button
+        val iconView: ShapeableImageView
+
+        init {
+            iconView = binding.gmsSelectorLayout.gmsPaymentProviderAppIconHolder.gmsPaymentProviderIcon
+            button = binding.gmsSelectorLayout.gmsSelectBankButton
+            button.setIntervalClickListener { onClickListener.onClick(adapterPosition) }
+        }
+
+        interface OnClickListener {
+            fun onClick(adapterPosition: Int)
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val view = GmsItemPaymentProviderAppBinding.inflate(parent.getLayoutInflaterWithGiniMerchantTheme(), parent, false)
+        val viewHolder = ViewHolder(view, object : ViewHolder.OnClickListener {
+            override fun onClick(adapterPosition: Int) {
+                onItemClickListener.onItemClick(dataSet[adapterPosition].paymentProviderApp)
+            }
+        })
+        return viewHolder
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val paymentProviderAppListItem = dataSet[position]
+        holder.itemView.context.wrappedWithGiniMerchantTheme().let { context ->
+            holder.button.text = paymentProviderAppListItem.paymentProviderApp.name
+            holder.iconView.setImageDrawable(paymentProviderAppListItem.paymentProviderApp.icon)
+            holder.itemView.isSelected = paymentProviderAppListItem.isSelected
+            holder.button.setCompoundDrawablesWithIntrinsicBounds(
+                null,
+                null,
+                if (paymentProviderAppListItem.isSelected) ContextCompat.getDrawable(context, R.drawable.gms_checkmark) else null,
+                null
+            )
+        }
+    }
+
+    override fun getItemCount() = dataSet.size
+
+    interface OnItemClickListener {
+        fun onItemClick(paymentProviderApp: PaymentProviderApp)
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/bankselection/BankSelectionViewModel.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/bankselection/BankSelectionViewModel.kt
new file mode 100644
index 0000000000..56cf07e890
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/bankselection/BankSelectionViewModel.kt
@@ -0,0 +1,120 @@
+package net.gini.android.merchant.sdk.bankselection
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.launch
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentProviderAppsState
+import net.gini.android.merchant.sdk.paymentcomponent.SelectedPaymentProviderAppState
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderApp
+import net.gini.android.merchant.sdk.util.BackListener
+import org.slf4j.LoggerFactory
+
+internal class BankSelectionViewModel(val paymentComponent: PaymentComponent?, val backListener: BackListener?) : ViewModel() {
+
+    private val _paymentProviderAppsListFlow =
+        MutableStateFlow<PaymentProviderAppsListState>(PaymentProviderAppsListState.Loading)
+    val paymentProviderAppsListFlow: StateFlow<PaymentProviderAppsListState> =
+        _paymentProviderAppsListFlow.asStateFlow()
+
+    fun start() {
+        viewModelScope.launch {
+            if (paymentComponent == null) {
+                LOG.warn("Cannot show payment provider apps: PaymentComponent must be set before showing the BankSelectionBottomSheet")
+                return@launch
+            }
+            LOG.debug("Collecting payment provider apps state and selected payment provider app from PaymentComponent")
+
+            paymentComponent.selectedPaymentProviderAppFlow.combine(paymentComponent.paymentProviderAppsFlow) { selectedPaymentProviderAppState, paymentProviderAppsState ->
+                selectedPaymentProviderAppState to paymentProviderAppsState
+            }.collect { (selectedPaymentProviderAppState, paymentProviderAppsState) ->
+                LOG.debug(
+                    "Received selected payment provider app state: {}",
+                    selectedPaymentProviderAppState
+                )
+                LOG.debug("Received payment provider apps state: {}", paymentProviderAppsState)
+
+                if (paymentProviderAppsState is PaymentProviderAppsState.Success) {
+                    val paymentProviderAppsList = mutableListOf<PaymentProviderAppListItem>()
+
+                    if (paymentProviderAppsState.paymentProviderApps.isNotEmpty()) {
+                        LOG.debug(
+                            "Received {} payment provider apps",
+                            paymentProviderAppsState.paymentProviderApps.size
+                        )
+                        paymentProviderAppsList += paymentProviderAppsState.paymentProviderApps.map {
+                            PaymentProviderAppListItem(it, false)
+                        }
+                    } else {
+                        LOG.debug("No payment provider apps received")
+                    }
+
+                    when (selectedPaymentProviderAppState) {
+                        is SelectedPaymentProviderAppState.AppSelected -> {
+                            LOG.debug(
+                                "Selected payment provider app: {}",
+                                selectedPaymentProviderAppState.paymentProviderApp.name
+                            )
+                            paymentProviderAppsList.firstOrNull { paymentProviderApp ->
+                                hasSamePaymentProviderId(paymentProviderApp.paymentProviderApp, selectedPaymentProviderAppState.paymentProviderApp)
+                            }?.isSelected = true
+                        }
+
+                        SelectedPaymentProviderAppState.NothingSelected -> {
+                            LOG.debug("No payment provider app selected")
+                            paymentProviderAppsList.forEach { it.isSelected = false }
+                        }
+                    }
+
+                    _paymentProviderAppsListFlow.value = PaymentProviderAppsListState.Success(paymentProviderAppsList)
+                } else if (paymentProviderAppsState is PaymentProviderAppsState.Error) {
+                    LOG.error("Error loading payment provider apps", paymentProviderAppsState.throwable)
+                    _paymentProviderAppsListFlow.value =
+                        PaymentProviderAppsListState.Error(paymentProviderAppsState.throwable)
+                }
+            }
+        }
+    }
+
+    private fun hasSamePaymentProviderId(
+        paymentProviderApp: PaymentProviderApp,
+        selectedPaymentProviderApp: PaymentProviderApp
+    ): Boolean =
+        paymentProviderApp.hasSamePaymentProviderId(selectedPaymentProviderApp)
+
+    fun recheckWhichPaymentProviderAppsAreInstalled() {
+        viewModelScope.launch {
+            paymentComponent?.recheckWhichPaymentProviderAppsAreInstalled()
+        }
+    }
+
+    fun setSelectedPaymentProviderApp(paymentProviderApp: PaymentProviderApp) {
+        viewModelScope.launch {
+            paymentComponent?.setSelectedPaymentProviderApp(paymentProviderApp)
+        }
+    }
+
+    class Factory(private val paymentComponent: PaymentComponent?, private val backListener: BackListener? = null) : ViewModelProvider.Factory {
+        @Suppress("UNCHECKED_CAST")
+        override fun <T : ViewModel> create(modelClass: Class<T>): T {
+            return BankSelectionViewModel(paymentComponent, backListener) as T
+        }
+    }
+
+    companion object {
+        private val LOG = LoggerFactory.getLogger(BankSelectionViewModel::class.java)
+    }
+}
+
+internal sealed class PaymentProviderAppsListState {
+    object Loading : PaymentProviderAppsListState()
+    class Success(val paymentProviderAppsList: List<PaymentProviderAppListItem>) : PaymentProviderAppsListState()
+    class Error(val throwable: Throwable) : PaymentProviderAppsListState()
+}
+
+internal data class PaymentProviderAppListItem(val paymentProviderApp: PaymentProviderApp, var isSelected: Boolean)
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/integratedFlow/PaymentFlowViewModel.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/integratedFlow/PaymentFlowViewModel.kt
new file mode 100644
index 0000000000..64554367a6
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/integratedFlow/PaymentFlowViewModel.kt
@@ -0,0 +1,155 @@
+package net.gini.android.merchant.sdk.integratedFlow
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.launch
+import net.gini.android.core.api.Resource
+import net.gini.android.merchant.sdk.GiniMerchant
+import net.gini.android.merchant.sdk.api.payment.model.PaymentDetails
+import net.gini.android.merchant.sdk.api.payment.model.PaymentRequest
+import net.gini.android.merchant.sdk.paymentcomponent.BankPickerRows
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentProviderAppsState
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderApp
+import net.gini.android.merchant.sdk.review.openWith.OpenWithPreferences
+import net.gini.android.merchant.sdk.util.BackListener
+import net.gini.android.merchant.sdk.util.DisplayedScreen
+import net.gini.android.merchant.sdk.util.FlowBottomSheetsManager
+import net.gini.android.merchant.sdk.util.GiniPaymentManager
+import net.gini.android.merchant.sdk.util.PaymentNextStep
+import java.io.File
+import java.util.Stack
+
+internal class PaymentFlowViewModel(
+    val paymentComponent: PaymentComponent,
+    internal var paymentDetails: PaymentDetails,
+    val paymentFlowConfiguration: PaymentFlowConfiguration?,
+    val giniPaymentManager: GiniPaymentManager,
+    val giniMerchant: GiniMerchant
+) : ViewModel(), FlowBottomSheetsManager, BackListener {
+
+    private val backstack: Stack<DisplayedScreen> = Stack<DisplayedScreen>().also { it.add(DisplayedScreen.Nothing) }
+    private var initialSelectedPaymentProvider: PaymentProviderApp? = null
+
+    override var openWithPreferences: OpenWithPreferences? = null
+    override var openWithCounter: Int = 0
+    override val paymentNextStepFlow = MutableSharedFlow<PaymentNextStep>(
+        extraBufferCapacity = 1,
+    )
+    override val paymentRequestFlow: MutableStateFlow<PaymentRequest?> = MutableStateFlow(null)
+
+    val paymentNextStep: SharedFlow<PaymentNextStep> = paymentNextStepFlow
+
+    private val _backButtonEvent = MutableSharedFlow<Void?>(extraBufferCapacity = 1)
+    val backButtonEvent: SharedFlow<Void?> = _backButtonEvent
+
+    override val shareWithFlowStarted: MutableStateFlow<Boolean> = MutableStateFlow(false)
+
+    init {
+        viewModelScope.launch {
+            paymentComponent.paymentProviderAppsFlow.collect {
+                if (it is PaymentProviderAppsState.Error) {
+                    giniMerchant.emitSDKEvent(GiniMerchant.PaymentState.Error(it.throwable))
+                    delay(50)
+                    giniMerchant.setFlowCancelled()
+                }
+            }
+        }
+        paymentFlowConfiguration?.let {
+            paymentComponent.shouldCheckReturningUser = it.checkForReturningUser
+            paymentComponent.bankPickerRows = if (it.paymentComponentOnTwoRows) BankPickerRows.TWO else BankPickerRows.SINGLE
+        }
+    }
+
+    fun loadPaymentProviderApps() = viewModelScope.launch {
+        if (paymentComponent.paymentProviderAppsFlow.value is PaymentProviderAppsState.Loading || paymentComponent.paymentProviderAppsFlow.value is PaymentProviderAppsState.Success) return@launch
+        paymentComponent.loadPaymentProviderApps()
+    }
+
+    fun addToBackStack(destination: DisplayedScreen) {
+        backstack.add(destination)
+        setDisplayedScreen()
+    }
+
+    fun popBackStack() {
+        backstack.pop()
+        setDisplayedScreen()
+    }
+
+    fun getLastBackstackEntry() = if (backstack.isNotEmpty()) backstack.peek() else DisplayedScreen.Nothing
+
+    private fun setDisplayedScreen() = viewModelScope.launch {
+        giniMerchant.setDisplayedScreen(getLastBackstackEntry())
+    }
+
+    fun paymentProviderAppChanged(paymentProviderApp: PaymentProviderApp): Boolean {
+        if (initialSelectedPaymentProvider == null) {
+            observeOpenWithCount(paymentProviderApp.paymentProvider.id)
+        }
+        if (initialSelectedPaymentProvider?.paymentProvider?.id != paymentProviderApp.paymentProvider.id) {
+            initialSelectedPaymentProvider = paymentProviderApp
+            observeOpenWithCount(paymentProviderApp.paymentProvider.id)
+            return true
+        }
+        return false
+    }
+
+    fun checkBankAppInstallState(paymentProviderApp: PaymentProviderApp) {
+        if (paymentProviderApp.isInstalled() != initialSelectedPaymentProvider?.isInstalled()) {
+            initialSelectedPaymentProvider = paymentProviderApp
+        }
+    }
+
+    fun updatePaymentDetails(paymentDetails: PaymentDetails) {
+        this.paymentDetails = paymentDetails
+    }
+
+    fun onPayment() = viewModelScope.launch {
+        giniPaymentManager.onPayment(initialSelectedPaymentProvider, paymentDetails)
+    }
+
+    fun getPaymentProviderApp() = initialSelectedPaymentProvider
+
+    private fun observeOpenWithCount(paymentProviderAppId: String) {
+        startObservingOpenWithCount(viewModelScope, paymentProviderAppId)
+    }
+
+    fun emitShareWithStartedEvent() {
+        paymentRequestFlow.value?.let {
+            giniMerchant.emitSDKEvent(GiniMerchant.PaymentState.Success(it, initialSelectedPaymentProvider?.name ?: ""))
+        }
+        shareWithFlowStarted.tryEmit(true)
+    }
+
+    fun onPaymentButtonTapped(externalCacheDir: File?) {
+        checkNextStep(initialSelectedPaymentProvider, externalCacheDir, viewModelScope)
+    }
+
+    fun onForwardToSharePdfTapped(externalCacheDir: File?) {
+        sharePdf(initialSelectedPaymentProvider, externalCacheDir, viewModelScope)
+    }
+
+    override fun emitSDKEvent(sdkEvent: GiniMerchant.PaymentState) {
+        giniMerchant.emitSDKEvent(sdkEvent)
+    }
+
+    override suspend fun getPaymentRequest(): PaymentRequest = giniPaymentManager.getPaymentRequest(initialSelectedPaymentProvider, paymentDetails)
+
+    override suspend fun getPaymentRequestDocument(paymentRequest: PaymentRequest): Resource<ByteArray> = giniMerchant.giniHealthAPI.documentManager.getPaymentRequestDocument(paymentRequest.id)
+
+    class Factory(val paymentComponent: PaymentComponent, val paymentDetails: PaymentDetails, private val paymentFlowConfiguration: PaymentFlowConfiguration?, val giniMerchant: GiniMerchant): ViewModelProvider.Factory {
+        @Suppress("UNCHECKED_CAST")
+        override fun <T : ViewModel> create(modelClass: Class<T>): T {
+            return PaymentFlowViewModel(paymentComponent = paymentComponent, paymentDetails = paymentDetails,paymentFlowConfiguration = paymentFlowConfiguration, giniPaymentManager = GiniPaymentManager(giniMerchant), giniMerchant = giniMerchant) as T
+        }
+    }
+
+    override fun backCalled() {
+        _backButtonEvent.tryEmit(null)
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/integratedFlow/PaymentFragment.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/integratedFlow/PaymentFragment.kt
new file mode 100644
index 0000000000..be3c864627
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/integratedFlow/PaymentFragment.kt
@@ -0,0 +1,403 @@
+package net.gini.android.merchant.sdk.integratedFlow
+
+import android.content.ActivityNotFoundException
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.os.Bundle
+import android.os.Parcelable
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.activity.OnBackPressedCallback
+import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.commit
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.lifecycle.viewModelScope
+import com.google.android.material.snackbar.Snackbar
+import kotlinx.coroutines.launch
+import kotlinx.parcelize.Parcelize
+import net.gini.android.merchant.sdk.GiniMerchant
+import net.gini.android.merchant.sdk.R
+import net.gini.android.merchant.sdk.api.payment.model.PaymentDetails
+import net.gini.android.merchant.sdk.bankselection.BankSelectionBottomSheet
+import net.gini.android.merchant.sdk.databinding.GmsFragmentMerchantBinding
+import net.gini.android.merchant.sdk.moreinformation.MoreInformationFragment
+import net.gini.android.merchant.sdk.paymentComponentBottomSheet.PaymentComponentBottomSheet
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.merchant.sdk.paymentcomponent.SelectedPaymentProviderAppState
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderApp
+import net.gini.android.merchant.sdk.review.ReviewConfiguration
+import net.gini.android.merchant.sdk.review.openWith.OpenWithPreferences
+import net.gini.android.merchant.sdk.review.reviewBottomSheet.ReviewBottomSheet
+import net.gini.android.merchant.sdk.review.reviewComponent.ReviewViewListener
+import net.gini.android.merchant.sdk.util.DisplayedScreen
+import net.gini.android.merchant.sdk.util.PaymentNextStep
+import net.gini.android.merchant.sdk.util.autoCleared
+import net.gini.android.merchant.sdk.util.extensions.add
+import net.gini.android.merchant.sdk.util.extensions.createShareWithPendingIntent
+import net.gini.android.merchant.sdk.util.extensions.showInstallAppBottomSheet
+import net.gini.android.merchant.sdk.util.extensions.showOpenWithBottomSheet
+import net.gini.android.merchant.sdk.util.extensions.startSharePdfIntent
+import net.gini.android.merchant.sdk.util.getLayoutInflaterWithGiniMerchantTheme
+import net.gini.android.merchant.sdk.util.wrappedWithGiniMerchantTheme
+import org.jetbrains.annotations.VisibleForTesting
+
+/**
+ * Configuration for the payment flow.
+ */
+@Parcelize
+data class PaymentFlowConfiguration(
+    /**
+     * If set to `true`, the [ReviewBottomSheet] will be shown before initiating payment.
+     * If set to `false`, the payment request process will be executed under the hood before redirecting to the selected payment provider
+     *
+     * Default value is `false`
+     */
+    val shouldShowReviewFragment: Boolean = false,
+
+    /**
+     * If set to `true`, the errors will be handled internally and snackbars will be shown for errors.
+     * If set to `false`, errors will be ignored by the [PaymentFragment] and the [ReviewBottomSheet]. In this case the flows exposed by [GiniMerchant] should be observed for errors.
+     *
+     * Default value is `true`.
+     */
+    val shouldHandleErrorsInternally: Boolean = true,
+
+    /**
+     * If set to `true`, the [Amount] field of shown as part of the [ReviewBottomSheet] will be editable.
+     * If set to `false`, the [Amount] field will be read-only.
+     *
+     * Default value is `false`
+     */
+    internal val isAmountFieldEditable: Boolean = true,
+
+    /**
+     * If set to `true` and the user is a returning one, the `Select your bank to pay` and `More Information` labels will be hidden
+     * If set to `false`, the labels will always be displayed
+     *
+     * Default value is `false`
+     */
+    internal val checkForReturningUser: Boolean = false,
+
+    /**
+     * If set to `true`, the [PaymentComponent] will be displayed on 2 rows
+     * If set to `false`, the [PaymentComponent] will be displayed in a single row
+     *
+     * Default value is `true`
+     */
+    internal val paymentComponentOnTwoRows: Boolean = true
+
+): Parcelable
+
+/**
+ * The [PaymentFragment] provides a container for all screens that should be displayed for the user
+ * during the payment process (eg. [PaymentComponentBottomSheet], [BankSelectionBottomSheet], [ReviewBottomSheet]).
+ *
+ * It handles the display logic for all screens. A new instance can be created using the [GiniMerchant.createFragment] method.
+ */
+class PaymentFragment private constructor(
+    private val viewModelFactory: ViewModelProvider.Factory? = null) : Fragment() {
+
+    constructor(): this(null)
+    private var binding: GmsFragmentMerchantBinding by autoCleared()
+    private val viewModel by viewModels<PaymentFlowViewModel> {
+        viewModelFactory ?: object : ViewModelProvider.Factory {}
+    }
+    private var snackbar: Snackbar? = null
+    private var shareWithEventBroadcastReceiver = object: BroadcastReceiver() {
+        override fun onReceive(context: Context?, intent: Intent?) {
+            viewModel.emitShareWithStartedEvent()
+        }
+    }
+
+    private val paymentComponentListener = object: PaymentComponent.Listener {
+        override fun onMoreInformationClicked() {
+            viewModel.addToBackStack(DisplayedScreen.MoreInformationFragment)
+            childFragmentManager.add(
+                containerId = binding.gmsFragmentContainerView.id,
+                fragment = MoreInformationFragment.newInstance(viewModel.paymentComponent, viewModel),
+                addToBackStack = true
+            )
+        }
+
+        override fun onBankPickerClicked() {
+            viewModel.paymentComponent.let {
+                viewModel.addToBackStack(DisplayedScreen.BankSelectionBottomSheet)
+                BankSelectionBottomSheet.newInstance(it, backListener = viewModel).show(childFragmentManager, BankSelectionBottomSheet::class.java.name)
+            }
+        }
+
+        override fun onPayInvoiceClicked(documentId: String) {
+            handlePayFlow()
+        }
+    }
+
+    override fun onGetLayoutInflater(savedInstanceState: Bundle?): LayoutInflater {
+        val inflater = super.onGetLayoutInflater(savedInstanceState)
+        return this.getLayoutInflaterWithGiniMerchantTheme(inflater)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        if (viewModelFactory == null) {
+            // When the viewModelFactory is not available we are in an unrecoverable state
+            // (most likely after an activity restart) and we should remove this fragment which is the container (root)
+            // for all our other fragments. This returns the user to the client app's previous screen.
+            parentFragmentManager.commit {
+                remove(this@PaymentFragment)
+            }
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        super.onCreateView(inflater, container, savedInstanceState)
+        binding = GmsFragmentMerchantBinding.inflate(inflater, container, false)
+
+        // If ReviewFragment will be shown, it will hande the opening of the bank app. Otherwise, listen for the openBankState event and handle it here
+        binding.setStateListeners()
+
+        viewModel.paymentComponent.listener = paymentComponentListener
+        viewModel.openWithPreferences = OpenWithPreferences(requireContext())
+
+        viewModel.loadPaymentProviderApps()
+        viewLifecycleOwner.lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.RESUMED) {
+                launch {
+                    requireActivity().registerReceiver(shareWithEventBroadcastReceiver, IntentFilter().also { it.addAction(GiniMerchant.SHARE_WITH_INTENT_FILTER) },
+                        Context.RECEIVER_NOT_EXPORTED)
+                }
+                launch {
+                    viewModel.paymentComponent.recheckWhichPaymentProviderAppsAreInstalled()
+                }
+                launch {
+                    viewModel.paymentComponent.selectedPaymentProviderAppFlow.collect {
+                        if (it is SelectedPaymentProviderAppState.AppSelected) {
+                            viewModel.paymentProviderAppChanged(it.paymentProviderApp)
+                            viewModel.checkBankAppInstallState(it.paymentProviderApp)
+                        }
+                    }
+                }
+                launch {
+                    if (viewModel.getLastBackstackEntry() == DisplayedScreen.ShareSheet) {
+                        viewModel.popBackStack()
+                    }
+                }
+                launch {
+                    viewModel.backButtonEvent.collect {
+                        handleBackFlow()
+                    }
+                }
+            }
+        }
+        if (viewModel.getLastBackstackEntry() is DisplayedScreen.Nothing) {
+            showPaymentComponentBottomSheet()
+        }
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner, object: OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                handleBackFlow()
+            }
+        })
+    }
+
+    override fun onDetach() {
+        snackbar?.dismiss()
+        super.onDetach()
+    }
+
+    private fun GmsFragmentMerchantBinding.setStateListeners() {
+        viewLifecycleOwner.lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.RESUMED) {
+                launch {
+                    viewModel.giniMerchant.eventsFlow.collect {
+                        handleSDKEvent(it)
+                    }
+                }
+
+                launch {
+                    viewModel.paymentNextStep.collect {
+                        handlePaymentNextStep(it)
+                    }
+                }
+            }
+        }
+    }
+
+    private fun GmsFragmentMerchantBinding.handleError(text: String, onRetry: () -> Unit) {
+        if (viewModel.paymentFlowConfiguration?.shouldHandleErrorsInternally == true) {
+            showSnackbar(text, onRetry)
+        }
+    }
+
+    private fun GmsFragmentMerchantBinding.showSnackbar(text: String, onRetry: () -> Unit) {
+        val context = requireContext().wrappedWithGiniMerchantTheme()
+        snackbar = Snackbar.make(context, root, text, Snackbar.LENGTH_INDEFINITE).apply {
+            setTextMaxLines(2)
+            setAction(getString(R.string.gms_snackbar_retry)) { onRetry() }
+            show()
+        }
+    }
+
+    internal fun handleBackFlow() {
+        childFragmentManager.popBackStackImmediate()
+        viewModel.popBackStack()
+
+        if (childFragmentManager.backStackEntryCount == 0) {
+            when (viewModel.getLastBackstackEntry()) {
+                DisplayedScreen.BankSelectionBottomSheet -> {
+                    viewModel.paymentComponent.let {
+                        BankSelectionBottomSheet.newInstance(it, viewModel).show(childFragmentManager, BankSelectionBottomSheet::class.java.name)
+                    }
+                }
+                DisplayedScreen.PaymentComponentBottomSheet -> {
+                    if (childFragmentManager.fragments.any { it is PaymentComponentBottomSheet }) {
+                        return
+                    }
+                    PaymentComponentBottomSheet.newInstance(
+                        viewModel.paymentComponent,
+                        viewModel.paymentFlowConfiguration?.shouldShowReviewFragment ?: false,
+                        viewModel
+                    ).show(childFragmentManager, PaymentComponentBottomSheet::class.java.name)
+                }
+                DisplayedScreen.Nothing -> viewModel.giniMerchant.setFlowCancelled()
+                else -> {
+
+                }
+            }
+        }
+    }
+
+    @VisibleForTesting
+    internal fun handlePayFlow() {
+        if (viewModel.paymentFlowConfiguration?.shouldShowReviewFragment == true) {
+            showReviewBottomDialog()
+            return
+        }
+
+        viewModel.onPaymentButtonTapped(requireContext().externalCacheDir)
+    }
+
+    internal fun showReviewBottomDialog() {
+        viewModel.addToBackStack(DisplayedScreen.ReviewBottomSheet)
+        val reviewBottomSheet = ReviewBottomSheet.newInstance(
+            giniMerchant = viewModel.giniMerchant,
+            giniPaymentManager = viewModel.giniPaymentManager,
+            backListener = viewModel,
+            configuration = ReviewConfiguration(
+                handleErrorsInternally = viewModel.paymentFlowConfiguration?.shouldHandleErrorsInternally == true,
+                showCloseButton = true,
+                isAmountFieldEditable = viewModel.paymentFlowConfiguration?.isAmountFieldEditable == true
+            ),
+            listener = object: ReviewViewListener {
+                override fun onPaymentButtonTapped(paymentDetails: PaymentDetails) {
+                    viewModel.updatePaymentDetails(paymentDetails)
+                    viewModel.onPaymentButtonTapped(requireContext().externalCacheDir)
+                }
+            },
+            paymentComponent = viewModel.paymentComponent
+        )
+        reviewBottomSheet.show(childFragmentManager, ReviewBottomSheet::class.java.name)
+    }
+
+    @VisibleForTesting
+    internal fun showPaymentComponentBottomSheet() {
+        val paymentComponentBottomSheet = PaymentComponentBottomSheet.newInstance(
+            viewModel.paymentComponent,
+            reviewFragmentShown = viewModel.paymentFlowConfiguration?.shouldShowReviewFragment ?: false,
+            backListener = viewModel
+        )
+        paymentComponentBottomSheet.show(childFragmentManager, PaymentComponentBottomSheet::class.java.name)
+        viewModel.addToBackStack(DisplayedScreen.PaymentComponentBottomSheet)
+    }
+
+    private fun GmsFragmentMerchantBinding.handleSDKEvent(sdkEvent: GiniMerchant.MerchantSDKEvents) {
+        when (sdkEvent) {
+            is GiniMerchant.MerchantSDKEvents.OnFinishedWithPaymentRequestCreated -> {
+                if (viewModel.getLastBackstackEntry() is DisplayedScreen.ShareSheet) return
+                try {
+                    val intent = viewModel.getPaymentProviderApp()?.getIntent(sdkEvent.paymentRequestId)
+                    if (intent != null) {
+                        startActivity(intent)
+                    } else {
+                        handleError(getString(R.string.gms_generic_error_message)) { viewModel.onPaymentButtonTapped(requireContext().externalCacheDir) }
+                    }
+                } catch (exception: ActivityNotFoundException) {
+                    handleError(getString(R.string.gms_generic_error_message)) { viewModel.onPaymentButtonTapped(requireContext().externalCacheDir) }
+                }
+            }
+            is GiniMerchant.MerchantSDKEvents.OnErrorOccurred -> {
+                binding.loading.isVisible = false
+                handleError(getString(R.string.gms_generic_error_message)) { viewModel.onPaymentButtonTapped(requireContext().externalCacheDir) }
+            }
+            else -> {
+            }
+        }
+    }
+
+    private fun handlePaymentNextStep(paymentNextStep: PaymentNextStep) {
+        when (paymentNextStep) {
+            is PaymentNextStep.SetLoadingVisibility -> {
+                binding.loading.isVisible = paymentNextStep.isVisible
+            }
+            PaymentNextStep.RedirectToBank -> {
+                viewModel.onPayment()
+            }
+            PaymentNextStep.ShowOpenWithSheet -> viewModel.getPaymentProviderApp()?.let { showOpenWithDialog(it) }
+            PaymentNextStep.ShowInstallApp -> showInstallAppDialog()
+            is PaymentNextStep.OpenSharePdf -> {
+                binding.loading.isVisible = false
+                startSharePdfIntent(paymentNextStep.file, requireContext().createShareWithPendingIntent())
+                viewModel.addToBackStack(DisplayedScreen.ShareSheet)
+            }
+        }
+    }
+
+    private fun showInstallAppDialog() {
+        childFragmentManager.showInstallAppBottomSheet(
+            paymentComponent = viewModel.paymentComponent,
+            backListener = viewModel
+        ) {
+            viewModel.onPayment()
+        }
+        viewModel.addToBackStack(DisplayedScreen.InstallAppBottomSheet)
+    }
+
+    private fun showOpenWithDialog(paymentProviderApp: PaymentProviderApp) {
+        childFragmentManager.showOpenWithBottomSheet(
+            paymentProviderApp = paymentProviderApp,
+            backListener = viewModel
+        ) {
+            viewModel.onForwardToSharePdfTapped(requireContext().externalCacheDir)
+        }
+        viewModel.incrementOpenWithCounter(viewModel.viewModelScope, paymentProviderApp.paymentProvider.id)
+        viewModel.addToBackStack(DisplayedScreen.OpenWithBottomSheet)
+    }
+
+    override fun onStop() {
+        requireActivity().unregisterReceiver(shareWithEventBroadcastReceiver)
+        super.onStop()
+    }
+
+    companion object {
+        fun newInstance(giniMerchant: GiniMerchant, paymentDetails: PaymentDetails, paymentFlowConfiguration: PaymentFlowConfiguration,
+                        viewModelFactory : ViewModelProvider.Factory = PaymentFlowViewModel.Factory(giniMerchant.paymentComponent, paymentDetails, paymentFlowConfiguration, giniMerchant)) = PaymentFragment(viewModelFactory)
+
+    }
+}
+
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/moreinformation/FaqExpandableListAdapter.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/moreinformation/FaqExpandableListAdapter.kt
new file mode 100644
index 0000000000..99180a1228
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/moreinformation/FaqExpandableListAdapter.kt
@@ -0,0 +1,47 @@
+package net.gini.android.merchant.sdk.moreinformation
+
+import android.text.SpannedString
+import android.text.method.LinkMovementMethod
+import android.view.View
+import android.view.ViewGroup
+import android.widget.BaseExpandableListAdapter
+import net.gini.android.merchant.sdk.databinding.GmsItemFaqAnswerBinding
+import net.gini.android.merchant.sdk.databinding.GmsItemFaqLabelBinding
+import net.gini.android.merchant.sdk.util.getLayoutInflaterWithGiniMerchantTheme
+
+/**
+ * Created by dani on 26/02/2024.
+ */
+
+internal class FaqExpandableListAdapter(val dataSet: List<Pair<String, CharSequence>>) : BaseExpandableListAdapter() {
+    override fun getGroupCount(): Int = dataSet.size
+    override fun getChildrenCount(listPosition: Int): Int = 1
+    override fun getGroup(listPosition: Int): Any = dataSet[listPosition].first
+
+    override fun getChild(listPosition: Int, p1: Int): CharSequence = dataSet[listPosition].second
+
+    override fun getGroupId(position: Int): Long = position.toLong()
+
+    override fun getChildId(p0: Int, childPosition: Int): Long = childPosition.toLong()
+
+    override fun hasStableIds(): Boolean = true
+
+    override fun getGroupView(position: Int, isExpanded: Boolean, p2: View?, parent: ViewGroup): View {
+        val groupView = GmsItemFaqLabelBinding.inflate(parent.getLayoutInflaterWithGiniMerchantTheme(), parent, false)
+        groupView.gmsFaqLabel.text = dataSet[position].first
+        return groupView.root
+    }
+
+    override fun getChildView(p0: Int, p1: Int, isLastChild: Boolean, convertView: View?, parent: ViewGroup): View {
+        val groupView = GmsItemFaqAnswerBinding.inflate(parent.getLayoutInflaterWithGiniMerchantTheme(), parent, false)
+        val text = getChild(p0, p1)
+        if (text is SpannedString) {
+            groupView.gmsFaqAnswerLabel.movementMethod = LinkMovementMethod.getInstance()
+        }
+        groupView.gmsFaqAnswerLabel.text = text
+        groupView.divider2.visibility = if (p0 != dataSet.size-1) View.VISIBLE else View.GONE
+        return groupView.root
+    }
+
+    override fun isChildSelectable(p0: Int, p1: Int): Boolean = false
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/moreinformation/MoreInformationFragment.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/moreinformation/MoreInformationFragment.kt
new file mode 100644
index 0000000000..769f8fcd4a
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/moreinformation/MoreInformationFragment.kt
@@ -0,0 +1,241 @@
+package net.gini.android.merchant.sdk.moreinformation
+
+import android.os.Bundle
+import android.text.SpannableString
+import android.text.SpannedString
+import android.text.TextPaint
+import android.text.method.LinkMovementMethod
+import android.text.style.TextAppearanceSpan
+import android.text.style.URLSpan
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ExpandableListAdapter
+import android.widget.ExpandableListView
+import androidx.activity.OnBackPressedCallback
+import androidx.annotation.StringRes
+import androidx.annotation.VisibleForTesting
+import androidx.core.text.buildSpannedString
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.recyclerview.widget.RecyclerView
+import kotlinx.coroutines.launch
+import net.gini.android.merchant.sdk.R
+import net.gini.android.merchant.sdk.databinding.GmsFragmentPaymentMoreInformationBinding
+import net.gini.android.merchant.sdk.databinding.GmsPaymentProviderIconHolderBinding
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderApp
+import net.gini.android.merchant.sdk.util.BackListener
+import net.gini.android.merchant.sdk.util.autoCleared
+import net.gini.android.merchant.sdk.util.getLayoutInflaterWithGiniMerchantTheme
+
+/**
+ * The [MoreInformationFragment] displays information and an FAQ section about the payment feature. It requires a
+ * [PaymentComponent] instance to show the icons of the available payment provider apps.
+ */
+internal class MoreInformationFragment private constructor(private val paymentComponent: PaymentComponent?, private val backListener: BackListener? = null) :
+    Fragment() {
+    constructor() : this(paymentComponent = null)
+
+    private var binding: GmsFragmentPaymentMoreInformationBinding by autoCleared()
+    private val viewModel: MoreInformationViewModel by viewModels {
+        MoreInformationViewModel.Factory(
+            paymentComponent
+        )
+    }
+
+    @VisibleForTesting
+    internal val faqList: List<Pair<String, CharSequence>> by lazy {
+        listOf(
+            getString(R.string.gms_faq_1) to getString(R.string.gms_faq_answer_1),
+            getString(R.string.gms_faq_2) to getString(R.string.gms_faq_answer_2),
+            getString(R.string.gms_faq_3) to getString(R.string.gms_faq_answer_3),
+            getString(R.string.gms_faq_4) to buildGiniRelatedAnswer(),
+            getString(R.string.gms_faq_5) to getString(R.string.gms_faq_answer_5),
+            getString(R.string.gms_faq_6) to getString(R.string.gms_faq_answer_6)
+        )
+    }
+
+    override fun onGetLayoutInflater(savedInstanceState: Bundle?): LayoutInflater {
+        val inflater = super.onGetLayoutInflater(savedInstanceState)
+        return this.getLayoutInflaterWithGiniMerchantTheme(inflater)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        super.onCreateView(inflater, container, savedInstanceState)
+        binding = GmsFragmentPaymentMoreInformationBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding.gmsMoreInformationDetails.text = buildSpannedString {
+            append(getString(R.string.gms_more_information_details))
+            append(" ")
+            append(createSpanForLink(R.string.gms_gini_link, R.string.gms_gini_link_url))
+            append(".")
+        }
+        binding.gmsMoreInformationDetails.movementMethod = LinkMovementMethod.getInstance()
+        binding.gmsPaymentProvidersIconsList.adapter = PaymentProvidersIconsAdapter(listOf())
+        binding.gmsFaqList.apply {
+            setAdapter(FaqExpandableListAdapter(faqList))
+            setOnGroupClickListener { expandableListView, _, group, _ ->
+                setListViewHeight(listView = expandableListView, group = group, isReload = false)
+                return@setOnGroupClickListener false
+            }
+        }
+        //Set initial list view height so we can scroll full page
+        binding.gmsFaqList.postDelayed({
+            setListViewHeight(listView = binding.gmsFaqList, group = getExpandedGroupPosition(), isReload = true)
+        }, 100)
+
+        viewModel.start()
+        viewLifecycleOwner.lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                viewModel.paymentProviderAppsListFlow.collect { paymentProviderAppsListState ->
+                    when (paymentProviderAppsListState) {
+                        is MoreInformationViewModel.PaymentProviderAppsListState.Error -> {}
+                        MoreInformationViewModel.PaymentProviderAppsListState.Loading -> {}
+                        is MoreInformationViewModel.PaymentProviderAppsListState.Success -> updatePaymentProviderIconsAdapter(
+                            paymentProviderAppsListState.paymentProviderAppsList
+                        )
+                    }
+                }
+            }
+        }
+
+        backListener?.let {
+            requireActivity().onBackPressedDispatcher.addCallback(object: OnBackPressedCallback(true) {
+                override fun handleOnBackPressed() {
+                    isEnabled = false
+                    remove()
+                    backListener.backCalled()
+                }
+            })
+        }
+    }
+
+    private fun getExpandedGroupPosition(): Int {
+        for (i in faqList.indices) {
+            if (binding.gmsFaqList.isGroupExpanded(i)) return i
+        }
+        return -1
+    }
+
+    private fun updatePaymentProviderIconsAdapter(paymentProviderApps: List<PaymentProviderApp>) {
+        (binding.gmsPaymentProvidersIconsList.adapter as PaymentProvidersIconsAdapter).apply {
+            dataSet = paymentProviderApps
+            notifyDataSetChanged()
+        }
+    }
+
+    private fun createSpanForLink(@StringRes placeholder: Int, @StringRes urlResource: Int) =
+        SpannableString(getString(placeholder)).apply {
+            setSpan(
+                URLSpanNoUnderline(getString(urlResource)),
+                0,
+                this.length,
+                SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE
+            )
+            setSpan(
+                TextAppearanceSpan(requireContext(), R.style.GiniMerchantTheme_Typography_Link),
+                0,
+                this.length,
+                SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE
+            )
+        }
+
+    private fun buildGiniRelatedAnswer(): SpannedString {
+        val giniLink = createSpanForLink(R.string.gms_gini_website, R.string.gms_gini_link_url)
+        val privacyPolicyString = createSpanForLink(R.string.gms_privacy_policy, R.string.gms_privacy_policy_link_url)
+        val span = buildSpannedString {
+            append(getString(R.string.gms_faq_answer_4))
+            replace(indexOf("%s"), indexOf("%s") + 2, giniLink)
+            replace(indexOf("%p"), indexOf("%p") + 2, privacyPolicyString)
+        }
+        return span
+    }
+
+    private fun setListViewHeight(
+        listView: ExpandableListView,
+        group: Int,
+        isReload: Boolean
+    ) {
+        val listAdapter = listView.expandableListAdapter as ExpandableListAdapter
+        var totalHeight = 0
+        val desiredWidth = View.MeasureSpec.makeMeasureSpec(
+            listView.width,
+            View.MeasureSpec.EXACTLY
+        )
+        for (i in 0 until listAdapter.groupCount) {
+            val groupItem = listAdapter.getGroupView(i, false, null, listView)
+            groupItem.measure(desiredWidth, View.MeasureSpec.UNSPECIFIED)
+            totalHeight += groupItem.measuredHeight
+            if (group == -1) continue
+            if ((listView.isGroupExpanded(i) && (i != group || isReload)) || !listView.isGroupExpanded(i) && i == group) {
+                for (j in 0 until listAdapter.getChildrenCount(i)) {
+                    val listItem = listAdapter.getChildView(
+                        i, j, false, null,
+                        listView
+                    )
+                    listItem.measure(desiredWidth, View.MeasureSpec.UNSPECIFIED)
+                    totalHeight += listItem.measuredHeight
+                }
+            }
+        }
+        val params = listView.layoutParams
+        params.height = totalHeight + listView.dividerHeight * (listAdapter.groupCount - 1)
+        listView.layoutParams = params
+        listView.requestLayout()
+    }
+
+    internal class PaymentProvidersIconsAdapter(var dataSet: List<PaymentProviderApp?>) :
+        RecyclerView.Adapter<PaymentProvidersIconsAdapter.ViewHolder>() {
+
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+            val view = GmsPaymentProviderIconHolderBinding.inflate(
+                parent.getLayoutInflaterWithGiniMerchantTheme(),
+                parent,
+                false
+            )
+            return ViewHolder(view)
+        }
+
+        override fun getItemCount(): Int = dataSet.size
+
+        override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+            val context = holder.binding.root.context
+            holder.binding.gmsPaymentProviderIcon.setImageDrawable(dataSet[position]?.icon)
+            holder.binding.gmsPaymentProviderIcon.contentDescription = dataSet[position]?.paymentProvider?.name + " ${context.getString(
+                R.string.gms_payment_provider_logo_content_description)}"
+        }
+
+        class ViewHolder(val binding: GmsPaymentProviderIconHolderBinding) :
+            RecyclerView.ViewHolder(binding.root)
+    }
+
+    companion object {
+        /**
+         * Create a new instance of the [MoreInformationFragment].
+         *
+         * @param paymentComponent the [PaymentComponent] instance which contains the list of payment provider apps
+         * @param backListener a listener for back events
+         */
+        fun newInstance(paymentComponent: PaymentComponent?, backListener: BackListener? = null): MoreInformationFragment =
+            MoreInformationFragment(paymentComponent = paymentComponent, backListener = backListener)
+    }
+
+    private class URLSpanNoUnderline(url: String?) : URLSpan(url) {
+        override fun updateDrawState(ds: TextPaint) {
+            super.updateDrawState(ds)
+            ds.isUnderlineText = false
+        }
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/moreinformation/MoreInformationViewModel.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/moreinformation/MoreInformationViewModel.kt
new file mode 100644
index 0000000000..c71e12fbfb
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/moreinformation/MoreInformationViewModel.kt
@@ -0,0 +1,76 @@
+package net.gini.android.merchant.sdk.moreinformation
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentProviderAppsState
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderApp
+import org.slf4j.LoggerFactory
+
+
+internal class MoreInformationViewModel(private val paymentComponent: PaymentComponent?) : ViewModel() {
+
+    private val _paymentProviderAppsListFlow =
+        MutableStateFlow<PaymentProviderAppsListState>(PaymentProviderAppsListState.Loading)
+    val paymentProviderAppsListFlow: StateFlow<PaymentProviderAppsListState> =
+        _paymentProviderAppsListFlow.asStateFlow()
+
+    fun start() {
+        viewModelScope.launch {
+            if (paymentComponent == null) {
+                LOG.warn("Cannot show payment provider apps: PaymentComponent must be set before showing the BankSelectionBottomSheet")
+                return@launch
+            }
+            LOG.debug("Collecting payment provider apps state and selected payment provider app from PaymentComponent")
+            paymentComponent.paymentProviderAppsFlow.collect { paymentProviderAppsState ->
+                when (paymentProviderAppsState) {
+                    is PaymentProviderAppsState.Error -> {
+                        processError(paymentProviderAppsState.throwable)
+                    }
+
+                    PaymentProviderAppsState.Loading, PaymentProviderAppsState.Nothing -> {}
+                    is PaymentProviderAppsState.Success -> {
+                        if (paymentProviderAppsState.paymentProviderApps.isEmpty()) {
+                            LOG.debug("No payment provider apps received")
+                        } else {
+                            LOG.debug(
+                                "Received {} payment provider apps",
+                                paymentProviderAppsState.paymentProviderApps.size
+                            )
+                        }
+                        _paymentProviderAppsListFlow.value =
+                            PaymentProviderAppsListState.Success(paymentProviderAppsState.paymentProviderApps)
+                    }
+                }
+            }
+        }
+    }
+
+    private fun processError(throwable: Throwable) {
+        LOG.error("Error loading payment provider apps", throwable)
+        _paymentProviderAppsListFlow.value = PaymentProviderAppsListState.Error(throwable)
+    }
+
+    class Factory(private val paymentComponent: PaymentComponent?): ViewModelProvider.Factory {
+        @Suppress("UNCHECKED_CAST")
+        override fun <T : ViewModel> create(modelClass: Class<T>): T {
+            return MoreInformationViewModel(paymentComponent) as T
+        }
+    }
+
+    internal sealed class PaymentProviderAppsListState {
+        object Loading : PaymentProviderAppsListState()
+        class Success(val paymentProviderAppsList: List<PaymentProviderApp>) : PaymentProviderAppsListState()
+        class Error(val throwable: Throwable) : PaymentProviderAppsListState()
+    }
+
+    companion object {
+        private val LOG = LoggerFactory.getLogger(MoreInformationViewModel::class.java)
+    }
+
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/paymentComponentBottomSheet/PaymentComponentBottomSheet.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/paymentComponentBottomSheet/PaymentComponentBottomSheet.kt
new file mode 100644
index 0000000000..6270bd714e
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/paymentComponentBottomSheet/PaymentComponentBottomSheet.kt
@@ -0,0 +1,79 @@
+package net.gini.android.merchant.sdk.paymentComponentBottomSheet
+
+import android.app.Dialog
+import android.content.DialogInterface
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import kotlinx.coroutines.launch
+import net.gini.android.merchant.sdk.databinding.GmsBottomSheetPaymentComponentBinding
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponentView
+import net.gini.android.merchant.sdk.util.BackListener
+import net.gini.android.merchant.sdk.util.GmsBottomSheetDialogFragment
+import net.gini.android.merchant.sdk.util.autoCleared
+import net.gini.android.merchant.sdk.util.extensions.setBackListener
+import org.jetbrains.annotations.VisibleForTesting
+
+internal class PaymentComponentBottomSheet private constructor(
+    paymentComponent: PaymentComponent?,
+    reviewFragmentShown: Boolean,
+    backListener: BackListener? = null
+): GmsBottomSheetDialogFragment() {
+    constructor(): this(null, false)
+
+    private var binding: GmsBottomSheetPaymentComponentBinding by autoCleared()
+    private val viewModel by viewModels<PaymentComponentBottomSheetViewModel> { PaymentComponentBottomSheetViewModel.Factory(paymentComponent, backListener, reviewFragmentShown) }
+
+    @VisibleForTesting
+    internal lateinit var paymentComponentView: PaymentComponentView
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val dialog = super.onCreateDialog(savedInstanceState)
+        viewModel.backListener?.let {
+            (dialog as BottomSheetDialog).setBackListener(it)
+        }
+        return dialog
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = GmsBottomSheetPaymentComponentBinding.inflate(inflater, container, false)
+        binding.gmsPaymentComponent.reviewFragmentWillBeShown = viewModel.reviewFragmentShown
+        binding.gmsPaymentComponent.paymentComponent = viewModel.paymentComponent
+        binding.gmsPaymentComponent.getMoreInformationLabel().setOnClickListener {
+            viewModel.paymentComponent?.listener?.onMoreInformationClicked()
+            dismiss()
+        }
+        binding.gmsPaymentComponent.getBankPickerButton().setOnClickListener {
+            viewModel.paymentComponent?.listener?.onBankPickerClicked()
+            dismiss()
+        }
+        binding.gmsPaymentComponent.getPayInvoiceButton().setOnClickListener {
+            viewLifecycleOwner.lifecycleScope.launch {
+                viewModel.paymentComponent?.onPayInvoiceClicked()
+                // if payment provider does not support GPC and review fragment will not be shown, we're in the case where we show `Open With Bottom Sheet` from the payment component directly
+                if (viewModel.paymentProviderApp.value?.paymentProvider?.gpcSupported() == false && !viewModel.reviewFragmentShown) return@launch
+                dismiss()
+            }
+        }
+        paymentComponentView = binding.gmsPaymentComponent
+        return binding.root
+    }
+
+    override fun onCancel(dialog: DialogInterface) {
+        viewModel.backListener?.backCalled()
+        super.onCancel(dialog)
+    }
+
+    companion object {
+        internal fun newInstance(paymentComponent: PaymentComponent?, reviewFragmentShown: Boolean, backListener: BackListener) = PaymentComponentBottomSheet(paymentComponent, reviewFragmentShown, backListener)
+    }
+
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/paymentComponentBottomSheet/PaymentComponentBottomSheetViewModel.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/paymentComponentBottomSheet/PaymentComponentBottomSheetViewModel.kt
new file mode 100644
index 0000000000..9bc273c24b
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/paymentComponentBottomSheet/PaymentComponentBottomSheetViewModel.kt
@@ -0,0 +1,34 @@
+package net.gini.android.merchant.sdk.paymentComponentBottomSheet
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.merchant.sdk.paymentcomponent.SelectedPaymentProviderAppState
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderApp
+import net.gini.android.merchant.sdk.util.BackListener
+
+internal class PaymentComponentBottomSheetViewModel private constructor(val paymentComponent: PaymentComponent?, val backListener: BackListener?, val reviewFragmentShown: Boolean) : ViewModel() {
+    private val _paymentProviderApp = MutableStateFlow<PaymentProviderApp?>(null)
+    val paymentProviderApp: StateFlow<PaymentProviderApp?> = _paymentProviderApp
+
+    init {
+        viewModelScope.launch {
+            paymentComponent?.selectedPaymentProviderAppFlow?.collect {
+                if (it is SelectedPaymentProviderAppState.AppSelected) {
+                    _paymentProviderApp.value = it.paymentProviderApp
+                }
+            }
+        }
+    }
+
+    class Factory(private val paymentComponent: PaymentComponent?, private val backListener: BackListener?, private val reviewFragmentShown: Boolean) : ViewModelProvider.Factory {
+        @Suppress("UNCHECKED_CAST")
+        override fun <T : ViewModel> create(modelClass: Class<T>): T {
+            return PaymentComponentBottomSheetViewModel(paymentComponent, backListener, reviewFragmentShown) as T
+        }
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/paymentcomponent/PaymentComponent.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/paymentcomponent/PaymentComponent.kt
new file mode 100644
index 0000000000..1436a67f8b
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/paymentcomponent/PaymentComponent.kt
@@ -0,0 +1,281 @@
+package net.gini.android.merchant.sdk.paymentcomponent
+
+import android.content.Context
+import androidx.annotation.VisibleForTesting
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import net.gini.android.core.api.Resource
+import net.gini.android.health.api.GiniHealthAPI
+import net.gini.android.health.api.models.PaymentProvider
+import net.gini.android.merchant.sdk.GiniMerchant
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderApp
+import net.gini.android.merchant.sdk.paymentprovider.getPaymentProviderApps
+import org.slf4j.LoggerFactory
+
+/**
+ * The [PaymentComponent] manages the data and state used by every [PaymentComponentView], the [MoreInformationFragment],
+ * and the [BankSelectionBottomSheet].
+ *
+ * It requires a [GiniMerchant] instance and a [Context] (application or activity) to be created.
+ */
+internal class PaymentComponent(@get:VisibleForTesting internal val context: Context, @get:VisibleForTesting internal val healthAPI: GiniHealthAPI) {
+
+    // Holds the state of the Payment Provider apps as received from the server - no processing is done on this list, to serve as a point of truth
+    private val _initialStatePaymentProviderAppsFlow = MutableStateFlow<PaymentProviderAppsState>(PaymentProviderAppsState.Loading)
+
+    private val _paymentProviderAppsFlow = MutableStateFlow<PaymentProviderAppsState>(PaymentProviderAppsState.Nothing)
+
+    /**
+     * A [StateFlow] which emits the state of the payment provider apps. See [PaymentProviderAppsState] for the possible states.
+     */
+    val paymentProviderAppsFlow: StateFlow<PaymentProviderAppsState> = _paymentProviderAppsFlow.asStateFlow()
+
+    private val _selectedPaymentProviderAppFlow =
+        MutableStateFlow<SelectedPaymentProviderAppState>(SelectedPaymentProviderAppState.NothingSelected)
+
+    /**
+     * A [StateFlow] which emits the state of the selected payment provider app. See [SelectedPaymentProviderAppState] for the possible states.
+     */
+    val selectedPaymentProviderAppFlow: StateFlow<SelectedPaymentProviderAppState> = _selectedPaymentProviderAppFlow.asStateFlow()
+
+    private val _returningUserFlow = MutableStateFlow(false)
+
+    /**
+     * A [StateFlow] which emits whether the user is a returning one or not.
+     */
+    val returningUserFlow: StateFlow<Boolean> = _returningUserFlow
+
+    @VisibleForTesting
+    internal val paymentComponentPreferences = PaymentComponentPreferences(context)
+
+    /**
+     * A listener for the payment component. It exposes the user interactions with all of the [PaymentComponentView]s.
+     * See [Listener] for the methods you need to implement.
+     */
+    var listener: Listener? = null
+
+    /**
+     * Holds information about which layout to use for the bank picker: single line or two lines.
+     */
+    var bankPickerRows: BankPickerRows = BankPickerRows.TWO
+
+    /**
+     * Whether we need to check for returning user and hide `Select your bank to pay` label.
+     */
+    var shouldCheckReturningUser: Boolean = false
+
+    /**
+     * Loads the payment provider apps and selects the first installed payment provider app or nothing if no payment provider
+     * app is installed. The selection (or lack of selection) will be visible once a [PaymentComponentView] is shown.
+     *
+     * It should be sufficient to call [loadPaymentProviderApps] only once when your app starts.
+     *
+     * By collecting the [paymentProviderAppsFlow] and [selectedPaymentProviderAppFlow] you can observe the state of the
+     * loading process.
+     */
+    suspend fun loadPaymentProviderApps() {
+        LOG.debug("Loading payment providers")
+        _paymentProviderAppsFlow.value = PaymentProviderAppsState.Loading
+        _paymentProviderAppsFlow.value = try {
+            when (val paymentProvidersResource = healthAPI.documentManager.getPaymentProviders()) {
+                is Resource.Cancelled -> {
+                    LOG.debug("Loading payment providers cancelled")
+                    _initialStatePaymentProviderAppsFlow.value = PaymentProviderAppsState.Error(Exception("Cancelled"))
+                    PaymentProviderAppsState.Error(Exception("Cancelled"))
+                }
+
+                is Resource.Error -> {
+                    LOG.error("Error loading payment providers", paymentProvidersResource.exception)
+                    _initialStatePaymentProviderAppsFlow.value = PaymentProviderAppsState.Error((
+                            paymentProvidersResource.exception ?: Exception(
+                                paymentProvidersResource.message
+                            )))
+                    PaymentProviderAppsState.Error(
+                        paymentProvidersResource.exception ?: Exception(
+                            paymentProvidersResource.message
+                        )
+                    )
+                }
+
+                is Resource.Success -> {
+                    LOG.debug("Loaded payment providers")
+                    LOG.debug("Loading installed payment provider apps")
+
+                    val paymentProviderApps = getPaymentProviderAppsSorted(paymentProvidersResource.data)
+
+                    selectPaymentProviderApp(paymentProviderApps)
+
+                    PaymentProviderAppsState.Success(paymentProviderApps)
+                }
+            }
+        } catch (e: Exception) {
+            LOG.error("Error loading payment providers", e)
+            PaymentProviderAppsState.Error(e)
+        }
+    }
+
+    internal suspend fun setSelectedPaymentProviderApp(paymentProviderApp: PaymentProviderApp) {
+        _selectedPaymentProviderAppFlow.value = SelectedPaymentProviderAppState.AppSelected(paymentProviderApp)
+
+        paymentComponentPreferences.saveSelectedPaymentProviderId(paymentProviderApp.paymentProvider.id)
+    }
+
+    internal fun recheckWhichPaymentProviderAppsAreInstalled() {
+        LOG.debug("Rechecking which payment provider apps are installed")
+        when (val paymentProviderAppsState = _initialStatePaymentProviderAppsFlow.value) {
+            is PaymentProviderAppsState.Success -> {
+                LOG.debug("Rechecking {} payment provider apps", paymentProviderAppsState.paymentProviderApps.size)
+
+                val paymentProviders = paymentProviderAppsState.paymentProviderApps.map { it.paymentProvider }
+                val paymentProviderApps = getPaymentProviderAppsSorted(paymentProviders)
+                updateSelectedPaymentProviderApp(paymentProviderApps)
+                _paymentProviderAppsFlow.value = PaymentProviderAppsState.Success(paymentProviderApps)
+            }
+
+            else -> {
+                LOG.debug("No payment provider apps to recheck")
+            }
+        }
+    }
+
+    @VisibleForTesting
+    internal fun sortPaymentProviderApps(paymentProviderList: List<PaymentProviderApp>): List<PaymentProviderApp> = paymentProviderList.sortedBy { it.installedPaymentProviderApp == null }
+
+    private fun getPaymentProviderAppsSorted(paymentProviders: List<PaymentProvider>): List<PaymentProviderApp> {
+        val paymentProviderApps = context.packageManager.getPaymentProviderApps(
+            paymentProviders,
+            context
+        )
+        _initialStatePaymentProviderAppsFlow.tryEmit(PaymentProviderAppsState.Success(paymentProviderApps))
+        val sortedPaymentProviderAppsList = sortPaymentProviderApps(paymentProviderApps)
+
+        return sortedPaymentProviderAppsList
+    }
+
+    private suspend fun selectPaymentProviderApp(paymentProviderApps: List<PaymentProviderApp>) {
+        if (paymentProviderApps.isNotEmpty()) {
+            LOG.debug("Received {} payment provider apps", paymentProviderApps.size)
+
+            if (_selectedPaymentProviderAppFlow.value !is SelectedPaymentProviderAppState.AppSelected) {
+                val previouslySelectedPaymentProviderApp =
+                    getPreviouslySelectedPaymentProviderApp(paymentProviderApps)
+
+                if (previouslySelectedPaymentProviderApp != null) {
+                    LOG.debug("Using previously selected payment provider app: {}", previouslySelectedPaymentProviderApp.name)
+
+                    _selectedPaymentProviderAppFlow.value =
+                        SelectedPaymentProviderAppState.AppSelected(previouslySelectedPaymentProviderApp)
+                }
+            }
+        } else {
+            LOG.debug("No payment provider apps received")
+            _selectedPaymentProviderAppFlow.value = SelectedPaymentProviderAppState.NothingSelected
+
+            paymentComponentPreferences.deleteSelectedPaymentProviderId()
+        }
+    }
+
+    private fun updateSelectedPaymentProviderApp(paymentProviderApps: List<PaymentProviderApp>) {
+        if (_selectedPaymentProviderAppFlow.value is SelectedPaymentProviderAppState.AppSelected) {
+            val selectedPaymentProviderApp =
+                (_selectedPaymentProviderAppFlow.value as SelectedPaymentProviderAppState.AppSelected).paymentProviderApp
+            paymentProviderApps.firstOrNull { it.hasSamePaymentProviderId(selectedPaymentProviderApp) }
+                ?.let {
+                    _selectedPaymentProviderAppFlow.value = SelectedPaymentProviderAppState.AppSelected(it)
+                }
+        }
+    }
+
+    private suspend fun getPreviouslySelectedPaymentProviderApp(paymentProviderApps: List<PaymentProviderApp>): PaymentProviderApp? {
+        return paymentComponentPreferences.getSelectedPaymentProviderId()?.let { previouslySelectedPaymentProviderId ->
+            paymentProviderApps.find { it.hasSamePaymentProviderId(previouslySelectedPaymentProviderId) }
+        }
+    }
+
+    internal suspend fun onPayInvoiceClicked(documentId: String = "") {
+        paymentComponentPreferences.saveReturningUser()
+        listener?.onPayInvoiceClicked(documentId)
+        delay(500)
+        checkReturningUser()
+    }
+
+    internal suspend fun checkReturningUser() {
+        if (!shouldCheckReturningUser) return
+        _returningUserFlow.value = paymentComponentPreferences.getReturningUser()
+    }
+
+    private companion object {
+        private val LOG = LoggerFactory.getLogger(PaymentComponent::class.java)
+    }
+
+    /**
+     * A listener for the [PaymentComponent]. It exposes the user interactions with all of the [PaymentComponentView]s.
+     */
+    interface Listener {
+        /**
+         * Called when the user taps the "more information" link or the info icon in the [PaymentComponentView].
+         *
+         * You should show the [MoreInformationFragment] in this method.
+         */
+        fun onMoreInformationClicked()
+
+        /**
+         * Called when the user taps the bank picker button in the [PaymentComponentView].
+         *
+         * You should show the [BankSelectionBottomSheet] in this method.
+         */
+        fun onBankPickerClicked()
+
+        /**
+         * Called when the user taps the "pay invoice" button in the [PaymentComponentView]. The document id will be taken
+         * from the clicked PaymentComponentView's [PaymentComponentView.documentId] property.
+         *
+         * @param documentId The value in the clicked PaymentComponentView's [PaymentComponentView.documentId] property
+         */
+        fun onPayInvoiceClicked(documentId: String)
+    }
+
+}
+
+/**
+ * The states of the payment provider apps loading process.
+ */
+internal sealed class PaymentProviderAppsState {
+    object Nothing: PaymentProviderAppsState()
+    /**
+     * The payment provider apps are being loaded.
+     */
+    object Loading : PaymentProviderAppsState()
+
+    /**
+     * The payment provider apps were successfully loaded.
+     */
+    class Success(val paymentProviderApps: List<PaymentProviderApp>) : PaymentProviderAppsState()
+
+    /**
+     * An error occurred while loading the payment provider apps.
+     */
+    class Error(val throwable: Throwable) : PaymentProviderAppsState()
+}
+
+/**
+ * The states of the selected payment provider app.
+ */
+internal sealed class SelectedPaymentProviderAppState {
+    /**
+     * No payment provider app is selected.
+     */
+    object NothingSelected : SelectedPaymentProviderAppState()
+
+    /**
+     * A payment provider app is selected.
+     */
+    class AppSelected(val paymentProviderApp: PaymentProviderApp) : SelectedPaymentProviderAppState()
+}
+
+internal enum class BankPickerRows {
+    SINGLE,
+    TWO
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/paymentcomponent/PaymentComponentPreferences.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/paymentcomponent/PaymentComponentPreferences.kt
new file mode 100644
index 0000000000..d008b6cf54
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/paymentcomponent/PaymentComponentPreferences.kt
@@ -0,0 +1,52 @@
+package net.gini.android.merchant.sdk.paymentcomponent
+
+import android.content.Context
+import androidx.datastore.preferences.core.booleanPreferencesKey
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.stringPreferencesKey
+import androidx.datastore.preferences.preferencesDataStore
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.map
+
+private val Context.dataStore by preferencesDataStore(name = "payment-component-preferences")
+
+private val KEY_SELECTED_PAYMENT_PROVIDER_ID = stringPreferencesKey("selected-payment-provider-id")
+private val KEY_RETURNING_USER = booleanPreferencesKey("returning-user")
+
+internal class PaymentComponentPreferences(private val context: Context) {
+
+    suspend fun saveSelectedPaymentProviderId(id: String) {
+        context.dataStore.edit { preferences ->
+            preferences[KEY_SELECTED_PAYMENT_PROVIDER_ID] = id
+        }
+    }
+
+    suspend fun deleteSelectedPaymentProviderId() {
+        context.dataStore.edit { preferences ->
+            preferences.remove(KEY_SELECTED_PAYMENT_PROVIDER_ID)
+        }
+    }
+
+    suspend fun getSelectedPaymentProviderId(): String? {
+        return context.dataStore.data.map { preferences ->
+            preferences[KEY_SELECTED_PAYMENT_PROVIDER_ID]
+        }.first()
+    }
+
+    suspend fun saveReturningUser() {
+        context.dataStore.edit { preferences ->
+            preferences[KEY_RETURNING_USER] = true
+        }
+    }
+
+    suspend fun getReturningUser(): Boolean {
+        return context.dataStore.data.map { preferences ->
+            preferences[KEY_RETURNING_USER]
+        }.firstOrNull() ?: false
+    }
+
+    suspend fun clearData() {
+        context.dataStore.edit { it.clear() }
+    }
+}
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/paymentcomponent/PaymentComponentView.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/paymentcomponent/PaymentComponentView.kt
new file mode 100644
index 0000000000..cb1a186e17
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/paymentcomponent/PaymentComponentView.kt
@@ -0,0 +1,259 @@
+package net.gini.android.merchant.sdk.paymentcomponent
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.widget.Button
+import androidx.annotation.VisibleForTesting
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.launch
+import net.gini.android.merchant.sdk.R
+import net.gini.android.merchant.sdk.databinding.GmsPaymentProviderIconHolderBinding
+import net.gini.android.merchant.sdk.databinding.GmsViewPaymentComponentBinding
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderApp
+import net.gini.android.merchant.sdk.util.getLayoutInflaterWithGiniMerchantTheme
+import net.gini.android.merchant.sdk.util.setBackgroundTint
+import net.gini.android.merchant.sdk.util.wrappedWithGiniMerchantTheme
+import org.slf4j.LoggerFactory
+import kotlin.coroutines.CoroutineContext
+
+/**
+ * The [PaymentComponentView] is a custom view widget and the main entry point for users. It allows them to pick a bank
+ * and initiate the payment process. In addition, it also allows users to view more information about the payment feature.
+ *
+ * It is hidden by default and should be added to the layout of each invoice item.
+ *
+ * When creating the view holder for the invoice item, pass the [PaymentComponent] instance to the view holder:
+ *
+ * ```
+ * val paymentComponentView = view.findViewById(R.id.payment_component)
+ * paymentComponentView.paymentComponent = paymentComponent
+ * ```
+ *
+ * When binding the view holder of the invoice item, prepare the [PaymentComponentView] for reuse, set the payable state
+ * and the document id:
+ *
+ * ```
+ * viewHolder.paymentComponentView.prepareForReuse()
+ * viewHolder.paymentComponentView.documentId = invoiceItem.documentId
+ * ```
+ *
+ * _Note_: The [PaymentComponentView] will only be visible if its [PaymentComponentView.isPayable] property is `true`.
+ */
+internal class PaymentComponentView(context: Context, attrs: AttributeSet?) : ConstraintLayout(context, attrs) {
+
+    /**
+     * The [PaymentComponent] instance which provides the data and state for the [PaymentComponentView].
+     */
+    var paymentComponent: PaymentComponent? = null
+        set(value) {
+            field = value
+            initViews()
+        }
+
+    internal var coroutineContext: CoroutineContext = Dispatchers.Main
+
+    @VisibleForTesting
+    internal var coroutineScope: CoroutineScope? = null
+
+    /**
+     * The document id of the invoice item. This will be returned in the [PaymentComponent.Listener.onPayInvoiceClicked] method.
+     */
+    var documentId: String? = null
+
+    var reviewFragmentWillBeShown: Boolean = false
+
+    private val binding = GmsViewPaymentComponentBinding.inflate(getLayoutInflaterWithGiniMerchantTheme(), this)
+    private lateinit var selectBankButton: Button
+    private lateinit var payInvoiceButton: Button
+    private lateinit var paymentProviderAppIconHolder: GmsPaymentProviderIconHolderBinding
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        LOG.debug("onAttachedToWindow")
+        if (coroutineScope == null) {
+            LOG.debug("Creating coroutine scope")
+            coroutineScope = CoroutineScope(coroutineContext)
+        }
+        if (paymentComponent?.bankPickerRows == BankPickerRows.TWO) {
+            binding.gmsTwoRowsBankSelection.isVisible = true
+            binding.gmsSingleRowBankSelection.root.visibility = View.GONE
+        } else {
+            binding.gmsSingleRowBankSelection.root.visibility = View.VISIBLE
+            binding.gmsTwoRowsBankSelection.visibility = View.GONE
+        }
+        checkPaymentComponentHeight()
+        coroutineScope?.launch {
+            if (paymentComponent == null) {
+                LOG.warn("Cannot show payment provider apps: PaymentComponent must be set before showing the PaymentComponentView")
+                return@launch
+            }
+            paymentComponent?.checkReturningUser()
+            paymentComponent?.let { pc ->
+                LOG.debug("Collecting payment provider apps state and selected payment provider app from PaymentComponent")
+                launch {
+                    pc.selectedPaymentProviderAppFlow.combine(pc.paymentProviderAppsFlow) { selectedPaymentProviderAppState, paymentProviderAppsState ->
+                        selectedPaymentProviderAppState to paymentProviderAppsState
+                    }.collect { (selectedPaymentProviderAppState, paymentProviderAppsState) ->
+                        LOG.debug(
+                            "Received selected payment provider app state: {}",
+                            selectedPaymentProviderAppState
+                        )
+                        LOG.debug(
+                            "Received payment provider apps state: {}",
+                            paymentProviderAppsState
+                        )
+                        if (paymentProviderAppsState is PaymentProviderAppsState.Success) {
+                            when (selectedPaymentProviderAppState) {
+                                is SelectedPaymentProviderAppState.AppSelected -> {
+                                    enableBankPicker()
+                                    customizeBankPicker(selectedPaymentProviderAppState.paymentProviderApp)
+                                    customizePayInvoiceButton(selectedPaymentProviderAppState.paymentProviderApp)
+                                    enablePayInvoiceButton()
+                                }
+
+                                SelectedPaymentProviderAppState.NothingSelected -> {
+                                    enableBankPicker()
+                                    restoreBankPickerDefaultState()
+                                    restorePayInvoiceButtonDefaultState()
+                                    disablePayInvoiceButton()
+                                }
+                            }
+                        } else {
+                            disableBankPicker()
+                            disablePayInvoiceButton()
+                        }
+                    }
+                }
+                launch {
+                    pc.returningUserFlow.collect { isReturning ->
+                        binding.gmsMoreInformation.visibility = if (isReturning) View.GONE else View.VISIBLE
+                        binding.gmsSelectBankLabel.visibility = if (isReturning) View.GONE else View.VISIBLE
+                    }
+                }
+            }
+        }
+    }
+
+    private fun checkPaymentComponentHeight() {
+        if (resources.getDimension(R.dimen.gms_payment_component_height) >= resources.getDimension(R.dimen.gms_accessibility_min_height)) {
+            binding.gmsSelectBankPickerLayout.layoutParams.height = resources.getDimension(R.dimen.gms_payment_component_height).toInt()
+        }
+    }
+
+    private fun restoreBankPickerDefaultState() {
+        LOG.debug("Restoring bank picker default state")
+        context?.wrappedWithGiniMerchantTheme()?.let { context ->
+            payInvoiceButton.visibility = View.GONE
+            paymentProviderAppIconHolder.root.visibility = View.GONE
+            selectBankButton.text = context.getString(R.string.gms_select_bank)
+            selectBankButton.setCompoundDrawablesWithIntrinsicBounds(
+                null,
+                null,
+                ContextCompat.getDrawable(context, R.drawable.gms_chevron_down_icon),
+                null
+            )
+        }
+    }
+
+    private fun customizeBankPicker(paymentProviderApp: PaymentProviderApp) {
+        LOG.debug("Customizing bank picker for payment provider app: {}", paymentProviderApp.name)
+        context?.wrappedWithGiniMerchantTheme()?.let { context ->
+            selectBankButton.apply {
+                text = if (paymentComponent?.bankPickerRows == BankPickerRows.SINGLE) "" else paymentProviderApp.name
+                setCompoundDrawablesWithIntrinsicBounds(
+                    null,
+                    null,
+                    ContextCompat.getDrawable(context, R.drawable.gms_chevron_down_icon),
+                    null
+                )
+            }
+
+            paymentProviderAppIconHolder.apply {
+                gmsPaymentProviderIcon.setImageDrawable(paymentProviderApp.icon)
+                root.visibility = View.VISIBLE
+                root.contentDescription = paymentProviderApp.name
+            }
+        }
+    }
+
+    private fun customizePayInvoiceButton(paymentProviderApp: PaymentProviderApp) {
+        LOG.debug("Customizing pay invoice button for payment provider app: {}", paymentProviderApp.name)
+        payInvoiceButton.setBackgroundTint(paymentProviderApp.colors.backgroundColor, 255)
+        payInvoiceButton.setTextColor(paymentProviderApp.colors.textColor)
+        payInvoiceButton.visibility = View.VISIBLE
+    }
+
+    private fun enableBankPicker() {
+        LOG.debug("Enabling bank picker")
+        selectBankButton.isEnabled = true
+    }
+
+    private fun disableBankPicker() {
+        LOG.debug("Disabling bank picker")
+        selectBankButton.isEnabled = false
+    }
+
+    private fun enablePayInvoiceButton() {
+        LOG.debug("Enabling pay invoice button")
+        payInvoiceButton.isEnabled = true
+        payInvoiceButton.alpha = 1f
+    }
+
+    private fun disablePayInvoiceButton() {
+        LOG.debug("Disabling pay invoice button")
+        payInvoiceButton.isEnabled = false
+        payInvoiceButton.alpha = 0.4f
+    }
+
+    private fun restorePayInvoiceButtonDefaultState() {
+        LOG.debug("Restoring pay invoice button default state")
+        context?.wrappedWithGiniMerchantTheme()?.let { context ->
+            payInvoiceButton.apply {
+                setBackgroundTint(
+                    ContextCompat.getColor(
+                        context,
+                        R.color.gms_unelevated_button_background
+                    )
+                )
+                setTextColor(
+                    ContextCompat.getColor(
+                        context,
+                        R.color.gms_unelevated_button_text
+                    )
+                )
+            }
+        }
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        LOG.debug("onDetachedFromWindow")
+        coroutineScope?.cancel()
+        coroutineScope = null
+    }
+
+    private fun initViews() {
+        selectBankButton = if (paymentComponent?.bankPickerRows == BankPickerRows.TWO) binding.gmsSelectBankPicker.gmsSelectBankButton else binding.gmsSingleRowBankSelection.gmsSelectBankButton
+        payInvoiceButton = if (paymentComponent?.bankPickerRows == BankPickerRows.TWO) binding.gmsPayInvoiceButtonTwoRows else binding.gmsSingleRowBankSelection.gmsPayInvoiceButton
+        paymentProviderAppIconHolder = if (paymentComponent?.bankPickerRows == BankPickerRows.TWO) binding.gmsSelectBankPicker.gmsPaymentProviderAppIconHolder else binding.gmsSingleRowBankSelection.gmsPaymentProviderAppIconHolder
+
+        payInvoiceButton.text = if (reviewFragmentWillBeShown) resources.getString(R.string.gms_continue_to_overview) else resources.getString(R.string.gms_pay_button)
+    }
+
+    fun getMoreInformationLabel() = binding.gmsMoreInformation
+
+    fun getPayInvoiceButton() = payInvoiceButton
+
+    fun getBankPickerButton() = selectBankButton
+
+    private companion object {
+        private val LOG = LoggerFactory.getLogger(PaymentComponentView::class.java)
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/paymentprovider/PaymentProviderApp.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/paymentprovider/PaymentProviderApp.kt
new file mode 100644
index 0000000000..9c817c9aff
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/paymentprovider/PaymentProviderApp.kt
@@ -0,0 +1,181 @@
+package net.gini.android.merchant.sdk.paymentprovider
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.content.pm.ResolveInfo
+import android.graphics.Color
+import android.graphics.drawable.BitmapDrawable
+import android.net.Uri
+import androidx.annotation.ColorInt
+import net.gini.android.health.api.models.PaymentProvider
+import net.gini.android.merchant.sdk.util.extensions.generateBitmapDrawableIcon
+import org.slf4j.LoggerFactory
+
+internal const val Scheme = "ginipay" // It has to match the scheme in query tag in manifest
+private const val PaymentPath = "payment"
+internal const val QueryUri = "$Scheme://$PaymentPath/id"
+
+internal fun getPaymentProviderAppUri(requestId: String) = "$Scheme://$PaymentPath/$requestId"
+
+internal fun PackageManager.getInstalledPaymentProviderApps(): List<InstalledPaymentProviderApp> =
+    queryIntentActivities(getPaymentProviderAppQueryIntent(), 0)
+        .map { InstalledPaymentProviderApp.fromResolveInfo(it, this) }
+
+
+internal fun PackageManager.getPaymentProviderApps(
+    paymentProviders: List<PaymentProvider>,
+    context: Context
+): List<PaymentProviderApp> =
+    linkInstalledPaymentProviderAppsWithPaymentProviders(paymentProviders)
+        .map { (installedApp, paymentProvider) ->
+            PaymentProviderApp.fromPaymentProvider(paymentProvider, installedApp, context)
+        }
+
+internal fun PackageManager.linkInstalledPaymentProviderAppsWithPaymentProviders(paymentProviders: List<PaymentProvider>): List<Pair<InstalledPaymentProviderApp?, PaymentProvider>> {
+    val installedPaymentProviderApps = getInstalledPaymentProviderApps()
+    return paymentProviders
+        .map { paymentProvider ->
+            installedPaymentProviderApps
+                .find { installedApp -> paymentProvider.packageName == installedApp.packageName }
+                ?.let { installedApp -> installedApp to paymentProvider } ?: (null to paymentProvider)
+        }
+}
+
+private fun getPaymentProviderAppQueryIntent() = Intent().apply {
+    action = Intent.ACTION_VIEW
+    data = Uri.parse(QueryUri)
+}
+
+internal data class PaymentProviderApp(
+    val name: String,
+    val icon: BitmapDrawable?,
+    val colors: PaymentProviderAppColors,
+    internal val paymentProvider: PaymentProvider,
+    internal val installedPaymentProviderApp: InstalledPaymentProviderApp? = null,
+) {
+
+    fun getIntent(paymentRequestId: String): Intent? = installedPaymentProviderApp?.let {
+        Intent(it.launchIntent).apply {
+            data = Uri.parse(getPaymentProviderAppUri(paymentRequestId))
+        }
+    }
+
+    fun isInstalled() = installedPaymentProviderApp != null
+
+    fun hasPlayStoreUrl() = paymentProvider.playStoreUrl != null
+
+    fun hasSamePaymentProviderId(
+        paymentProviderApp: PaymentProviderApp
+    ): Boolean =
+        paymentProvider.id == paymentProviderApp.paymentProvider.id
+
+    fun hasSamePaymentProviderId(id: String): Boolean = paymentProvider.id == id
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as PaymentProviderApp
+
+        if (name != other.name) return false
+        if (icon != other.icon) return false
+        if (colors != other.colors) return false
+        if (paymentProvider != other.paymentProvider) return false
+        return installedPaymentProviderApp == other.installedPaymentProviderApp
+    }
+
+    override fun hashCode(): Int {
+        var result = name.hashCode()
+        result = 31 * result + (icon?.hashCode() ?: 0)
+        result = 31 * result + colors.hashCode()
+        result = 31 * result + paymentProvider.hashCode()
+        result = 31 * result + (installedPaymentProviderApp?.hashCode() ?: 0)
+        return result
+    }
+
+
+    companion object {
+        internal const val ICON_SIZE = 32f // in dp
+
+        private val LOG = LoggerFactory.getLogger(PaymentProviderApp::class.java)
+
+        internal fun fromPaymentProvider(
+            paymentProvider: PaymentProvider,
+            installedPaymentProviderApp: InstalledPaymentProviderApp?,
+            context: Context,
+        ): PaymentProviderApp {
+            if (installedPaymentProviderApp != null) {
+                if (paymentProvider.packageName != installedPaymentProviderApp.packageName) {
+                    val errorMessage = """
+                        The payment provider and the installed bank app have different package names:
+                            - Payment provider:     ${paymentProvider.packageName}
+                            - Installed bank app:   ${installedPaymentProviderApp.packageName}
+                    """.trimIndent()
+                    LOG.error(errorMessage)
+                    throw IllegalArgumentException(errorMessage)
+                }
+            }
+            return PaymentProviderApp(
+                name = paymentProvider.name,
+                icon = context.generateBitmapDrawableIcon(paymentProvider.icon, paymentProvider.icon.size),
+                colors = PaymentProviderAppColors(
+                    backgroundColor = Color.parseColor("#${paymentProvider.colors.backgroundColorRGBHex}"),
+                    textColor = Color.parseColor("#${paymentProvider.colors.textColoRGBHex}")
+                ),
+                paymentProvider = paymentProvider,
+                installedPaymentProviderApp = installedPaymentProviderApp
+            )
+        }
+    }
+}
+
+internal data class PaymentProviderAppColors(
+    @ColorInt val backgroundColor: Int,
+    @ColorInt val textColor: Int
+)
+
+internal data class InstalledPaymentProviderApp(
+    val packageName: String,
+    val version: String,
+    val launchIntent: Intent
+) {
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as InstalledPaymentProviderApp
+
+        if (packageName != other.packageName) return false
+        if (version != other.version) return false
+        if (launchIntent.action != other.launchIntent.action) return false
+        return launchIntent.component == other.launchIntent.component
+    }
+
+    override fun hashCode(): Int {
+        var result = packageName.hashCode()
+        result = 31 * result + version.hashCode()
+        result = 31 * result + launchIntent.hashCode()
+        return result
+    }
+
+    companion object {
+
+        internal fun fromResolveInfo(
+            resolveInfo: ResolveInfo,
+            packageManager: PackageManager
+        ): InstalledPaymentProviderApp {
+            val packageName = resolveInfo.activityInfo.applicationInfo.packageName
+            return InstalledPaymentProviderApp(
+                packageName = packageName,
+                version = packageManager.getPackageInfo(packageName, 0).versionName,
+                launchIntent = Intent().apply {
+                    action = Intent.ACTION_VIEW
+                    component = ComponentName(resolveInfo.activityInfo.packageName, resolveInfo.activityInfo.name)
+                }
+            )
+        }
+    }
+}
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/preferences/UserPreferences.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/preferences/UserPreferences.kt
new file mode 100644
index 0000000000..d751330ca5
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/preferences/UserPreferences.kt
@@ -0,0 +1,45 @@
+package net.gini.android.merchant.sdk.preferences
+
+import android.content.Context
+import androidx.core.content.edit
+
+/**
+ * Created by Alpár Szotyori on 03.12.21.
+ *
+ * Copyright (c) 2021 Gini GmbH.
+ */
+internal class UserPreferences(context: Context) {
+
+    private val sharedPreferences = context.getSharedPreferences("UserPreferences", Context.MODE_PRIVATE)
+
+    fun set(userPreference: UserPreference<*>) {
+        userPreference.value?.let { value ->
+            sharedPreferences.edit {
+                when (value) {
+                    is String -> putString(userPreference.id, value)
+                    else -> throw IllegalArgumentException("Unknown user preference value type.")
+                }
+            }
+        }
+    }
+
+    inline fun <reified T> get(userPreference: UserPreference<T>): UserPreference<T>? {
+        if (!sharedPreferences.contains(userPreference.id)) {
+            return null
+        }
+
+        userPreference.value?.let { value ->
+            when (value) {
+                is String, (String is T) -> userPreference.value = sharedPreferences.getString(userPreference.id, "") as T
+                else -> throw IllegalArgumentException("Unknown user preference value type.")
+            }
+        }
+
+        return userPreference
+    }
+}
+
+internal sealed class UserPreference<T>(val id: String, var value: T) {
+
+    class PreferredBankApp(value: String = "") : UserPreference<String>("PreferredBankApp", value)
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/PaymentDetailsValidation.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/PaymentDetailsValidation.kt
new file mode 100644
index 0000000000..73117a5a77
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/PaymentDetailsValidation.kt
@@ -0,0 +1,39 @@
+package net.gini.android.merchant.sdk.review
+
+import net.gini.android.merchant.sdk.api.payment.model.PaymentDetails
+import net.gini.android.merchant.sdk.util.isNumber
+import net.gini.android.merchant.sdk.util.isValidIban
+
+
+internal enum class PaymentField { Recipient, Iban, Amount, Purpose }
+
+internal sealed class ValidationMessage(val field: PaymentField) {
+    data class Empty(val paymentField: PaymentField): ValidationMessage(paymentField)
+    object InvalidIban: ValidationMessage(PaymentField.Iban)
+    object AmountFormat: ValidationMessage(PaymentField.Amount)
+}
+
+internal fun PaymentDetails.validate(): List<ValidationMessage> = mutableListOf<ValidationMessage>().apply {
+    addAll(validateRecipient(this@validate.recipient))
+    addAll(validateIban(this@validate.iban))
+    addAll(validateAmount(this@validate.amount))
+    addAll(validatePurpose(this@validate.purpose))
+}
+
+internal fun validateRecipient(recipient: String): List<ValidationMessage> = mutableListOf<ValidationMessage>().apply {
+    if (recipient.trim().isEmpty()) add(ValidationMessage.Empty(PaymentField.Recipient))
+}
+
+internal fun validateIban(iban: String): List<ValidationMessage> = mutableListOf<ValidationMessage>().apply {
+    if (iban.trim().isEmpty()) add(ValidationMessage.Empty(PaymentField.Iban))
+    if (!isValidIban(iban.trim())) add(ValidationMessage.InvalidIban)
+}
+
+internal fun validateAmount(amount: String): List<ValidationMessage> = mutableListOf<ValidationMessage>().apply {
+    if (amount.trim().isEmpty()) add(ValidationMessage.Empty(PaymentField.Amount))
+    if (!amount.trim().isNumber()) add(ValidationMessage.AmountFormat)
+}
+
+internal fun validatePurpose(purpose: String): List<ValidationMessage> = mutableListOf<ValidationMessage>().apply {
+    if (purpose.trim().isEmpty()) add(ValidationMessage.Empty(PaymentField.Purpose))
+}
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/ReviewConfiguration.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/ReviewConfiguration.kt
new file mode 100644
index 0000000000..5820e2cb01
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/ReviewConfiguration.kt
@@ -0,0 +1,31 @@
+package net.gini.android.merchant.sdk.review
+
+
+/**
+ * Configuration for the [ReviewBottomSheet].
+ */
+internal data class ReviewConfiguration(
+    /**
+     * If set to `true`, the [ReviewBottomSheet] will handle errors internally and show snackbars for errors.
+     * If set to `false`, errors will be ignored by the [ReviewBottomSheet]. In this case the flows exposed by [GiniMerchant] should be observed for errors.
+     *
+     * Default value is `true`.
+     */
+    val handleErrorsInternally: Boolean = true,
+
+    /**
+     * Set to `true` to show a close button. Set a [ReviewFragmentListener] to be informed when the
+     * button is pressed.
+     *
+     * Default value is `false`.
+     */
+    val showCloseButton: Boolean = false,
+
+    /**
+     * If set to `true`, the [Amount] field will be editable.
+     * If set to `false` the [Amount] field will be read-only.
+     *
+     * Default value is `true`
+     */
+    internal val isAmountFieldEditable: Boolean = true
+)
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/installApp/InstallAppBottomSheet.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/installApp/InstallAppBottomSheet.kt
new file mode 100644
index 0000000000..cae2037775
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/installApp/InstallAppBottomSheet.kt
@@ -0,0 +1,161 @@
+package net.gini.android.merchant.sdk.review.installApp
+
+import android.app.Dialog
+import android.content.DialogInterface
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import kotlinx.coroutines.launch
+import net.gini.android.merchant.sdk.R
+import net.gini.android.merchant.sdk.databinding.GmsBottomSheetInstallAppBinding
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderApp
+import net.gini.android.merchant.sdk.util.BackListener
+import net.gini.android.merchant.sdk.util.GmsBottomSheetDialogFragment
+import net.gini.android.merchant.sdk.util.autoCleared
+import net.gini.android.merchant.sdk.util.extensions.setBackListener
+import net.gini.android.merchant.sdk.util.setBackgroundTint
+import org.slf4j.LoggerFactory
+
+/**
+ * Interface for forwarding the request to redirect to bank app.
+ */
+internal interface InstallAppForwardListener {
+    fun onForwardToBankSelected()
+}
+
+internal class InstallAppBottomSheet private constructor(
+    private val paymentComponent: PaymentComponent?,
+    private val listener: InstallAppForwardListener?,
+    backListener: BackListener?,
+    private val minHeight: Int?
+) :
+    GmsBottomSheetDialogFragment() {
+    constructor() : this(null, null, null, null)
+
+    private var binding: GmsBottomSheetInstallAppBinding by autoCleared()
+    private val viewModel: InstallAppViewModel by viewModels {
+        InstallAppViewModel.Factory(
+            paymentComponent,
+            backListener
+        )
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val dialog = super.onCreateDialog(savedInstanceState)
+        viewModel.backListener?.let {
+            (dialog as BottomSheetDialog).setBackListener(it)
+        }
+        return dialog
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = GmsBottomSheetInstallAppBinding.inflate(inflater, container, false)
+        binding.root.minHeight = minHeight ?: resources.getDimension(R.dimen.gms_install_app_min_height).toInt()
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        viewLifecycleOwner.lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.RESUMED) {
+                viewModel.paymentProviderApp.collect { paymentProviderApp ->
+                    if (paymentProviderApp != null) {
+                        binding.gmsPaymentProviderIcon.gmsPaymentProviderIcon.setImageDrawable(
+                            paymentProviderApp.icon
+                        )
+                        binding.gmsPaymentProviderIcon.gmsPaymentProviderIcon.contentDescription =
+                            "${paymentProviderApp.name} ${getString(R.string.gms_payment_provider_logo_content_description)}"
+                        binding.gmsInstallAppTitle.text = String.format(
+                            getString(R.string.gms_install_app_title),
+                            paymentProviderApp.paymentProvider.name
+                        )
+                        binding.gmsInstallAppDetails.text = String.format(
+                            getString(R.string.gms_install_app_detail),
+                            paymentProviderApp.paymentProvider.name
+                        )
+                        binding.gmsPlayStoreLogo.setOnClickListener {
+                            paymentProviderApp.paymentProvider.playStoreUrl?.let { openPlayStoreUrl(it) }
+                        }
+                        if (paymentProviderApp.isInstalled()) {
+                            updateUI(paymentProviderApp)
+                        } else {
+                            resetUI()
+                        }
+                    } else {
+                        LOG.error("No selected payment provider app")
+                    }
+                }
+            }
+        }
+    }
+
+    private fun updateUI(paymentProviderApp: PaymentProviderApp) {
+        binding.gmsInstallAppDetails.text = String.format(
+            getString(R.string.gms_install_app_tap_to_continue),
+            paymentProviderApp.paymentProvider.name
+        )
+        binding.gmsPlayStoreLogo.visibility = View.GONE
+        binding.gmsForwardButton.apply {
+            paymentProviderApp.let { paymentProviderApp ->
+                setBackgroundTint(paymentProviderApp.colors.backgroundColor, 255)
+                setTextColor(paymentProviderApp.colors.textColor)
+            }
+            visibility = View.VISIBLE
+        }
+
+        binding.gmsForwardButton.setOnClickListener {
+            listener?.onForwardToBankSelected()
+            dismiss()
+        }
+    }
+
+    private fun resetUI() {
+        binding.gmsForwardButton.visibility = View.GONE
+        binding.gmsPlayStoreLogo.visibility = View.VISIBLE
+    }
+
+    private fun openPlayStoreUrl(playStoreUrl: String) {
+        val intent = Intent(Intent.ACTION_VIEW, Uri.parse(playStoreUrl))
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        startActivity(intent)
+    }
+
+    override fun onCancel(dialog: DialogInterface) {
+        viewModel.backListener?.backCalled()
+        super.onCancel(dialog)
+    }
+
+    companion object {
+        private val LOG = LoggerFactory.getLogger(InstallAppBottomSheet::class.java)
+
+        /**
+         * Create a new instance of the [InstallAppBottomSheet].
+         *
+         * @param paymentComponent the [PaymentComponent] which is needed to check the installation state of the payment provider app
+         * @param listener the [InstallAppForwardListener] which will forward redirect requests
+         */
+        fun newInstance(
+            paymentComponent: PaymentComponent,
+            listener: InstallAppForwardListener,
+            backListener: BackListener?,
+            minHeight: Int?
+        ): InstallAppBottomSheet {
+            return InstallAppBottomSheet(paymentComponent, listener, backListener, minHeight)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/installApp/InstallAppViewModel.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/installApp/InstallAppViewModel.kt
new file mode 100644
index 0000000000..56b51e6b84
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/installApp/InstallAppViewModel.kt
@@ -0,0 +1,46 @@
+package net.gini.android.merchant.sdk.review.installApp
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.merchant.sdk.paymentcomponent.SelectedPaymentProviderAppState
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderApp
+import net.gini.android.merchant.sdk.util.BackListener
+import org.slf4j.LoggerFactory
+
+internal class InstallAppViewModel(private val paymentComponent: PaymentComponent?, val backListener: BackListener?) : ViewModel() {
+
+    private val _paymentProviderApp = MutableStateFlow<PaymentProviderApp?>(null)
+    val paymentProviderApp: StateFlow<PaymentProviderApp?> = _paymentProviderApp
+
+    init {
+        viewModelScope.launch {
+            paymentComponent?.selectedPaymentProviderAppFlow?.collect { selectedPaymentProviderAppState ->
+                when (selectedPaymentProviderAppState) {
+                    is SelectedPaymentProviderAppState.AppSelected -> {
+                        _paymentProviderApp.value = selectedPaymentProviderAppState.paymentProviderApp
+                    }
+
+                    SelectedPaymentProviderAppState.NothingSelected -> {
+                        LOG.error("No selected payment provider app")
+                    }
+                }
+            }
+        }
+    }
+
+    companion object {
+        private val LOG = LoggerFactory.getLogger(InstallAppViewModel::class.java)
+    }
+
+    class Factory(private val paymentComponent: PaymentComponent?, private val backListener: BackListener?) : ViewModelProvider.Factory {
+        @Suppress("UNCHECKED_CAST")
+        override fun <T : ViewModel> create(modelClass: Class<T>): T {
+            return InstallAppViewModel(paymentComponent, backListener) as T
+        }
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/openWith/OpenWithBottomSheet.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/openWith/OpenWithBottomSheet.kt
new file mode 100644
index 0000000000..961ba2fa18
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/openWith/OpenWithBottomSheet.kt
@@ -0,0 +1,122 @@
+package net.gini.android.merchant.sdk.review.openWith
+
+import android.app.Dialog
+import android.content.DialogInterface
+import android.content.Intent
+import android.graphics.Typeface
+import android.net.Uri
+import android.os.Bundle
+import android.text.SpannableString
+import android.text.Spanned
+import android.text.SpannedString
+import android.text.TextUtils
+import android.text.method.LinkMovementMethod
+import android.text.style.ClickableSpan
+import android.text.style.ForegroundColorSpan
+import android.text.style.StyleSpan
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.core.text.buildSpannedString
+import androidx.fragment.app.viewModels
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import net.gini.android.merchant.sdk.R
+import net.gini.android.merchant.sdk.databinding.GmsBottomSheetOpenWithBinding
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderApp
+import net.gini.android.merchant.sdk.util.BackListener
+import net.gini.android.merchant.sdk.util.GmsBottomSheetDialogFragment
+import net.gini.android.merchant.sdk.util.autoCleared
+import net.gini.android.merchant.sdk.util.extensions.setBackListener
+import net.gini.android.merchant.sdk.util.setBackgroundTint
+
+/**
+ * Interface for forwarding the request to share a PDF document
+ */
+internal interface OpenWithForwardListener {
+    fun onForwardSelected()
+}
+internal class OpenWithBottomSheet private constructor(paymentProviderApp: PaymentProviderApp?, private val listener: OpenWithForwardListener?, private val backListener: BackListener?) : GmsBottomSheetDialogFragment() {
+
+    constructor(): this(null, null, null)
+
+    private val viewModel by viewModels<OpenWithViewModel> { OpenWithViewModel.Factory(paymentProviderApp, backListener) }
+    private var binding: GmsBottomSheetOpenWithBinding by autoCleared()
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val dialog = super.onCreateDialog(savedInstanceState)
+        viewModel.backListener?.let {
+            (dialog as BottomSheetDialog).setBackListener(it)
+        }
+        return dialog
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = GmsBottomSheetOpenWithBinding.inflate(inflater, container, false)
+        binding.gmsAppLayout.gmsAppName.ellipsize = TextUtils.TruncateAt.END
+        binding.gmsAppLayout.gmsAppIcon.setImageDrawable(viewModel.paymentProviderApp?.icon)
+        viewModel.paymentProviderApp?.let { paymentProviderApp ->
+            with(binding.gmsForwardButton) {
+                setOnClickListener {
+                    listener?.onForwardSelected()
+                    dismiss()
+                }
+                setBackgroundTint(paymentProviderApp.colors.backgroundColor, 255)
+                setTextColor(paymentProviderApp.colors.textColor)
+            }
+            binding.gmsAppLayout.gmsAppName.text = paymentProviderApp.name
+            binding.gmsOpenWithTitle.text = String.format(getString(R.string.gms_open_with_title), paymentProviderApp.name)
+            binding.gmsOpenWithDetails.text = String.format(getString(R.string.gms_open_with_details), paymentProviderApp.name)
+            binding.gmsOpenWithInfo.text = createSpannableString(String.format(getString(R.string.gms_open_with_info), paymentProviderApp.name, paymentProviderApp.name), paymentProviderApp.paymentProvider.playStoreUrl)
+            binding.gmsOpenWithInfo.movementMethod = LinkMovementMethod.getInstance()
+        }
+        return binding.root
+    }
+
+    private fun createSpannableString(text: String, playStoreUrl: String?): SpannedString {
+        val linkSpan = SpannableString(getString(R.string.gms_open_with_download_app))
+        val playStoreLauncher = object: ClickableSpan() {
+            override fun onClick(p0: View) {
+                playStoreUrl?.let {
+                    val intent = Intent(Intent.ACTION_VIEW, Uri.parse(it))
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    startActivity(intent)
+                } ?: run {
+                    Toast.makeText(requireContext(), "No Play Store URL", Toast.LENGTH_LONG).show()
+                }
+            }
+
+        }
+        linkSpan.apply {
+            setSpan(StyleSpan(Typeface.BOLD),0,length,Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+            setSpan(playStoreLauncher, 0, length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+            setSpan(ForegroundColorSpan(requireContext().getColor(R.color.gms_open_with_details)),0,length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+        }
+        return buildSpannedString {
+            append(text)
+            append(" ")
+            append(linkSpan)
+            append(".")
+        }
+    }
+
+    override fun onCancel(dialog: DialogInterface) {
+        viewModel.backListener?.backCalled()
+        super.onCancel(dialog)
+    }
+
+    companion object {
+        /**
+         * Create a new instance of the [OpenWithBottomSheet].
+         *
+         * @param paymentProviderApp the [PaymentProviderApp] which the user needs ti identify in the 'Share PDF' screen
+         * @param listener the [OpenWithForwardListener] which will forward requests
+         * @param backListener the [BackListener] which will forward back events
+         */
+        fun newInstance(paymentProviderApp: PaymentProviderApp, listener: OpenWithForwardListener, backListener: BackListener? = null) = OpenWithBottomSheet(paymentProviderApp = paymentProviderApp, listener = listener, backListener = backListener)
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/openWith/OpenWithPreferences.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/openWith/OpenWithPreferences.kt
new file mode 100644
index 0000000000..28bf7c64df
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/openWith/OpenWithPreferences.kt
@@ -0,0 +1,25 @@
+package net.gini.android.merchant.sdk.review.openWith
+
+import android.content.Context
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.intPreferencesKey
+import androidx.datastore.preferences.preferencesDataStore
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.asLiveData
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
+
+private val Context.dataStore by preferencesDataStore(name = "open-with-preferences")
+internal class OpenWithPreferences(private val context: Context) {
+    suspend fun incrementCountForPaymentProviderId(paymentProviderId: String) {
+        context.dataStore.edit { preferences ->
+            val key = intPreferencesKey(paymentProviderId)
+            val value = preferences[key]
+            preferences[key] = if (value == null) 1 else value + 1
+        }
+    }
+
+    fun getLiveCountForPaymentProviderId(paymentProviderId: String): Flow<Int?> = context.dataStore.data.map { preferences -> preferences[intPreferencesKey(paymentProviderId)] }.distinctUntilChanged()
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/openWith/OpenWithViewModel.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/openWith/OpenWithViewModel.kt
new file mode 100644
index 0000000000..9d5ff0d20d
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/openWith/OpenWithViewModel.kt
@@ -0,0 +1,16 @@
+package net.gini.android.merchant.sdk.review.openWith
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderApp
+import net.gini.android.merchant.sdk.util.BackListener
+
+internal class OpenWithViewModel private constructor(val paymentProviderApp: PaymentProviderApp?, val backListener: BackListener?): ViewModel() {
+    class Factory(private val paymentProviderApp: PaymentProviderApp?, private val backListener: BackListener?) : ViewModelProvider.Factory {
+        @Suppress("UNCHECKED_CAST")
+        override fun <T : ViewModel> create(modelClass: Class<T>): T {
+            return OpenWithViewModel(paymentProviderApp, backListener) as T
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/reviewBottomSheet/ReviewBottomSheet.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/reviewBottomSheet/ReviewBottomSheet.kt
new file mode 100644
index 0000000000..a35c610483
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/reviewBottomSheet/ReviewBottomSheet.kt
@@ -0,0 +1,74 @@
+package net.gini.android.merchant.sdk.review.reviewBottomSheet
+
+import android.app.Dialog
+import android.content.DialogInterface
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.ViewModelProvider
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import net.gini.android.merchant.sdk.GiniMerchant
+import net.gini.android.merchant.sdk.databinding.GmsBottomSheetReviewBinding
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.merchant.sdk.review.ReviewConfiguration
+import net.gini.android.merchant.sdk.review.reviewComponent.ReviewViewListener
+import net.gini.android.merchant.sdk.util.BackListener
+import net.gini.android.merchant.sdk.util.GiniPaymentManager
+import net.gini.android.merchant.sdk.util.GmsBottomSheetDialogFragment
+import net.gini.android.merchant.sdk.util.autoCleared
+import net.gini.android.merchant.sdk.util.extensions.setBackListener
+
+internal class ReviewBottomSheet private constructor(
+    internal val paymentButtonListener: ReviewViewListener?,
+    private val viewModelFactory: ViewModelProvider.Factory?
+) : GmsBottomSheetDialogFragment() {
+
+    constructor(): this(null, null)
+
+    private val viewModel: ReviewBottomSheetViewModel by viewModels { viewModelFactory ?: object : ViewModelProvider.Factory {} }
+    private var binding: GmsBottomSheetReviewBinding by autoCleared()
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val dialog = super.onCreateDialog(savedInstanceState)
+        viewModel.backListener?.let {
+            (dialog as BottomSheetDialog).setBackListener(it)
+        }
+        return dialog
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        binding = GmsBottomSheetReviewBinding.inflate(inflater, container, false)
+        binding.gmsReviewLayout.reviewComponent = viewModel.reviewComponent
+        binding.gmsReviewLayout.listener = paymentButtonListener
+        return binding.root
+    }
+
+    override fun onCancel(dialog: DialogInterface) {
+        viewModel.backListener?.backCalled()
+        super.onCancel(dialog)
+    }
+
+    internal companion object {
+        fun newInstance(
+            giniMerchant: GiniMerchant,
+            configuration: ReviewConfiguration = ReviewConfiguration(),
+            listener: ReviewViewListener,
+            paymentComponent: PaymentComponent,
+            backListener: BackListener,
+            giniPaymentManager: GiniPaymentManager = GiniPaymentManager(giniMerchant),
+            viewModelFactory: ViewModelProvider.Factory = ReviewBottomSheetViewModel.Factory(
+                paymentComponent = paymentComponent,
+                reviewConfiguration = configuration,
+                giniMerchant = giniMerchant,
+                giniPaymentManager = giniPaymentManager,
+                backListener = backListener
+            ),
+        ): ReviewBottomSheet = ReviewBottomSheet(listener, viewModelFactory)
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/reviewBottomSheet/ReviewBottomSheetViewModel.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/reviewBottomSheet/ReviewBottomSheetViewModel.kt
new file mode 100644
index 0000000000..ca5db4dff4
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/reviewBottomSheet/ReviewBottomSheetViewModel.kt
@@ -0,0 +1,33 @@
+package net.gini.android.merchant.sdk.review.reviewBottomSheet
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewModelScope
+import net.gini.android.merchant.sdk.GiniMerchant
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.merchant.sdk.review.ReviewConfiguration
+import net.gini.android.merchant.sdk.review.reviewComponent.ReviewComponent
+import net.gini.android.merchant.sdk.util.BackListener
+import net.gini.android.merchant.sdk.util.GiniPaymentManager
+
+
+internal class ReviewBottomSheetViewModel private constructor(private val paymentComponent: PaymentComponent, private val reviewConfiguration: ReviewConfiguration, private val giniMerchant: GiniMerchant, private val giniPaymentManager: GiniPaymentManager, val backListener: BackListener?): ViewModel() {
+    val reviewComponent: ReviewComponent
+
+    init {
+        reviewComponent = ReviewComponent(
+            paymentComponent = paymentComponent,
+            reviewConfig= reviewConfiguration,
+            giniMerchant = giniMerchant,
+            giniPaymentManager = giniPaymentManager,
+            coroutineScope = viewModelScope
+        )
+    }
+
+    class Factory(private val paymentComponent: PaymentComponent, private val reviewConfiguration: ReviewConfiguration, private val giniMerchant: GiniMerchant, private val giniPaymentManager: GiniPaymentManager, private val backListener: BackListener?) : ViewModelProvider.Factory {
+        @Suppress("UNCHECKED_CAST")
+        override fun <T : ViewModel> create(modelClass: Class<T>): T {
+            return ReviewBottomSheetViewModel(paymentComponent, reviewConfiguration, giniMerchant, giniPaymentManager, backListener) as T
+        }
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/reviewComponent/ReviewComponent.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/reviewComponent/ReviewComponent.kt
new file mode 100644
index 0000000000..e2e243b923
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/reviewComponent/ReviewComponent.kt
@@ -0,0 +1,133 @@
+package net.gini.android.merchant.sdk.review.reviewComponent
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.launch
+import net.gini.android.merchant.sdk.GiniMerchant
+import net.gini.android.merchant.sdk.api.ResultWrapper
+import net.gini.android.merchant.sdk.api.payment.model.PaymentDetails
+import net.gini.android.merchant.sdk.api.payment.model.overwriteEmptyFields
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.merchant.sdk.paymentcomponent.SelectedPaymentProviderAppState
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderApp
+import net.gini.android.merchant.sdk.review.ReviewConfiguration
+import net.gini.android.merchant.sdk.review.ValidationMessage
+import net.gini.android.merchant.sdk.review.validate
+import net.gini.android.merchant.sdk.review.validateIban
+import net.gini.android.merchant.sdk.util.GiniPaymentManager
+import net.gini.android.merchant.sdk.util.adjustToLocalDecimalSeparation
+import net.gini.android.merchant.sdk.util.withPrev
+import org.slf4j.LoggerFactory
+
+
+internal class ReviewComponent(
+    val paymentComponent: PaymentComponent,
+    val reviewConfig: ReviewConfiguration,
+    val giniMerchant: GiniMerchant,
+    private val giniPaymentManager: GiniPaymentManager,
+    coroutineScope: CoroutineScope
+) {
+    private val _paymentDetails = MutableStateFlow(PaymentDetails("", "", "", ""))
+    val paymentDetails: StateFlow<PaymentDetails> = _paymentDetails
+
+    val paymentValidation: StateFlow<List<ValidationMessage>> = giniPaymentManager.paymentValidation
+    private val lastFullyValidatedPaymentDetails = giniPaymentManager.lastFullyValidatedPaymentDetails
+
+    private val _paymentProviderApp = MutableStateFlow<PaymentProviderApp?>(null)
+    val paymentProviderApp: StateFlow<PaymentProviderApp?> = _paymentProviderApp
+
+    private val _loadingFlow = MutableStateFlow(true)
+    val loadingFlow: StateFlow<Boolean> = _loadingFlow
+
+    val isPaymentButtonEnabled: Flow<Boolean> =
+        combine(giniMerchant.paymentFlow, paymentDetails) { paymentState, paymentDetails ->
+            val noEmptyFields = paymentDetails.recipient.isNotEmpty() && paymentDetails.iban.isNotEmpty() &&
+                    paymentDetails.amount.isNotEmpty() && paymentDetails.purpose.isNotEmpty()
+            val isLoading = (paymentState is ResultWrapper.Loading)
+            !isLoading && noEmptyFields
+        }
+    init {
+        coroutineScope.launch {
+            _paymentDetails
+                .combine(giniMerchant.paymentFlow.filter { it !is ResultWrapper.Loading }) { paymentDetails, _ -> paymentDetails }
+                .withPrev()
+                .collect { (prevPaymentDetails, paymentDetails) ->
+                    // Get all validation messages except emptiness validations
+                    val nonEmptyValidationMessages = paymentValidation.value
+                        .filter { it !is ValidationMessage.Empty }
+                        .toMutableList()
+
+                    // Check payment details for emptiness
+                    val newEmptyValidationMessages =
+                        paymentDetails.validate().filterIsInstance<ValidationMessage.Empty>()
+
+                    // Clear IBAN error, if IBAN changed
+                    if (prevPaymentDetails != null && prevPaymentDetails.iban != paymentDetails.iban) {
+                        nonEmptyValidationMessages.remove(ValidationMessage.InvalidIban)
+                    }
+
+                    // If the IBAN is the same as the last validated one, then revalidate it to restore the validation
+                    // message if needed
+                    if (lastFullyValidatedPaymentDetails.value?.iban == paymentDetails.iban) {
+                        nonEmptyValidationMessages.addAll(validateIban(paymentDetails.iban).filterIsInstance<ValidationMessage.InvalidIban>())
+                    }
+
+                    // Emit all new empty validation messages along with other existing validation messages
+                    giniPaymentManager.emitPaymentValidation(newEmptyValidationMessages + nonEmptyValidationMessages)
+                }
+        }
+
+        coroutineScope.launch {
+            giniMerchant.paymentFlow.collect { extractedPaymentDetails ->
+                _loadingFlow.tryEmit(extractedPaymentDetails is ResultWrapper.Loading)
+                if (extractedPaymentDetails is ResultWrapper.Success) {
+                    val paymentDetails = paymentDetails.value.overwriteEmptyFields(
+                        extractedPaymentDetails.value.copy(
+                            amount = extractedPaymentDetails.value.amount.adjustToLocalDecimalSeparation()
+                        )
+                    )
+                    _paymentDetails.value = paymentDetails
+                }
+            }
+        }
+
+        coroutineScope.launch {
+            paymentComponent.selectedPaymentProviderAppFlow.collect { selectedPaymentProviderAppState ->
+                when (selectedPaymentProviderAppState) {
+                    is SelectedPaymentProviderAppState.AppSelected -> {
+                        _paymentProviderApp.value = selectedPaymentProviderAppState.paymentProviderApp
+                    }
+
+                    SelectedPaymentProviderAppState.NothingSelected -> {
+                        LOG.error("No selected payment provider app")
+                    }
+                }
+            }
+        }
+    }
+
+    fun setRecipient(recipient: String) {
+        _paymentDetails.value = paymentDetails.value.copy(recipient = recipient)
+    }
+
+    fun setIban(iban: String) {
+        _paymentDetails.value = paymentDetails.value.copy(iban = iban)
+    }
+
+    fun setAmount(amount: String) {
+        _paymentDetails.value = paymentDetails.value.copy(amount = amount)
+    }
+
+    fun setPurpose(purpose: String) {
+        _paymentDetails.value = paymentDetails.value.copy(purpose = purpose)
+    }
+
+    companion object {
+        const val SHOW_OPEN_WITH_TIMES = 3
+        private val LOG = LoggerFactory.getLogger(ReviewComponent::class.java)
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/reviewComponent/ReviewView.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/reviewComponent/ReviewView.kt
new file mode 100644
index 0000000000..1d79abc9f3
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/review/reviewComponent/ReviewView.kt
@@ -0,0 +1,233 @@
+package net.gini.android.merchant.sdk.review.reviewComponent
+
+import android.content.Context
+import android.text.SpannableStringBuilder
+import android.text.Spanned
+import android.text.style.ImageSpan
+import android.util.AttributeSet
+import android.view.View
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory
+import androidx.core.view.isVisible
+import androidx.core.widget.addTextChangedListener
+import com.google.android.material.textfield.TextInputLayout
+import dev.chrisbanes.insetter.applyInsetter
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import net.gini.android.merchant.sdk.R
+import net.gini.android.merchant.sdk.api.payment.model.PaymentDetails
+import net.gini.android.merchant.sdk.databinding.GmsReviewBinding
+import net.gini.android.merchant.sdk.paymentcomponent.SelectedPaymentProviderAppState
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderApp
+import net.gini.android.merchant.sdk.review.PaymentField
+import net.gini.android.merchant.sdk.review.ValidationMessage
+import net.gini.android.merchant.sdk.util.amountWatcher
+import net.gini.android.merchant.sdk.util.clearErrorMessage
+import net.gini.android.merchant.sdk.util.getLayoutInflaterWithGiniMerchantTheme
+import net.gini.android.merchant.sdk.util.hideErrorMessage
+import net.gini.android.merchant.sdk.util.hideKeyboard
+import net.gini.android.merchant.sdk.util.setBackgroundTint
+import net.gini.android.merchant.sdk.util.setErrorMessage
+import net.gini.android.merchant.sdk.util.setTextIfDifferent
+import net.gini.android.merchant.sdk.util.showErrorMessage
+import org.slf4j.LoggerFactory
+
+internal interface ReviewViewListener {
+    fun onPaymentButtonTapped(paymentDetails: PaymentDetails)
+}
+internal class ReviewView(private val context: Context, attrs: AttributeSet?) :
+    ConstraintLayout(context, attrs) {
+
+    private val binding = GmsReviewBinding.inflate(getLayoutInflaterWithGiniMerchantTheme(), this)
+    private val coroutineContext = Dispatchers.Main
+    private var coroutineScope: CoroutineScope? = null
+
+    var listener: ReviewViewListener? = null
+    var reviewComponent: ReviewComponent? = null
+        set(value) {
+            field = value
+            setEditableFields()
+        }
+    var paymentDetails: PaymentDetails? = null
+        set(value) {
+            field = value
+            field?.let {
+                fillPaymentDetails(it)
+            }
+        }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        setDisabledIcons()
+        setButtonHandlers()
+        setInputListeners()
+        coroutineScope = CoroutineScope(coroutineContext)
+        coroutineScope?.launch {
+            launch {
+                reviewComponent?.isPaymentButtonEnabled?.collect { isEnabled ->
+                    binding.payment.isEnabled = isEnabled
+                    binding.payment.alpha = if (isEnabled) 1f else 0.4f
+                    binding.payment.text =
+                        if (!isEnabled) "" else context.getString(R.string.gms_pay_button)
+                }
+            }
+            launch {
+                reviewComponent?.paymentComponent?.selectedPaymentProviderAppFlow?.collect {
+                    if (it is SelectedPaymentProviderAppState.AppSelected) {
+                        setSelectedPaymentProviderApp(it.paymentProviderApp)
+                    } else {
+                        LOG.error("No selected payment provider app")
+                    }
+                }
+            }
+            launch {
+                reviewComponent?.paymentDetails?.collect {
+                    paymentDetails = it
+                }
+            }
+            launch {
+                reviewComponent?.paymentValidation?.collect {
+                    handleValidationResult(it)
+                }
+            }
+            launch {
+                reviewComponent?.loadingFlow?.collect { isLoading ->
+                    binding.paymentProgress.isVisible = isLoading
+                    binding.amountLayout.isEnabled = !isLoading && reviewComponent?.reviewConfig?.isAmountFieldEditable ?: false
+                }
+            }
+        }
+    }
+
+    private fun setButtonHandlers() {
+        binding.gmsPaymentDetails.applyInsetter {
+            type(navigationBars = true, ime = true) {
+                padding(bottom = true)
+            }
+        }
+
+        binding.gmsPaymentDetails.setOnClickListener { it.hideKeyboard() }
+        binding.payment.setOnClickListener {
+            it.hideKeyboard()
+            reviewComponent?.paymentDetails?.value?.let { paymentDetails ->
+                listener?.onPaymentButtonTapped(paymentDetails)
+            }
+        }
+    }
+
+    private fun setSelectedPaymentProviderApp(paymentProviderApp: PaymentProviderApp) {
+        paymentProviderApp.icon?.let { appIcon ->
+            val roundedDrawable =
+                RoundedBitmapDrawableFactory.create(context.resources, appIcon.bitmap).apply {
+                    cornerRadius = resources.getDimension(R.dimen.gms_small_2)
+                }
+
+            binding.payment.setCompoundDrawablesWithIntrinsicBounds(
+                roundedDrawable,
+                null,
+                null,
+                null
+            )
+
+            // Adding negative icon padding in order to center the text on the button.
+            binding.payment.iconPadding = -roundedDrawable.intrinsicWidth
+        }
+        binding.payment.setBackgroundTint(paymentProviderApp.colors.backgroundColor, 255)
+        binding.payment.setTextColor(paymentProviderApp.colors.textColor)
+    }
+
+    private fun fillPaymentDetails(paymentDetails: PaymentDetails) {
+        binding.recipient.setTextIfDifferent(paymentDetails.recipient)
+        binding.iban.setTextIfDifferent(paymentDetails.iban)
+        binding.amount.setTextIfDifferent(paymentDetails.amount)
+        binding.purpose.setTextIfDifferent(paymentDetails.purpose)
+    }
+
+    private fun setInputListeners() {
+        with(binding) {
+            recipient.addTextChangedListener(onTextChanged = { text, _, _, _ -> reviewComponent?.setRecipient(text.toString()) })
+            iban.addTextChangedListener(onTextChanged = { text, _, _, _ -> reviewComponent?.setIban(text.toString()) })
+            amount.addTextChangedListener(onTextChanged = { text, _, _, _ -> reviewComponent?.setAmount(text.toString()) })
+            amount.addTextChangedListener(amountWatcher)
+            purpose.addTextChangedListener(onTextChanged = { text, _, _, _ -> reviewComponent?.setPurpose(text.toString()) })
+            recipient.setOnFocusChangeListener { _, hasFocus -> handleInputFocusChange(hasFocus, recipientLayout) }
+            iban.setOnFocusChangeListener { _, hasFocus -> handleInputFocusChange(hasFocus, ibanLayout) }
+            amount.setOnFocusChangeListener { _, hasFocus -> handleInputFocusChange(hasFocus, amountLayout) }
+            purpose.setOnFocusChangeListener { _, hasFocus -> handleInputFocusChange(hasFocus, purposeLayout) }
+        }
+    }
+
+    private fun handleValidationResult(messages: List<ValidationMessage>) {
+        val (fieldsWithError, fieldsWithoutError) = PaymentField.values()
+            .map { field -> field to messages.firstOrNull { it.field == field } }
+            .partition { (_, message) -> message != null }
+        fieldsWithError.forEach { (field, validationMessage) ->
+            validationMessage?.let { message ->
+                getTextInputLayout(field).apply {
+                    if (error.isNullOrEmpty() || getTag(R.id.text_input_layout_tag_is_error_enabled) == null) {
+                        setErrorMessage(
+                            when (message) {
+                                is ValidationMessage.Empty -> when (field) {
+                                    PaymentField.Recipient -> R.string.gms_error_input_recipient_empty
+                                    PaymentField.Iban -> R.string.gms_error_input_iban_empty
+                                    PaymentField.Amount -> R.string.gms_error_input_amount_empty
+                                    PaymentField.Purpose -> R.string.gms_error_input_purpose_empty
+                                }
+
+                                ValidationMessage.InvalidIban -> R.string.gms_error_input_invalid_iban
+                                ValidationMessage.AmountFormat -> R.string.gms_error_input_amount_format
+                            }
+                        )
+                        if (editText?.isFocused == true) {
+                            hideErrorMessage()
+                        }
+                    }
+                }
+            }
+        }
+
+        fieldsWithoutError.forEach { (field, _) ->
+            getTextInputLayout(field).apply {
+                clearErrorMessage()
+            }
+        }
+    }
+
+    private fun getTextInputLayout(field: PaymentField) = when (field) {
+        PaymentField.Recipient -> binding.recipientLayout
+        PaymentField.Iban -> binding.ibanLayout
+        PaymentField.Amount -> binding.amountLayout
+        PaymentField.Purpose -> binding.purposeLayout
+    }
+
+    private fun setEditableFields() {
+        binding.iban.focusable = View.NOT_FOCUSABLE
+        binding.recipient.focusable = View.NOT_FOCUSABLE
+        binding.purpose.focusable = View.NOT_FOCUSABLE
+        binding.amount.focusable = if (reviewComponent?.reviewConfig?.isAmountFieldEditable == true) View.FOCUSABLE else View.NOT_FOCUSABLE
+    }
+
+    private fun setDisabledIcon(text: String, textView:TextInputLayout) {
+        // Padding the end of the text is needed to add space between the text and the image, and because setting the imageSpan replaces the character in the string, it does not add to the beginning or the end of it.
+        val spannableString = SpannableStringBuilder(text.padEnd(text.length + 3, ' '))
+        val imageSpan = ImageSpan(context, R.drawable.gms_lock)
+        spannableString.setSpan(imageSpan, spannableString.length - 1, spannableString.length, Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+        textView.hint = spannableString;
+    }
+
+    private fun setDisabledIcons() {
+        setDisabledIcon(context.getString(R.string.gms_iban_hint), binding.ibanLayout)
+        setDisabledIcon(context.getString(R.string.gms_recipient_hint), binding.recipientLayout)
+        setDisabledIcon(context.getString(R.string.gms_purpose_hint), binding.purposeLayout)
+    }
+
+    private fun handleInputFocusChange(hasFocus: Boolean, textInputLayout: TextInputLayout) {
+        if (hasFocus) textInputLayout.hideErrorMessage() else textInputLayout.showErrorMessage()
+    }
+
+    companion object {
+        private val LOG = LoggerFactory.getLogger(ReviewView::class.java)
+    }
+
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/AutoClearedValue.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/AutoClearedValue.kt
new file mode 100644
index 0000000000..a7c0166a5e
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/AutoClearedValue.kt
@@ -0,0 +1,45 @@
+package net.gini.android.merchant.sdk.util
+
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+/**
+ * A lazy property that gets cleaned up when the fragment's view is destroyed.
+ *
+ * Accessing this variable while the fragment's view is destroyed will throw NPE.
+ */
+internal class AutoClearedValue<T : Any>(val fragment: Fragment) : ReadWriteProperty<Fragment, T> {
+    private var _value: T? = null
+
+    init {
+        fragment.lifecycle.addObserver(object: DefaultLifecycleObserver {
+            override fun onCreate(owner: LifecycleOwner) {
+                fragment.viewLifecycleOwnerLiveData.observe(fragment) { viewLifecycleOwner ->
+                    viewLifecycleOwner?.lifecycle?.addObserver(object: DefaultLifecycleObserver {
+                        override fun onDestroy(owner: LifecycleOwner) {
+                            _value = null
+                        }
+                    })
+                }
+            }
+        })
+    }
+
+    override fun getValue(thisRef: Fragment, property: KProperty<*>): T {
+        return _value ?: throw IllegalStateException(
+            "should never call auto-cleared-value get when it might not be available"
+        )
+    }
+
+    override fun setValue(thisRef: Fragment, property: KProperty<*>, value: T) {
+        _value = value
+    }
+}
+
+/**
+ * Creates an [AutoClearedValue] associated with this fragment.
+ */
+internal fun <T : Any> Fragment.autoCleared() = AutoClearedValue<T>(this)
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/BackListener.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/BackListener.kt
new file mode 100644
index 0000000000..b777ac9608
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/BackListener.kt
@@ -0,0 +1,8 @@
+package net.gini.android.merchant.sdk.util
+
+/**
+ * Listener for back events.
+ */
+internal interface BackListener {
+    fun backCalled()
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/DisplayedScreen.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/DisplayedScreen.kt
new file mode 100644
index 0000000000..941c8e8a8d
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/DisplayedScreen.kt
@@ -0,0 +1,47 @@
+package net.gini.android.merchant.sdk.util
+
+/**
+ * Represents the currently visible screen presented in [PaymentFragment]
+ */
+sealed class DisplayedScreen {
+    /**
+     * Default state - nothing visible
+     */
+    object Nothing : DisplayedScreen()
+
+    /**
+     * Entrypoint to the payment flow - shows which bank is selected
+     * (or prompts the user to choose a payment provider if there is no previous selection) for making the payment.
+     */
+    object PaymentComponentBottomSheet : DisplayedScreen()
+
+    /**
+     * Bottom sheet for selecting a bank to pay with.
+     */
+    object BankSelectionBottomSheet : DisplayedScreen()
+
+    /**
+     * More information screen.
+     */
+    object MoreInformationFragment : DisplayedScreen()
+
+    /**
+     * Prompt for the user to install the selected banking app.
+     */
+    object InstallAppBottomSheet: DisplayedScreen()
+
+    /**
+     * Prompt for the user to select another application to share the payment request through.
+     */
+    object OpenWithBottomSheet: DisplayedScreen()
+
+    /**
+     * OS native share sheet.
+     */
+    object ShareSheet: DisplayedScreen()
+
+    /**
+     * Payment details review screen.
+     */
+    object ReviewBottomSheet: DisplayedScreen()
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/Extensions.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/Extensions.kt
new file mode 100644
index 0000000000..4aa070245a
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/Extensions.kt
@@ -0,0 +1,191 @@
+package net.gini.android.merchant.sdk.util
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.LayoutInflater
+import android.view.View
+import android.view.inputmethod.InputMethodManager
+import android.widget.Button
+import androidx.annotation.ColorInt
+import androidx.annotation.IntRange
+import androidx.annotation.StringRes
+import androidx.appcompat.view.ContextThemeWrapper
+import androidx.core.content.ContextCompat.getSystemService
+import androidx.core.graphics.ColorUtils
+import androidx.fragment.app.Fragment
+import com.google.android.material.textfield.TextInputEditText
+import com.google.android.material.textfield.TextInputLayout
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+import net.gini.android.merchant.sdk.R
+import java.math.BigDecimal
+import java.text.DecimalFormat
+import java.text.DecimalFormatSymbols
+import java.text.NumberFormat
+
+internal fun TextInputEditText.setTextIfDifferent(text: String) {
+    if (this.text.toString() != text) {
+        this.setText(text)
+    }
+}
+
+internal fun String.isNumber(): Boolean {
+    val separator = DecimalFormatSymbols.getInstance().decimalSeparator
+    return try {
+        this.filter { it.isDigit() || it == separator }
+            .map { if (it == separator) "." else it.toString() }
+            .joinToString(separator = "") { it }
+            .toDouble()
+        true
+    } catch (_: Throwable) {
+        false
+    }
+}
+
+internal fun String.toBackendFormat(): String {
+    val separator = DecimalFormatSymbols.getInstance().decimalSeparator
+    return this.filter { it.isDigit() || it == separator }
+        .map { if (it == separator) "." else it.toString() }
+        .joinToString(separator = "") { it }
+        .toDouble()
+        .toString()
+}
+
+internal val amountWatcher = object : TextWatcher {
+
+    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+    }
+
+    override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+
+    }
+
+    override fun afterTextChanged(s: Editable?) {
+        s?.let { input ->
+            // Take only the first 7 digits (without leading zeros)
+            val onlyDigits = input.toString().trim()
+                .filter { it != '.' && it != ',' }
+                .take(7)
+                .trimStart('0')
+
+             val newString = try {
+                 // Parse to a decimal with two decimal places
+                 val decimal = BigDecimal(onlyDigits).divide(BigDecimal(100))
+                 // Format to a currency string
+                 currencyFormatterWithoutSymbol().format(decimal).trim()
+             } catch (e: NumberFormatException) {
+                 ""
+             }
+
+            if (newString != input.toString()) {
+                input.replace(0, input.length, newString)
+            }
+        }
+    }
+
+}
+
+internal fun String.adjustToLocalDecimalSeparation(): String {
+    return this.replace('.', DecimalFormatSymbols.getInstance().decimalSeparator)
+}
+
+internal fun currencyFormatterWithoutSymbol(): NumberFormat =
+    NumberFormat.getCurrencyInstance().apply {
+        (this as? DecimalFormat)?.apply {
+            decimalFormatSymbols = decimalFormatSymbols.apply {
+                currencySymbol = ""
+            }
+        }
+    }
+
+internal fun Button.setBackgroundTint(@ColorInt color: Int, @IntRange(from = 0x0, to = 0xFF) nonEnabledAlpha: Int = 100) {
+    backgroundTintList = ColorStateList(
+        arrayOf(
+            intArrayOf(android.R.attr.state_enabled),
+            intArrayOf()
+        ),
+        intArrayOf(
+            color,
+            ColorUtils.setAlphaComponent(color, nonEnabledAlpha)
+        )
+    )
+}
+
+internal fun Button.setTextColorTint(@ColorInt color: Int, @IntRange(from = 0x0, to = 0xFF) nonEnabledAlpha: Int = 200) {
+    setTextColor(ColorStateList(
+        arrayOf(
+            intArrayOf(android.R.attr.state_enabled),
+            intArrayOf()
+        ),
+        intArrayOf(
+            color,
+            ColorUtils.setAlphaComponent(color, nonEnabledAlpha)
+        )
+    ))
+}
+
+internal fun TextInputLayout.setErrorMessage(@StringRes errorStringId: Int) {
+    isErrorEnabled = true
+    setTag(R.id.text_input_layout_tag_is_error_enabled, true)
+    error = resources.getString(errorStringId).nonEmpty()
+    setTag(R.id.text_input_layout_tag_error_string_id, errorStringId)
+    setBackground()
+}
+
+internal fun TextInputLayout.clearErrorMessage() {
+    isErrorEnabled = false
+    setTag(R.id.text_input_layout_tag_is_error_enabled, false)
+    error = ""
+    setTag(R.id.text_input_layout_tag_error_string_id, null)
+    setBackground()
+}
+
+internal fun TextInputLayout.hideErrorMessage() {
+    isErrorEnabled = false
+    error = ""
+    setBackground()
+}
+
+internal fun TextInputLayout.showErrorMessage() {
+    isErrorEnabled = getTag(R.id.text_input_layout_tag_is_error_enabled) as? Boolean ?: false
+    error =
+        (getTag(R.id.text_input_layout_tag_error_string_id) as? Int)?.let { resources.getString(it).nonEmpty() } ?: ""
+    setBackground()
+}
+
+internal fun TextInputLayout.setBackground() {
+    if (isErrorEnabled) editText?.setBackgroundResource(R.drawable.gms_payment_input_edit_text_error_background) else editText?.setBackgroundResource(R.drawable.gms_payment_input_edit_text_background)
+}
+
+private fun String.nonEmpty() = if (isEmpty()) " " else this
+
+internal fun View.hideKeyboard() {
+    getSystemService(context, InputMethodManager::class.java)?.let { imm ->
+        if (imm.isAcceptingText) {
+            imm.hideSoftInputFromWindow(windowToken, 0)
+        }
+    }
+}
+
+internal suspend fun <T> Flow<T>.withPrev() = flow {
+    var prev: T? = null
+    collect {
+        emit(prev to it)
+        prev = it
+    }
+}
+
+internal fun View.getLayoutInflaterWithGiniMerchantTheme(): LayoutInflater =
+    LayoutInflater.from(context.wrappedWithGiniMerchantTheme())
+
+internal fun Context.wrappedWithGiniMerchantTheme(): Context = ContextThemeWrapper(this, R.style.GiniMerchantTheme)
+
+internal fun Fragment.getLayoutInflaterWithGiniMerchantTheme(inflater: LayoutInflater): LayoutInflater {
+    return inflater.cloneInContext(requireContext().wrappedWithGiniMerchantTheme())
+}
+
+fun View.setIntervalClickListener(click: View.OnClickListener?) {
+    setOnClickListener(IntervalClickListener(click))
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/FlowBottomSheetsManager.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/FlowBottomSheetsManager.kt
new file mode 100644
index 0000000000..92423ae825
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/FlowBottomSheetsManager.kt
@@ -0,0 +1,106 @@
+package net.gini.android.merchant.sdk.util
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import net.gini.android.core.api.Resource
+import net.gini.android.merchant.sdk.GiniMerchant
+import net.gini.android.merchant.sdk.api.payment.model.PaymentRequest
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderApp
+import net.gini.android.merchant.sdk.review.openWith.OpenWithPreferences
+import net.gini.android.merchant.sdk.review.reviewComponent.ReviewComponent.Companion.SHOW_OPEN_WITH_TIMES
+import net.gini.android.merchant.sdk.util.extensions.createTempPdfFile
+import java.io.File
+
+
+internal interface FlowBottomSheetsManager {
+    var openWithPreferences: OpenWithPreferences?
+    var openWithCounter: Int
+    val paymentNextStepFlow: MutableSharedFlow<PaymentNextStep>
+    val paymentRequestFlow: MutableStateFlow<PaymentRequest?>
+    val shareWithFlowStarted: MutableStateFlow<Boolean>
+
+    fun startObservingOpenWithCount(coroutineScope: CoroutineScope, paymentProviderAppId: String) {
+        coroutineScope.launch {
+            openWithPreferences?.getLiveCountForPaymentProviderId(paymentProviderAppId)
+                ?.collectLatest {
+                    openWithCounter = it ?: 0
+                }
+        }
+    }
+
+    fun incrementOpenWithCounter(coroutineScope: CoroutineScope, paymentProviderAppId: String) {
+        coroutineScope.launch {
+            openWithPreferences?.incrementCountForPaymentProviderId(paymentProviderAppId)
+        }
+    }
+
+    private fun getFileAsByteArray(externalCacheDir: File?, coroutineScope: CoroutineScope) {
+        coroutineScope.launch {
+            withContext(Dispatchers.IO) {
+                val paymentRequest = try {
+                    getPaymentRequest()
+                } catch (throwable: Throwable) {
+                    emitSDKEvent(GiniMerchant.PaymentState.Error(throwable))
+                    return@withContext
+                }
+                if (paymentRequest == null) {
+                    emitSDKEvent(GiniMerchant.PaymentState.Error(Exception("Payment request is null")))
+                    return@withContext
+                }
+                val byteArrayResource = async {
+                    getPaymentRequestDocument(paymentRequest)
+                }.await()
+                when (byteArrayResource) {
+                    is Resource.Cancelled -> {
+                        emitSDKEvent(GiniMerchant.PaymentState.Error(Exception("Cancelled")))
+                    }
+                    is Resource.Error -> {
+                        emitSDKEvent(GiniMerchant.PaymentState.Error(byteArrayResource.exception ?: Exception("Error")))
+                    }
+                    is Resource.Success -> {
+                        val newFile = externalCacheDir?.createTempPdfFile(byteArrayResource.data, "payment-request")
+                        newFile?.let {
+                            paymentRequestFlow.value = paymentRequest
+                            emitPaymentNextStep(PaymentNextStep.OpenSharePdf(file = it))
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    fun checkNextStep(paymentProviderApp: PaymentProviderApp?, externalCacheDir: File?, coroutineScope: CoroutineScope) {
+        if (paymentProviderApp?.paymentProvider?.gpcSupported() == true) {
+            if (paymentProviderApp.isInstalled()) emitPaymentNextStep(PaymentNextStep.RedirectToBank)
+            else emitPaymentNextStep(PaymentNextStep.ShowInstallApp)
+            return
+        }
+        if (openWithCounter < SHOW_OPEN_WITH_TIMES) {
+            emitPaymentNextStep(PaymentNextStep.ShowOpenWithSheet)
+        } else {
+            emitPaymentNextStep(PaymentNextStep.SetLoadingVisibility(true))
+            getFileAsByteArray(externalCacheDir, coroutineScope)
+        }
+    }
+
+    fun sharePdf(paymentProviderApp: PaymentProviderApp?, externalCacheDir: File?, coroutineScope: CoroutineScope) {
+        paymentNextStepFlow.tryEmit(PaymentNextStep.SetLoadingVisibility(true))
+        getFileAsByteArray(externalCacheDir, coroutineScope)
+    }
+
+
+    private fun emitPaymentNextStep(paymentNextStep: PaymentNextStep) {
+        paymentNextStepFlow.tryEmit(paymentNextStep)
+    }
+
+    fun emitSDKEvent(sdkEvent: GiniMerchant.PaymentState)
+    suspend fun getPaymentRequest(): PaymentRequest?
+    suspend fun getPaymentRequestDocument(paymentRequest: PaymentRequest): Resource<ByteArray>
+
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/GiniPaymentManager.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/GiniPaymentManager.kt
new file mode 100644
index 0000000000..79e159563d
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/GiniPaymentManager.kt
@@ -0,0 +1,105 @@
+package net.gini.android.merchant.sdk.util
+
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import net.gini.android.core.api.Resource
+import net.gini.android.health.api.models.PaymentRequestInput
+import net.gini.android.merchant.sdk.GiniMerchant
+import net.gini.android.merchant.sdk.api.payment.model.PaymentDetails
+import net.gini.android.merchant.sdk.api.payment.model.PaymentRequest
+import net.gini.android.merchant.sdk.api.payment.model.toPaymentRequest
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderApp
+import net.gini.android.merchant.sdk.review.ValidationMessage
+import net.gini.android.merchant.sdk.review.validate
+import org.slf4j.LoggerFactory
+
+/**
+ * Handles the validation of payment details, creation of payment request, sending feedback and emitting open bank event.
+ */
+internal class GiniPaymentManager(
+    val giniMerchant: GiniMerchant?
+) {
+    private val _paymentValidation = MutableStateFlow<List<ValidationMessage>>(emptyList())
+    val paymentValidation: StateFlow<List<ValidationMessage>> = _paymentValidation
+
+    private val _lastFullyValidatedPaymentDetails = MutableStateFlow<PaymentDetails?>(null)
+    val lastFullyValidatedPaymentDetails: MutableStateFlow<PaymentDetails?> = _lastFullyValidatedPaymentDetails
+
+    private fun validatePaymentDetails(paymentDetails: PaymentDetails): Boolean {
+        val items = paymentDetails.validate()
+        _paymentValidation.tryEmit(items)
+        _lastFullyValidatedPaymentDetails.tryEmit(paymentDetails)
+        return items.isEmpty()
+    }
+
+    suspend fun onPayment(paymentProviderApp: PaymentProviderApp?, paymentDetails: PaymentDetails) {
+        if (giniMerchant == null) {
+            LOG.error("GiniMerchant instance must be set")
+            throw Exception("Cannot initiate payment: No GiniMerchant instance set")
+        }
+        if (paymentProviderApp == null) {
+            LOG.error("No selected payment provider app")
+            giniMerchant.emitSDKEvent(GiniMerchant.PaymentState.Error(Exception("No selected payment provider app")))
+            return
+        }
+
+        if (paymentProviderApp.installedPaymentProviderApp == null) {
+            LOG.error("Payment provider app not installed")
+            giniMerchant.emitSDKEvent(GiniMerchant.PaymentState.Error(Exception("Payment provider app not installed")))
+            return
+        }
+
+        val valid = validatePaymentDetails(paymentDetails)
+        if (valid) {
+            giniMerchant.emitSDKEvent(GiniMerchant.PaymentState.Loading)
+            giniMerchant.emitSDKEvent(
+                try {
+                    GiniMerchant.PaymentState.Success(getPaymentRequest(paymentProviderApp, paymentDetails), paymentProviderApp.name)
+                } catch (throwable: Throwable) {
+                    GiniMerchant.PaymentState.Error(throwable)
+                }
+            )
+        }
+    }
+
+    suspend fun getPaymentRequest(paymentProviderApp: PaymentProviderApp?, paymentDetails: PaymentDetails): PaymentRequest {
+        if (giniMerchant == null) {
+            LOG.error("Cannot create PaymentRequest: No GiniMerchant instance set")
+            throw Exception("Cannot create PaymentRequest: No GiniMerchant instance set")
+        }
+        if (paymentProviderApp == null) {
+            LOG.error("Cannot create PaymentRequest: No selected payment provider app")
+            throw Exception("Cannot create PaymentRequest: No selected payment provider app")
+        }
+
+        var paymentRequestId: String? = null
+
+        return when (val createPaymentRequestResource = giniMerchant.giniHealthAPI.documentManager.createPaymentRequest(
+            PaymentRequestInput(
+                paymentProvider = paymentProviderApp.paymentProvider.id,
+                recipient = paymentDetails.recipient,
+                iban = paymentDetails.iban,
+                amount = "${paymentDetails.amount.toBackendFormat()}:EUR",
+                bic = null,
+                purpose = paymentDetails.purpose,
+            )
+        ).mapSuccess {
+            paymentRequestId = it.data
+            giniMerchant.giniHealthAPI.documentManager.getPaymentRequest(it.data)
+        }) {
+            is Resource.Cancelled -> throw Exception("Cancelled")
+            is Resource.Error -> throw Exception(createPaymentRequestResource.exception)
+            is Resource.Success -> paymentRequestId?.let {
+                createPaymentRequestResource.data.toPaymentRequest(it)
+            } ?: throw Exception("Payment request ID is null")
+        }
+    }
+
+    fun emitPaymentValidation(paymentValidationList: List<ValidationMessage>) {
+        _paymentValidation.tryEmit(paymentValidationList)
+    }
+
+    companion object {
+        private val LOG = LoggerFactory.getLogger(GiniPaymentManager::class.java)
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/GmsBottomSheetDialogFragment.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/GmsBottomSheetDialogFragment.kt
new file mode 100644
index 0000000000..f0e4222409
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/GmsBottomSheetDialogFragment.kt
@@ -0,0 +1,34 @@
+package net.gini.android.merchant.sdk.util
+
+import android.app.Dialog
+import android.graphics.drawable.ColorDrawable
+import android.os.Bundle
+import android.view.LayoutInflater
+import androidx.core.content.ContextCompat
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import net.gini.android.merchant.sdk.R
+
+
+internal open class GmsBottomSheetDialogFragment: BottomSheetDialogFragment() {
+    override fun onGetLayoutInflater(savedInstanceState: Bundle?): LayoutInflater {
+        val inflater = super.onGetLayoutInflater(savedInstanceState)
+        return this.getLayoutInflaterWithGiniMerchantTheme(inflater)
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val wrappedContext = requireContext().wrappedWithGiniMerchantTheme()
+        val dialog = BottomSheetDialog(wrappedContext, theme)
+
+        val colorDrawable = ColorDrawable(ContextCompat.getColor(wrappedContext, R.color.gms_bottom_sheet_scrim))
+        colorDrawable.alpha = 102 // 40% alpha
+        dialog.window?.setBackgroundDrawable(colorDrawable)
+
+        dialog.behavior.isFitToContents = true
+        dialog.behavior.skipCollapsed = true
+        dialog.behavior.state = BottomSheetBehavior.STATE_EXPANDED
+
+        return dialog
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/IbanValidator.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/IbanValidator.kt
new file mode 100644
index 0000000000..e6fcb708f7
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/IbanValidator.kt
@@ -0,0 +1,35 @@
+package net.gini.android.merchant.sdk.util
+
+import java.util.*
+
+private val countryIbanLength = mapOf(
+    "AL" to 28, "AD" to 24, "AT" to 20, "AZ" to 28, "BH" to 22, "BE" to 16,
+    "BA" to 20, "BR" to 29, "BG" to 22, "CR" to 21, "HR" to 21, "CY" to 28,
+    "CZ" to 24, "DK" to 18, "DO" to 28, "EE" to 20, "FO" to 18, "FI" to 18,
+    "FR" to 27, "GE" to 22, "DE" to 22, "GI" to 23, "GB" to 22, "GR" to 27,
+    "GL" to 18, "GT" to 28, "HU" to 28, "IS" to 26, "IE" to 22, "IL" to 23,
+    "IT" to 27, "KZ" to 20, "KW" to 30, "LV" to 21, "LB" to 28, "LT" to 20,
+    "LU" to 20, "MK" to 19, "MT" to 31, "MR" to 27, "MU" to 30, "MD" to 24,
+    "MC" to 27, "ME" to 22, "NL" to 18, "NO" to 15, "PK" to 24, "PS" to 29,
+    "PL" to 28, "PT" to 25, "RO" to 24, "SM" to 27, "SA" to 24, "RS" to 22,
+    "SK" to 24, "SI" to 19, "ES" to 24, "SE" to 24, "TN" to 24, "TR" to 26,
+    "AE" to 23, "VG" to 24, "CH" to 21
+)
+
+private const val alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+
+internal fun isValidIban(iban: String): Boolean {
+    var ibanNumber = iban.filter { !it.isWhitespace() }.uppercase(Locale.US)
+
+    if (countryIbanLength[ibanNumber.take(2)] != ibanNumber.length) return false
+
+    if (ibanNumber.contains("[^0-9A-Z]+".toRegex())) return false
+
+    ibanNumber = ibanNumber.substring(startIndex = 4) + ibanNumber.substring(0, 4)
+    val number = ibanNumber.map { it.toString() }.joinToString(separator = "") { char ->
+        if (char in alphabet) (alphabet.indexOf(char) + 10).toString() else char
+    }.toBigInteger()
+
+    if (number.mod(97.toBigInteger()) != 1.toBigInteger()) return false
+    return true
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/IntervalClickListener.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/IntervalClickListener.kt
new file mode 100644
index 0000000000..dd30a786a6
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/IntervalClickListener.kt
@@ -0,0 +1,30 @@
+package net.gini.android.merchant.sdk.util
+
+import android.view.View
+
+
+/**
+ * Internal use only.
+ *
+ * Creates a enough delay between clicks to prevent double taps
+ *
+ * @param click
+ * @suppress
+ */
+internal class IntervalClickListener(
+    private val click: View.OnClickListener?
+) : View.OnClickListener, IntervalClickListenerHelper() {
+
+    override var enabled: Runnable =
+        Runnable { isEnabled = true }
+
+    override fun onClick(view: View?) {
+        if (view == null) return;
+
+        if (isEnabled) {
+            isEnabled = false
+            view.postDelayed(enabled, interval)
+            click?.onClick(view)
+        }
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/IntervalClickListenerHelper.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/IntervalClickListenerHelper.kt
new file mode 100644
index 0000000000..44f49d2296
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/IntervalClickListenerHelper.kt
@@ -0,0 +1,14 @@
+package net.gini.android.merchant.sdk.util
+
+/**
+ * Internal use only.
+ *
+ * @suppress
+ */
+internal abstract class IntervalClickListenerHelper {
+    //Override if needed otherwise, keep the default values
+    open var isEnabled: Boolean = true
+    open var interval: Long = 500L
+    //Override
+    protected abstract var enabled: Runnable
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/MerchantSDKFileProvider.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/MerchantSDKFileProvider.kt
new file mode 100644
index 0000000000..15368d0049
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/MerchantSDKFileProvider.kt
@@ -0,0 +1,10 @@
+package net.gini.android.merchant.sdk.util
+
+import androidx.core.content.FileProvider
+
+/**
+ * Own FileProvider so we avoid manifest merger errors if clients use their own FileProviders.
+ * Not used anywhere except in Manifest declaration
+ */
+internal class MerchantSDKFileProvider: FileProvider() {
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/PaymentNextStep.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/PaymentNextStep.kt
new file mode 100644
index 0000000000..863403551d
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/PaymentNextStep.kt
@@ -0,0 +1,11 @@
+package net.gini.android.merchant.sdk.util
+
+import java.io.File
+
+internal sealed class PaymentNextStep {
+    object RedirectToBank : PaymentNextStep()
+    object ShowOpenWithSheet : PaymentNextStep()
+    object ShowInstallApp : PaymentNextStep()
+    data class OpenSharePdf(val file: File) : PaymentNextStep()
+    data class SetLoadingVisibility(val isVisible: Boolean) : PaymentNextStep()
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/ShareWithBroadcastReceiver.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/ShareWithBroadcastReceiver.kt
new file mode 100644
index 0000000000..d5b778b15c
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/ShareWithBroadcastReceiver.kt
@@ -0,0 +1,13 @@
+package net.gini.android.merchant.sdk.util
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+
+
+internal class ShareWithBroadcastReceiver : BroadcastReceiver() {
+    val SHARE_WITH_INTENT_FILTER = "share_intent_filter"
+    override fun onReceive(context: Context?, intent: Intent?) {
+       context?.sendBroadcast(Intent().also { it.action = SHARE_WITH_INTENT_FILTER })
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/extensions/BottomSheetDialogFragment.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/extensions/BottomSheetDialogFragment.kt
new file mode 100644
index 0000000000..22a65c6aae
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/extensions/BottomSheetDialogFragment.kt
@@ -0,0 +1,15 @@
+package net.gini.android.merchant.sdk.util.extensions
+
+import androidx.activity.OnBackPressedCallback
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import net.gini.android.merchant.sdk.util.BackListener
+
+internal fun BottomSheetDialog.setBackListener(backListener: BackListener) {
+    onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+            dismiss()
+            backListener.backCalled()
+            remove()
+        }
+    })
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/extensions/Context.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/extensions/Context.kt
new file mode 100644
index 0000000000..6f030f87f6
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/extensions/Context.kt
@@ -0,0 +1,44 @@
+package net.gini.android.merchant.sdk.util.extensions
+
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.graphics.drawable.BitmapDrawable
+import android.util.TypedValue
+import androidx.annotation.VisibleForTesting
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderApp
+import net.gini.android.merchant.sdk.util.ShareWithBroadcastReceiver
+
+// In a future refactoring we can split extensions into files according to what component they extend
+@VisibleForTesting
+internal fun Context.generateBitmapDrawableIcon(icon: ByteArray, iconSize: Int): BitmapDrawable? {
+    return BitmapFactory.decodeByteArray(icon, 0, iconSize)
+        ?.let { bitmap ->
+            val iconSizePx = TypedValue.applyDimension(
+                TypedValue.COMPLEX_UNIT_DIP,
+                PaymentProviderApp.ICON_SIZE,
+                this.resources.displayMetrics
+            ).toInt()
+            val scaledBitmap = Bitmap.createScaledBitmap(
+                bitmap,
+                iconSizePx,
+                iconSizePx,
+                true
+            )
+            // Bitmap.createScaledBitmap returns original bitmap when width and height is the same as bitmap.width and bitmap.height. In one case (Pixel 7 Pro) iconSizePx was being resolved to exactly the same value as some of the bitmap's widths
+            // Recycling this bitmap in this case leads to the app crashing when attempting to load the drawable into an ImageView
+            // Only recycle if width is different than bitmap.width (can only check for width, as it's the same dimension for both with and height)
+            if (bitmap.width != iconSizePx) bitmap.recycle()
+            BitmapDrawable(this.resources, scaledBitmap)
+        }
+}
+
+internal fun Context.getFontScale() = resources.configuration.fontScale
+
+internal fun Context.createShareWithPendingIntent() = PendingIntent.getBroadcast(
+    this, 123,
+    Intent(this, ShareWithBroadcastReceiver::class.java),
+    PendingIntent.FLAG_IMMUTABLE
+)
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/extensions/File.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/extensions/File.kt
new file mode 100644
index 0000000000..1442c2d0a7
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/extensions/File.kt
@@ -0,0 +1,15 @@
+package net.gini.android.merchant.sdk.util.extensions
+
+import java.io.File
+import java.io.FileOutputStream
+
+internal fun File.createTempPdfFile(byteArray: ByteArray, fileName: String): File {
+    val file = File("${this.path}/", "${fileName}.pdf")
+
+     FileOutputStream(file, false).use { outputStream ->
+         outputStream.write(byteArray)
+         outputStream.flush()
+     }
+
+    return file
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/extensions/Fragment.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/extensions/Fragment.kt
new file mode 100644
index 0000000000..09b82a10e6
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/extensions/Fragment.kt
@@ -0,0 +1,21 @@
+package net.gini.android.merchant.sdk.util.extensions
+
+import android.app.PendingIntent
+import android.content.Intent
+import androidx.core.content.FileProvider
+import androidx.fragment.app.Fragment
+import java.io.File
+
+internal fun Fragment.startSharePdfIntent(file: File, pendingIntent: PendingIntent? = null) {
+    val uriForFile = FileProvider.getUriForFile(
+        requireContext(),
+        requireContext().packageName + ".merchant.sdk.fileprovider",
+        file
+    )
+    val shareIntent = Intent(Intent.ACTION_SEND).apply {
+        type = "application/pdf"
+        flags = Intent.FLAG_GRANT_READ_URI_PERMISSION
+        putExtra(Intent.EXTRA_STREAM, uriForFile)
+    }
+    startActivity(Intent.createChooser(shareIntent, uriForFile.lastPathSegment, pendingIntent?.intentSender))
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/extensions/SupportFragmentManager.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/extensions/SupportFragmentManager.kt
new file mode 100644
index 0000000000..d7bc37da45
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/util/extensions/SupportFragmentManager.kt
@@ -0,0 +1,37 @@
+package net.gini.android.merchant.sdk.util.extensions
+
+import androidx.annotation.IdRes
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderApp
+import net.gini.android.merchant.sdk.review.installApp.InstallAppBottomSheet
+import net.gini.android.merchant.sdk.review.installApp.InstallAppForwardListener
+import net.gini.android.merchant.sdk.review.openWith.OpenWithBottomSheet
+import net.gini.android.merchant.sdk.review.openWith.OpenWithForwardListener
+import net.gini.android.merchant.sdk.util.BackListener
+
+internal fun FragmentManager.add(@IdRes containerId: Int, fragment: Fragment, addToBackStack: Boolean) {
+    beginTransaction()
+     .add(containerId, fragment, fragment::class.java.name)
+     .apply { if (addToBackStack) addToBackStack(fragment::class.java.name) }
+     .commit()
+}
+
+internal fun FragmentManager.showInstallAppBottomSheet(paymentComponent: PaymentComponent, minHeight: Int? = null, backListener: BackListener? = null, buttonClickListener: () -> Unit) {
+    val dialog = InstallAppBottomSheet.newInstance(paymentComponent, object : InstallAppForwardListener {
+        override fun onForwardToBankSelected() {
+            buttonClickListener()
+        }
+    }, backListener, minHeight)
+    dialog.show(this, InstallAppBottomSheet::class.simpleName)
+}
+
+internal fun FragmentManager.showOpenWithBottomSheet(paymentProviderApp: PaymentProviderApp, backListener: BackListener? = null,buttonClickListener: () -> Unit) {
+    val dialog = OpenWithBottomSheet.newInstance(paymentProviderApp, object: OpenWithForwardListener {
+        override fun onForwardSelected() {
+            buttonClickListener()
+        }
+    }, backListener)
+    dialog.show(this, OpenWithBottomSheet::class.java.name)
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/color-night/gms_outlined_button_background.xml b/merchant-sdk/sdk/src/main/res/color-night/gms_outlined_button_background.xml
new file mode 100644
index 0000000000..486ff6cad9
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/color-night/gms_outlined_button_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="0.4" android:color="@color/gms_light_06" android:state_enabled="false" />
+    <item android:color="@color/gms_light_06" />
+</selector>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/color-night/gms_outlined_button_list_item_background.xml b/merchant-sdk/sdk/src/main/res/color-night/gms_outlined_button_list_item_background.xml
new file mode 100644
index 0000000000..bdaf1c99f6
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/color-night/gms_outlined_button_list_item_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="0.4" android:color="@color/gms_light_07" android:state_enabled="false" />
+    <item android:color="@color/gms_light_07" />
+</selector>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/color-night/gms_outlined_button_text.xml b/merchant-sdk/sdk/src/main/res/color-night/gms_outlined_button_text.xml
new file mode 100644
index 0000000000..3e1764f6a2
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/color-night/gms_outlined_button_text.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="0.4" android:color="@color/gms_light_01" android:state_enabled="false" />
+    <item android:color="@color/gms_light_01" />
+</selector>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/color/gms_outlined_button_background.xml b/merchant-sdk/sdk/src/main/res/color/gms_outlined_button_background.xml
new file mode 100644
index 0000000000..a14eaa960f
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/color/gms_outlined_button_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="0.4" android:color="@color/gms_dark_06" android:state_enabled="false" />
+    <item android:color="@color/gms_dark_06" />
+</selector>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/color/gms_outlined_button_list_item_background.xml b/merchant-sdk/sdk/src/main/res/color/gms_outlined_button_list_item_background.xml
new file mode 100644
index 0000000000..5603fc2fc9
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/color/gms_outlined_button_list_item_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="0.4" android:color="@color/gms_dark_07" android:state_enabled="false" />
+    <item android:color="@color/gms_dark_07" />
+</selector>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/color/gms_outlined_button_text.xml b/merchant-sdk/sdk/src/main/res/color/gms_outlined_button_text.xml
new file mode 100644
index 0000000000..07be03f5c4
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/color/gms_outlined_button_text.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="0.4" android:color="@color/gms_dark_01" android:state_enabled="false" />
+    <item android:color="@color/gms_dark_01" />
+</selector>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/color/gms_unelevated_button_background.xml b/merchant-sdk/sdk/src/main/res/color/gms_unelevated_button_background.xml
new file mode 100644
index 0000000000..5da0c7c306
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/color/gms_unelevated_button_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?attr/colorPrimary" android:state_enabled="false" />
+    <item android:color="?attr/colorPrimary" />
+</selector>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/color/gms_unelevated_button_text.xml b/merchant-sdk/sdk/src/main/res/color/gms_unelevated_button_text.xml
new file mode 100644
index 0000000000..8f5616438c
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/color/gms_unelevated_button_text.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="0.4" android:color="?attr/colorOnPrimary" android:state_enabled="false" />
+    <item android:color="?attr/colorOnPrimary" />
+</selector>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/drawable-en/gms_play_store_logo.xml b/merchant-sdk/sdk/src/main/res/drawable-en/gms_play_store_logo.xml
new file mode 100644
index 0000000000..f7a80bd4a5
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/drawable-en/gms_play_store_logo.xml
@@ -0,0 +1,56 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="122dp"
+    android:height="36.6dp"
+    android:viewportWidth="180"
+    android:viewportHeight="54">
+    <group>
+        <clip-path android:pathData="M0,0h180v53.33h-180z" />
+        <path
+            android:fillColor="#100F0D"
+            android:pathData="M173.33,53.33H6.67C3,53.33 0,50.33 0,46.67V6.67C0,3 3,0 6.67,0H173.33C177,0 180,3 180,6.67V46.67C180,50.33 177,53.33 173.33,53.33Z" />
+        <path
+            android:fillColor="#A2A2A1"
+            android:pathData="M173.33,0H6.67C3,0 0,3 0,6.67V46.67C0,50.33 3,53.33 6.67,53.33H173.33C177,53.33 180,50.33 180,46.67V6.67C180,3 177,0 173.33,0ZM173.33,1.07C176.42,1.07 178.93,3.58 178.93,6.67V46.67C178.93,49.76 176.42,52.27 173.33,52.27H6.67C3.58,52.27 1.07,49.76 1.07,46.67V6.67C1.07,3.58 3.58,1.07 6.67,1.07H173.33Z" />
+        <path
+            android:fillColor="#ffffff"
+            android:pathData="M63.16,13.06H59.28V14.02H62.2C62.12,14.79 61.8,15.42 61.28,15.85C60.74,16.31 60.08,16.52 59.28,16.52C58.41,16.52 57.68,16.23 57.08,15.63C56.49,15.02 56.18,14.25 56.18,13.33C56.18,12.42 56.49,11.67 57.08,11.04C57.68,10.44 58.41,10.15 59.28,10.15C59.74,10.15 60.16,10.23 60.55,10.4C60.95,10.56 61.26,10.79 61.49,11.08L62.24,10.35C61.91,9.98 61.47,9.69 60.95,9.48C60.43,9.25 59.89,9.17 59.28,9.17C58.12,9.17 57.14,9.56 56.35,10.38C55.53,11.17 55.14,12.17 55.14,13.33C55.14,14.5 55.53,15.5 56.35,16.31C57.14,17.1 58.12,17.52 59.28,17.52C60.51,17.52 61.47,17.13 62.22,16.33C62.89,15.67 63.22,14.77 63.22,13.67C63.22,13.48 63.2,13.27 63.16,13.06Z" />
+        <path
+            android:fillColor="#ffffff"
+            android:pathData="M64.71,9.33V17.33H69.37V16.35H65.73V13.81H69V12.85H65.73V10.31H69.37V9.33H64.71Z" />
+        <path
+            android:fillColor="#ffffff"
+            android:pathData="M75.94,10.31V9.33H70.44V10.31H72.67V17.33H73.69V10.31H75.94Z" />
+        <path
+            android:fillColor="#ffffff"
+            android:pathData="M80.95,9.33H79.92V17.33H80.95V9.33Z" />
+        <path
+            android:fillColor="#ffffff"
+            android:pathData="M87.74,10.31V9.33H82.24V10.31H84.47V17.33H85.49V10.31H87.74Z" />
+        <path
+            android:fillColor="#ffffff"
+            android:pathData="M98.15,10.38C97.33,9.56 96.38,9.17 95.21,9.17C94.04,9.17 93.08,9.56 92.29,10.38C91.5,11.17 91.1,12.15 91.1,13.33C91.1,14.52 91.5,15.52 92.29,16.31C93.08,17.1 94.04,17.52 95.21,17.52C96.35,17.52 97.33,17.1 98.15,16.31C98.94,15.52 99.31,14.52 99.31,13.33C99.31,12.17 98.94,11.17 98.15,10.38ZM93.02,11.04C93.6,10.44 94.33,10.15 95.21,10.15C96.08,10.15 96.81,10.44 97.4,11.04C97.98,11.65 98.27,12.42 98.27,13.33C98.27,14.27 97.98,15.04 97.4,15.63C96.81,16.23 96.08,16.52 95.21,16.52C94.33,16.52 93.6,16.23 93.02,15.63C92.44,15.02 92.15,14.27 92.15,13.33C92.15,12.42 92.44,11.65 93.02,11.04Z" />
+        <path
+            android:fillColor="#ffffff"
+            android:pathData="M101.8,12.35L101.75,10.81H101.8L105.86,17.33H106.92V9.33H105.9V14.02L105.94,15.56H105.9L102.03,9.33H100.78V17.33H101.8V12.35Z" />
+        <path
+            android:fillColor="#00000000"
+            android:pathData="M63.16,13.06H59.29V14.02H62.19C62.11,14.8 61.8,15.42 61.27,15.86C60.74,16.31 60.08,16.53 59.29,16.53C58.42,16.53 57.68,16.23 57.07,15.63C56.48,15.01 56.18,14.26 56.18,13.34C56.18,12.42 56.48,11.67 57.07,11.05C57.68,10.45 58.42,10.15 59.29,10.15C59.73,10.15 60.16,10.22 60.55,10.4C60.94,10.56 61.25,10.79 61.49,11.09L62.23,10.36C61.9,9.98 61.47,9.69 60.95,9.48C60.42,9.27 59.88,9.17 59.29,9.17C58.13,9.17 57.14,9.57 56.34,10.37C55.54,11.18 55.14,12.17 55.14,13.34C55.14,14.51 55.54,15.51 56.34,16.31C57.14,17.11 58.13,17.51 59.29,17.51C60.5,17.51 61.47,17.12 62.22,16.33C62.88,15.67 63.21,14.78 63.21,13.66C63.21,13.47 63.19,13.27 63.16,13.06ZM64.7,9.34V17.33H69.36V16.35H65.72V13.82H69.01V12.86H65.72V10.33H69.36V9.34H64.7ZM75.93,10.33V9.34H70.44V10.33H72.67V17.33H73.7V10.33H75.93ZM80.94,9.34H79.92V17.33H80.94V9.34ZM87.73,10.33V9.34H82.24V10.33H84.47V17.33H85.5V10.33H87.73ZM98.13,10.38C97.34,9.57 96.36,9.17 95.21,9.17C94.05,9.17 93.07,9.57 92.28,10.37C91.49,11.16 91.1,12.16 91.1,13.34C91.1,14.52 91.49,15.52 92.28,16.31C93.07,17.11 94.05,17.51 95.21,17.51C96.35,17.51 97.34,17.11 98.13,16.31C98.92,15.52 99.31,14.52 99.31,13.34C99.31,12.17 98.92,11.18 98.13,10.38ZM93.02,11.05C93.61,10.45 94.33,10.15 95.21,10.15C96.08,10.15 96.8,10.45 97.39,11.05C97.97,11.65 98.27,12.41 98.27,13.34C98.27,14.27 97.97,15.04 97.39,15.63C96.8,16.23 96.08,16.53 95.21,16.53C94.33,16.53 93.61,16.23 93.02,15.63C92.44,15.02 92.15,14.27 92.15,13.34C92.15,12.41 92.44,11.66 93.02,11.05ZM101.79,12.35L101.75,10.82H101.79L105.85,17.33H106.93V9.34H105.9V14.02L105.94,15.56H105.9L102.02,9.34H100.77V17.33H101.79V12.35Z"
+            android:strokeWidth="0.266667"
+            android:strokeColor="#ffffff" />
+        <path
+            android:fillColor="#ffffff"
+            android:pathData="M142.58,40H145.07V23.33H142.58V40ZM164.99,29.34L162.14,36.56H162.05L159.09,29.34H156.41L160.85,39.44L158.32,45.06H160.92L167.76,29.34H164.99ZM150.88,38.11C150.07,38.11 148.93,37.7 148.93,36.69C148.93,35.41 150.34,34.91 151.57,34.91C152.66,34.91 153.18,35.15 153.84,35.47C153.65,37.02 152.32,38.11 150.88,38.11ZM151.18,28.97C149.38,28.97 147.52,29.77 146.74,31.53L148.95,32.45C149.42,31.53 150.3,31.22 151.22,31.22C152.51,31.22 153.82,31.99 153.84,33.37V33.54C153.39,33.28 152.42,32.9 151.24,32.9C148.87,32.9 146.44,34.2 146.44,36.65C146.44,38.88 148.4,40.32 150.58,40.32C152.25,40.32 153.18,39.56 153.76,38.69H153.84V39.97H156.24V33.58C156.24,30.63 154.03,28.97 151.18,28.97ZM135.81,31.36H132.27V25.65H135.81C137.67,25.65 138.72,27.19 138.72,28.51C138.72,29.8 137.67,31.36 135.81,31.36ZM135.74,23.33H129.78V40H132.27V33.69H135.74C138.5,33.69 141.21,31.69 141.21,28.51C141.21,25.33 138.5,23.33 135.74,23.33ZM103.23,38.11C101.52,38.11 100.07,36.67 100.07,34.69C100.07,32.7 101.52,31.23 103.23,31.23C104.93,31.23 106.26,32.7 106.26,34.69C106.26,36.67 104.93,38.11 103.23,38.11ZM106.09,30.27H106C105.45,29.6 104.37,29 103.02,29C100.18,29 97.58,31.49 97.58,34.69C97.58,37.88 100.18,40.34 103.02,40.34C104.37,40.34 105.45,39.74 106,39.06H106.09V39.87C106.09,42.04 104.93,43.2 103.06,43.2C101.54,43.2 100.59,42.1 100.2,41.18L98.04,42.08C98.66,43.59 100.31,45.43 103.06,45.43C105.98,45.43 108.45,43.72 108.45,39.53V29.34H106.09V30.27ZM110.17,40H112.66V23.33H110.17V40ZM116.34,34.5C116.27,32.31 118.04,31.19 119.3,31.19C120.29,31.19 121.13,31.69 121.41,32.4L116.34,34.5ZM124.07,32.61C123.6,31.34 122.16,29 119.21,29C116.29,29 113.86,31.3 113.86,34.67C113.86,37.85 116.27,40.34 119.5,40.34C122.09,40.34 123.6,38.76 124.22,37.83L122.29,36.54C121.64,37.48 120.76,38.11 119.5,38.11C118.22,38.11 117.32,37.53 116.75,36.39L124.33,33.26L124.07,32.61ZM63.66,30.74V33.15H69.42C69.24,34.5 68.79,35.49 68.1,36.18C67.27,37.02 65.96,37.94 63.66,37.94C60.11,37.94 57.34,35.08 57.34,31.54C57.34,27.99 60.11,25.14 63.66,25.14C65.57,25.14 66.96,25.89 67.99,26.85L69.69,25.16C68.26,23.78 66.34,22.73 63.66,22.73C58.8,22.73 54.72,26.68 54.72,31.54C54.72,36.39 58.8,40.34 63.66,40.34C66.28,40.34 68.26,39.48 69.8,37.88C71.39,36.29 71.89,34.05 71.89,32.24C71.89,31.69 71.84,31.17 71.76,30.74H63.66ZM78.43,38.11C76.71,38.11 75.23,36.69 75.23,34.67C75.23,32.63 76.71,31.23 78.43,31.23C80.15,31.23 81.63,32.63 81.63,34.67C81.63,36.69 80.15,38.11 78.43,38.11ZM78.43,29C75.29,29 72.74,31.39 72.74,34.67C72.74,37.94 75.29,40.34 78.43,40.34C81.57,40.34 84.13,37.94 84.13,34.67C84.13,31.39 81.57,29 78.43,29ZM90.85,38.11C89.13,38.11 87.65,36.69 87.65,34.67C87.65,32.63 89.13,31.23 90.85,31.23C92.57,31.23 94.05,32.63 94.05,34.67C94.05,36.69 92.57,38.11 90.85,38.11ZM90.85,29C87.71,29 85.16,31.39 85.16,34.67C85.16,37.94 87.71,40.34 90.85,40.34C93.98,40.34 96.54,37.94 96.54,34.67C96.54,31.39 93.98,29 90.85,29Z" />
+        <path
+            android:fillColor="#EB3131"
+            android:pathData="M27.63,25.9L13.43,40.96C13.43,40.97 13.43,40.97 13.43,40.97C13.86,42.61 15.36,43.82 17.13,43.82C17.84,43.82 18.51,43.63 19.08,43.29L19.13,43.26L35.1,34.04L27.63,25.9Z" />
+        <path
+            android:fillColor="#F6B60B"
+            android:pathData="M41.98,23.33L41.97,23.32L35.07,19.32L27.3,26.24L35.1,34.04L41.96,30.08C43.17,29.43 43.98,28.16 43.98,26.7C43.98,25.24 43.18,23.98 41.98,23.33Z" />
+        <path
+            android:fillColor="#5778C5"
+            android:pathData="M13.43,12.37C13.34,12.68 13.3,13.02 13.3,13.35V39.98C13.3,40.32 13.34,40.65 13.43,40.96L28.11,26.29L13.43,12.37Z" />
+        <path
+            android:fillColor="#3BAD49"
+            android:pathData="M27.73,26.67L35.07,19.32L19.11,10.07C18.54,9.72 17.86,9.52 17.13,9.52C15.36,9.52 13.86,10.73 13.43,12.36C13.43,12.37 13.43,12.37 13.43,12.37L27.73,26.67Z" />
+    </group>
+</vector>
diff --git a/health-sdk/sdk/src/main/res/drawable-hdpi/ghs_payment_review_close_button.png b/merchant-sdk/sdk/src/main/res/drawable-hdpi/gms_payment_review_close_button.png
similarity index 100%
rename from health-sdk/sdk/src/main/res/drawable-hdpi/ghs_payment_review_close_button.png
rename to merchant-sdk/sdk/src/main/res/drawable-hdpi/gms_payment_review_close_button.png
diff --git a/health-sdk/sdk/src/main/res/drawable-mdpi/ghs_payment_review_close_button.png b/merchant-sdk/sdk/src/main/res/drawable-mdpi/gms_payment_review_close_button.png
similarity index 100%
rename from health-sdk/sdk/src/main/res/drawable-mdpi/ghs_payment_review_close_button.png
rename to merchant-sdk/sdk/src/main/res/drawable-mdpi/gms_payment_review_close_button.png
diff --git a/merchant-sdk/sdk/src/main/res/drawable-night/gms_chevron_down_icon.xml b/merchant-sdk/sdk/src/main/res/drawable-night/gms_chevron_down_icon.xml
new file mode 100644
index 0000000000..cd35a419ea
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/drawable-night/gms_chevron_down_icon.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M4,6L8,10L12,6"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@color/gms_light_01"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/merchant-sdk/sdk/src/main/res/drawable-night/gms_close_icon.xml b/merchant-sdk/sdk/src/main/res/drawable-night/gms_close_icon.xml
new file mode 100644
index 0000000000..d4a65c7e09
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/drawable-night/gms_close_icon.xml
@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18,6L6,18"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@color/gms_light_01"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M6,6L18,18"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@color/gms_light_01"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/merchant-sdk/sdk/src/main/res/drawable-night/gms_info_circle_icon.xml b/merchant-sdk/sdk/src/main/res/drawable-night/gms_info_circle_icon.xml
new file mode 100644
index 0000000000..835282e993
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/drawable-night/gms_info_circle_icon.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,19.031C16.142,19.031 19.5,15.883 19.5,12C19.5,8.117 16.142,4.969 12,4.969C7.858,4.969 4.5,8.117 4.5,12C4.5,15.883 7.858,19.031 12,19.031ZM12,20.438C16.971,20.438 21,16.66 21,12C21,7.34 16.971,3.563 12,3.563C7.029,3.563 3,7.34 3,12C3,16.66 7.029,20.438 12,20.438Z"
+      android:fillColor="#E8E9EB"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M11.06,16.688V9.676H12.748V16.688H11.06ZM11.9,8.536C11.595,8.536 11.344,8.454 11.148,8.292C10.953,8.125 10.854,7.914 10.854,7.658C10.854,7.401 10.953,7.192 11.148,7.03C11.344,6.863 11.595,6.78 11.9,6.78C12.21,6.78 12.461,6.863 12.652,7.03C12.848,7.192 12.946,7.401 12.946,7.658C12.946,7.914 12.848,8.125 12.652,8.292C12.461,8.454 12.21,8.536 11.9,8.536Z"
+      android:fillColor="#E8E9EB"/>
+</vector>
diff --git a/health-sdk/sdk/src/main/res/drawable-xhdpi/ghs_payment_review_close_button.png b/merchant-sdk/sdk/src/main/res/drawable-xhdpi/gms_payment_review_close_button.png
similarity index 100%
rename from health-sdk/sdk/src/main/res/drawable-xhdpi/ghs_payment_review_close_button.png
rename to merchant-sdk/sdk/src/main/res/drawable-xhdpi/gms_payment_review_close_button.png
diff --git a/health-sdk/sdk/src/main/res/drawable-xxhdpi/ghs_payment_review_close_button.png b/merchant-sdk/sdk/src/main/res/drawable-xxhdpi/gms_payment_review_close_button.png
similarity index 100%
rename from health-sdk/sdk/src/main/res/drawable-xxhdpi/ghs_payment_review_close_button.png
rename to merchant-sdk/sdk/src/main/res/drawable-xxhdpi/gms_payment_review_close_button.png
diff --git a/health-sdk/sdk/src/main/res/drawable-xxxhdpi/ghs_payment_review_close_button.png b/merchant-sdk/sdk/src/main/res/drawable-xxxhdpi/gms_payment_review_close_button.png
similarity index 100%
rename from health-sdk/sdk/src/main/res/drawable-xxxhdpi/ghs_payment_review_close_button.png
rename to merchant-sdk/sdk/src/main/res/drawable-xxxhdpi/gms_payment_review_close_button.png
diff --git a/merchant-sdk/sdk/src/main/res/drawable/gms_bordered_background.xml b/merchant-sdk/sdk/src/main/res/drawable/gms_bordered_background.xml
new file mode 100644
index 0000000000..1f15150df8
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/drawable/gms_bordered_background.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--TODO to be merged with same drawable from branch IPC 160-->
+<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="@dimen/gms_small"/>
+    <stroke android:color="@color/gms_payment_provider_border_color" android:width="@dimen/gms_small_1"/>
+    <solid android:color="@color/gms_bordered_background_color"/>
+</shape>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/drawable/gms_checkmark.xml b/merchant-sdk/sdk/src/main/res/drawable/gms_checkmark.xml
new file mode 100644
index 0000000000..926c4f4a98
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/drawable/gms_checkmark.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20,6L9,17L4,12"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#009EDC"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/merchant-sdk/sdk/src/main/res/drawable/gms_chevron_down_icon.xml b/merchant-sdk/sdk/src/main/res/drawable/gms_chevron_down_icon.xml
new file mode 100644
index 0000000000..2ffd51d4aa
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/drawable/gms_chevron_down_icon.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M4,6L8,10L12,6"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@color/gms_dark_01"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/merchant-sdk/sdk/src/main/res/drawable/gms_close_button.xml b/merchant-sdk/sdk/src/main/res/drawable/gms_close_button.xml
new file mode 100644
index 0000000000..cf9d5fe87a
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/drawable/gms_close_button.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="#86E8E8E8">
+    <item android:drawable="@drawable/gms_payment_review_close_button" />
+</ripple>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/drawable/gms_close_icon.xml b/merchant-sdk/sdk/src/main/res/drawable/gms_close_icon.xml
new file mode 100644
index 0000000000..eeaa891834
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/drawable/gms_close_icon.xml
@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18,6L6,18"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@color/gms_dark_01"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M6,6L18,18"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@color/gms_dark_01"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/merchant-sdk/sdk/src/main/res/drawable/gms_dot_selected.xml b/merchant-sdk/sdk/src/main/res/drawable/gms_dot_selected.xml
new file mode 100644
index 0000000000..2effa8f15b
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/drawable/gms_dot_selected.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <color android:color="@color/gms_light_07" />
+    </item>
+    <item>
+        <shape
+            android:innerRadius="0dp"
+            android:shape="ring"
+            android:thickness="@dimen/gms_small"
+            android:useLevel="false">
+            <solid android:color="@color/gms_dark_07" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/drawable/gms_dot_unselected.xml b/merchant-sdk/sdk/src/main/res/drawable/gms_dot_unselected.xml
new file mode 100644
index 0000000000..5cf1403712
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/drawable/gms_dot_unselected.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <color android:color="@color/gms_light_07" />
+    </item>
+    <item>
+        <shape
+            android:innerRadius="0dp"
+            android:shape="ring"
+            android:thickness="@dimen/gms_small"
+            android:useLevel="false">
+            <solid android:color="@color/gms_dark_03" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/drawable/gms_edit_icon.xml b/merchant-sdk/sdk/src/main/res/drawable/gms_edit_icon.xml
new file mode 100644
index 0000000000..640adc5b05
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/drawable/gms_edit_icon.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="10dp"
+    android:height="10dp"
+    android:viewportWidth="10"
+    android:viewportHeight="10">
+  <path
+      android:pathData="M8.6631,1.2744C7.9476,0.5588 6.7875,0.5588 6.0719,1.2744L1.7533,5.5931L4.3445,8.1843L8.6631,3.8656C9.3787,3.15 9.3787,1.9899 8.6631,1.2744Z"
+      android:fillColor="#667093"/>
+  <path
+      android:pathData="M0.828,7.9986L1.3214,6.0249L3.9126,8.6161L1.939,9.1095C1.268,9.2773 0.6603,8.6695 0.828,7.9986Z"
+      android:fillColor="#667093"/>
+</vector>
diff --git a/merchant-sdk/sdk/src/main/res/drawable/gms_expandable_list_icon.xml b/merchant-sdk/sdk/src/main/res/drawable/gms_expandable_list_icon.xml
new file mode 100644
index 0000000000..6daa024db2
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/drawable/gms_expandable_list_icon.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_expanded="true">
+        <layer-list>
+            <item
+                android:height="@dimen/gms_large_24"
+                android:width="@dimen/gms_large_24"
+                android:gravity="center_vertical"
+                android:drawable="@drawable/gms_faq_expanded"/>
+        </layer-list>
+    </item>
+    <item>
+        <layer-list>
+            <item
+                android:height="@dimen/gms_large_24"
+                android:width="@dimen/gms_large_24"
+                android:gravity="center_vertical"
+                android:drawable="@drawable/gms_faq_closed"
+                >
+            </item>
+        </layer-list>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/drawable/gms_faq_closed.xml b/merchant-sdk/sdk/src/main/res/drawable/gms_faq_closed.xml
new file mode 100644
index 0000000000..363afc338d
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/drawable/gms_faq_closed.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,5V19"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#009EDC"/>
+  <path
+      android:pathData="M5,12H19"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#009EDC"/>
+</vector>
diff --git a/merchant-sdk/sdk/src/main/res/drawable/gms_faq_expanded.xml b/merchant-sdk/sdk/src/main/res/drawable/gms_faq_expanded.xml
new file mode 100644
index 0000000000..58350c9ef0
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/drawable/gms_faq_expanded.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M5,12H19"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@color/gms_accent_01"/>
+</vector>
diff --git a/merchant-sdk/sdk/src/main/res/drawable/gms_gini_logo.xml b/merchant-sdk/sdk/src/main/res/drawable/gms_gini_logo.xml
new file mode 100644
index 0000000000..f52353dad9
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/drawable/gms_gini_logo.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="19dp"
+    android:viewportWidth="28"
+    android:viewportHeight="19">
+  <path
+      android:pathData="M26.624,1.06H26.557C26.405,1.065 26.254,1.1 26.114,1.156C25.98,1.208 25.862,1.282 25.756,1.378C25.65,1.469 25.554,1.577 25.482,1.697C25.403,1.816 25.347,1.953 25.314,2.089C25.297,2.146 25.286,2.203 25.28,2.266C25.274,2.328 25.269,2.385 25.269,2.448C25.269,2.624 25.302,2.806 25.37,2.966C25.42,3.102 25.493,3.222 25.588,3.33C25.677,3.438 25.784,3.534 25.902,3.608C26.019,3.688 26.153,3.745 26.288,3.779C26.344,3.796 26.4,3.807 26.461,3.813C26.523,3.819 26.579,3.825 26.641,3.825C26.814,3.825 26.993,3.79 27.15,3.722C27.285,3.671 27.402,3.597 27.508,3.5C27.615,3.409 27.71,3.301 27.783,3.182C27.861,3.062 27.917,2.926 27.951,2.789C27.968,2.732 27.979,2.675 27.984,2.613C27.99,2.55 27.996,2.493 27.996,2.431C27.996,2.254 27.962,2.072 27.895,1.913C27.844,1.777 27.772,1.657 27.676,1.549C27.587,1.441 27.48,1.344 27.363,1.27C27.245,1.191 27.111,1.134 26.976,1.1C26.92,1.082 26.865,1.071 26.803,1.065C26.764,1.06 26.73,1.054 26.691,1.054C26.669,1.06 26.646,1.06 26.624,1.06ZM27.855,6.919V4.837H27.811C27.71,4.837 27.615,4.837 27.514,4.843C27.424,4.849 27.34,4.854 27.251,4.86C27.173,4.866 27.088,4.877 27.01,4.888C26.937,4.9 26.859,4.911 26.786,4.928L26.702,4.945C26.674,4.951 26.646,4.957 26.618,4.968C26.428,5.019 26.243,5.093 26.086,5.201C25.974,5.27 25.874,5.361 25.789,5.463C25.7,5.565 25.633,5.685 25.577,5.81C25.51,5.964 25.465,6.134 25.437,6.299C25.42,6.396 25.409,6.493 25.403,6.589C25.398,6.663 25.392,6.737 25.392,6.811V13.871H25.549C25.644,13.871 25.745,13.866 25.84,13.86C26.053,13.849 26.265,13.826 26.478,13.775C26.663,13.735 26.848,13.678 27.016,13.587C27.145,13.519 27.268,13.439 27.374,13.331C27.48,13.229 27.564,13.109 27.632,12.978C27.704,12.836 27.755,12.682 27.788,12.523C27.811,12.421 27.828,12.318 27.839,12.216C27.85,12.113 27.855,12.017 27.861,11.914V6.931L27.855,6.919ZM19.345,4.086C19.267,4.086 19.188,4.086 19.11,4.092C18.578,4.115 18.041,4.228 17.542,4.439C17.077,4.621 16.646,4.888 16.271,5.213C15.891,5.531 15.56,5.912 15.292,6.333C15.017,6.76 14.81,7.232 14.687,7.722C14.636,7.921 14.597,8.125 14.569,8.336C14.552,8.467 14.541,8.598 14.536,8.734C14.53,8.814 14.53,8.893 14.53,8.979V13.871H14.687C15,13.866 15.314,13.849 15.616,13.775C15.801,13.735 15.986,13.678 16.154,13.587C16.282,13.519 16.406,13.439 16.512,13.331C16.618,13.229 16.702,13.109 16.77,12.978C16.842,12.836 16.893,12.682 16.926,12.523C16.949,12.421 16.966,12.318 16.977,12.21C16.988,12.108 16.994,12.011 16.999,11.909V8.973C16.999,8.933 16.999,8.893 17.005,8.854C17.016,8.586 17.072,8.325 17.173,8.074C17.262,7.847 17.385,7.63 17.542,7.443C17.693,7.255 17.878,7.09 18.08,6.959C18.287,6.823 18.511,6.72 18.746,6.658C18.841,6.629 18.942,6.612 19.043,6.601C19.144,6.589 19.244,6.578 19.351,6.584C19.653,6.584 19.955,6.641 20.23,6.754C20.454,6.845 20.667,6.971 20.851,7.13C21.036,7.283 21.198,7.471 21.327,7.676C21.434,7.841 21.517,8.023 21.579,8.211C21.646,8.416 21.691,8.632 21.697,8.848C21.697,8.888 21.697,8.928 21.702,8.967V11.903C21.708,12.159 21.73,12.415 21.809,12.66C21.848,12.807 21.909,12.955 21.993,13.081C22.072,13.2 22.167,13.314 22.279,13.405C22.397,13.502 22.525,13.575 22.665,13.632C22.872,13.723 23.096,13.775 23.32,13.803C23.438,13.82 23.556,13.832 23.673,13.843C23.785,13.849 23.897,13.854 24.015,13.86H24.171V8.967C24.171,8.888 24.171,8.808 24.166,8.728C24.143,8.182 24.031,7.642 23.824,7.136C23.645,6.663 23.382,6.225 23.063,5.844C22.749,5.457 22.374,5.122 21.96,4.854C21.54,4.576 21.075,4.365 20.594,4.24C20.398,4.183 20.196,4.149 19.989,4.12C19.86,4.103 19.731,4.092 19.597,4.086C19.502,4.092 19.424,4.086 19.345,4.086ZM10.835,4.837V11.914C10.84,12.17 10.863,12.426 10.941,12.671C10.98,12.819 11.042,12.967 11.126,13.092C11.204,13.211 11.299,13.325 11.411,13.416C11.529,13.513 11.658,13.587 11.798,13.644C12.005,13.735 12.229,13.786 12.453,13.814C12.57,13.832 12.688,13.843 12.806,13.854C12.917,13.86 13.03,13.866 13.147,13.871H13.304V13.661V13.245V12.205V10.816V9.428V8.04V7.483V6.925C13.298,6.624 13.287,6.316 13.198,6.032C13.158,5.884 13.097,5.736 13.013,5.611C12.934,5.491 12.839,5.378 12.727,5.287C12.61,5.19 12.481,5.116 12.341,5.059C12.134,4.968 11.91,4.917 11.686,4.888C11.568,4.871 11.451,4.86 11.333,4.849C11.221,4.843 11.109,4.837 10.991,4.832C10.936,4.837 10.885,4.837 10.835,4.837Z"
+      android:fillColor="#009EDC"/>
+  <path
+      android:pathData="M2.487,8.984V8.865C2.498,8.598 2.554,8.336 2.655,8.086C2.745,7.858 2.868,7.642 3.025,7.454C3.176,7.266 3.36,7.101 3.562,6.971C3.769,6.834 3.993,6.732 4.228,6.675C4.324,6.646 4.424,6.629 4.525,6.618C4.626,6.606 4.727,6.595 4.833,6.595C5.074,6.595 5.315,6.629 5.544,6.709C5.729,6.766 5.908,6.851 6.07,6.959C6.233,7.062 6.384,7.187 6.518,7.323C6.653,7.46 6.77,7.619 6.865,7.79C6.905,7.858 6.938,7.926 6.972,8C7.005,8.074 7.039,8.143 7.056,8.222C7.073,8.273 7.078,8.325 7.089,8.376C7.095,8.421 7.106,8.467 7.112,8.507L7.129,8.643C7.134,8.689 7.134,8.74 7.14,8.785V8.899C7.14,8.939 7.14,8.979 7.134,9.019C7.129,9.098 7.123,9.172 7.112,9.252C7.084,9.44 7.039,9.622 6.966,9.798C6.877,10.026 6.753,10.242 6.597,10.429C6.446,10.617 6.261,10.782 6.059,10.913C5.858,11.05 5.628,11.152 5.393,11.209C5.298,11.237 5.197,11.254 5.102,11.266C5.04,11.271 4.973,11.283 4.911,11.283C4.872,11.283 4.833,11.283 4.794,11.288H4.71C4.654,11.288 4.598,11.283 4.542,11.277C4.402,11.26 4.268,11.237 4.133,11.198C3.96,11.146 3.792,11.072 3.635,10.981C3.478,10.89 3.338,10.782 3.204,10.663C3.069,10.543 2.952,10.401 2.857,10.253C2.817,10.191 2.778,10.134 2.745,10.065C2.711,10.003 2.677,9.935 2.649,9.872C2.621,9.809 2.599,9.741 2.582,9.673C2.565,9.616 2.549,9.559 2.537,9.502C2.526,9.445 2.515,9.383 2.504,9.326C2.493,9.263 2.487,9.206 2.487,9.144C2.487,9.121 2.487,9.093 2.481,9.07V9.024C2.487,9.002 2.487,8.996 2.487,8.984ZM12.061,1.003C12.005,1.003 11.955,1.003 11.899,1.008C11.529,1.031 11.171,1.134 10.83,1.282C10.426,1.447 10.051,1.674 9.699,1.93C9.329,2.192 8.982,2.493 8.657,2.818C8.344,3.131 8.058,3.46 7.806,3.825C7.711,3.955 7.621,4.092 7.537,4.228C7.47,4.342 7.403,4.456 7.347,4.576C7.325,4.621 7.302,4.672 7.28,4.723C7.257,4.712 7.235,4.695 7.213,4.684C7.168,4.655 7.123,4.632 7.078,4.61C6.966,4.547 6.854,4.49 6.737,4.439C6.58,4.371 6.418,4.308 6.255,4.257C6.093,4.206 5.925,4.16 5.751,4.126C5.578,4.092 5.404,4.063 5.231,4.052C5.158,4.046 5.091,4.041 5.018,4.035C4.973,4.035 4.928,4.029 4.883,4.029H4.799C4.721,4.029 4.643,4.029 4.564,4.035C4.407,4.041 4.251,4.058 4.1,4.081C3.724,4.137 3.355,4.234 3.002,4.382C2.543,4.564 2.112,4.826 1.731,5.156C1.35,5.474 1.02,5.85 0.757,6.277C0.483,6.692 0.275,7.164 0.152,7.653C0.096,7.852 0.063,8.057 0.035,8.262C0.007,8.472 -0.004,8.683 -0.004,8.899C-0.004,9.03 0.001,9.155 0.012,9.286C0.018,9.394 0.029,9.496 0.046,9.599C0.063,9.701 0.079,9.804 0.102,9.906C0.124,10.009 0.147,10.105 0.175,10.208L0.208,10.327C0.219,10.367 0.231,10.407 0.247,10.447C0.292,10.583 0.337,10.725 0.393,10.856C0.438,10.97 0.488,11.078 0.544,11.186C0.6,11.294 0.656,11.397 0.718,11.499C0.779,11.601 0.841,11.704 0.914,11.8C0.942,11.84 0.97,11.88 0.998,11.914C1.015,11.937 1.031,11.96 1.054,11.988C1.065,12 1.076,12.017 1.087,12.028C1.065,12.045 1.048,12.062 1.031,12.079C0.992,12.113 0.953,12.153 0.919,12.187C0.83,12.278 0.74,12.381 0.662,12.483C0.555,12.62 0.46,12.773 0.376,12.927C0.292,13.086 0.225,13.251 0.169,13.416C0.113,13.587 0.068,13.769 0.046,13.945C0.035,14.019 0.029,14.093 0.024,14.167C0.018,14.241 0.018,14.315 0.018,14.395C0.018,14.469 0.018,14.543 0.024,14.622C0.029,14.685 0.035,14.747 0.04,14.804C0.046,14.867 0.057,14.924 0.068,14.986C0.079,15.043 0.091,15.106 0.107,15.163L0.124,15.231C0.13,15.254 0.135,15.276 0.147,15.299C0.219,15.55 0.315,15.8 0.443,16.033C0.544,16.227 0.673,16.403 0.813,16.562C0.953,16.727 1.11,16.875 1.283,17C1.457,17.131 1.642,17.245 1.838,17.336C1.916,17.376 1.994,17.404 2.078,17.438C2.129,17.455 2.179,17.472 2.235,17.49C2.269,17.501 2.297,17.507 2.33,17.518L2.341,17.524L2.375,17.535L2.392,17.541L2.403,17.546L2.414,17.552L2.448,17.558H2.481L2.504,17.563H2.593L2.633,17.569H2.655L2.694,17.575H2.705L2.733,17.581H2.745L2.784,17.586H2.806L2.868,17.592H2.879L2.941,17.598H7.392C7.593,17.603 7.789,17.626 7.985,17.683C8.125,17.723 8.26,17.774 8.383,17.854C8.484,17.916 8.573,17.99 8.652,18.076C8.73,18.161 8.791,18.258 8.842,18.366C8.892,18.474 8.931,18.593 8.948,18.713C8.954,18.747 8.959,18.775 8.959,18.809C8.965,18.832 8.965,18.861 8.965,18.883C8.965,18.906 8.971,18.934 8.971,18.957C9.027,18.912 9.088,18.872 9.144,18.826C9.251,18.741 9.346,18.644 9.441,18.548C9.592,18.383 9.727,18.201 9.827,18.001C9.945,17.78 10.029,17.529 10.057,17.279C10.09,17.046 10.079,16.807 10.023,16.579C9.973,16.357 9.883,16.147 9.76,15.959C9.643,15.771 9.486,15.601 9.307,15.47C9.122,15.328 8.915,15.225 8.696,15.168C8.629,15.151 8.568,15.134 8.5,15.123C8.45,15.117 8.4,15.106 8.344,15.106C8.293,15.1 8.237,15.1 8.187,15.1H3.075C3.008,15.094 2.941,15.083 2.873,15.055C2.812,15.032 2.761,14.998 2.711,14.958C2.661,14.918 2.621,14.867 2.588,14.816C2.554,14.759 2.526,14.702 2.509,14.639C2.504,14.611 2.498,14.588 2.493,14.56C2.493,14.543 2.487,14.526 2.487,14.509V14.48V14.452C2.487,14.429 2.487,14.412 2.493,14.395C2.498,14.349 2.509,14.298 2.532,14.252C2.554,14.196 2.588,14.139 2.627,14.087C2.666,14.036 2.711,13.997 2.767,13.962C2.817,13.928 2.879,13.9 2.935,13.883C2.957,13.877 2.985,13.871 3.008,13.866C3.025,13.866 3.041,13.86 3.058,13.86H4.839C4.917,13.86 4.995,13.86 5.074,13.854C5.231,13.849 5.387,13.832 5.538,13.809C5.914,13.752 6.283,13.655 6.641,13.507C7.106,13.325 7.537,13.058 7.912,12.733C8.293,12.415 8.624,12.034 8.887,11.613C9.161,11.186 9.368,10.714 9.491,10.225C9.547,10.026 9.581,9.821 9.609,9.61C9.637,9.4 9.648,9.184 9.648,8.973C9.648,8.825 9.643,8.683 9.626,8.535C9.615,8.416 9.598,8.296 9.575,8.177C9.553,8.057 9.531,7.943 9.497,7.824C9.469,7.71 9.435,7.591 9.396,7.477C9.379,7.431 9.368,7.386 9.351,7.34L9.301,7.204C9.239,7.045 9.172,6.88 9.099,6.726C9.038,6.595 8.971,6.47 8.892,6.345C8.819,6.22 8.741,6.1 8.657,5.986C8.573,5.873 8.484,5.759 8.394,5.651C8.355,5.605 8.321,5.565 8.282,5.526C8.26,5.497 8.232,5.474 8.209,5.446L8.164,5.4C8.187,5.372 8.209,5.349 8.232,5.321C8.276,5.264 8.327,5.213 8.372,5.161C8.5,5.019 8.635,4.883 8.769,4.752C8.959,4.57 9.167,4.393 9.379,4.234C9.587,4.075 9.805,3.933 10.035,3.807C10.247,3.688 10.471,3.591 10.701,3.529C10.785,3.506 10.874,3.483 10.964,3.472C11.014,3.466 11.07,3.455 11.126,3.455C11.16,3.455 11.188,3.455 11.221,3.449C11.221,3.449 11.227,3.449 11.227,3.455C11.233,3.455 11.233,3.46 11.238,3.46C11.244,3.466 11.255,3.472 11.261,3.478C11.272,3.483 11.283,3.495 11.294,3.5C11.305,3.506 11.317,3.517 11.328,3.523C11.339,3.529 11.35,3.54 11.361,3.546C11.367,3.546 11.373,3.551 11.373,3.551C11.378,3.551 11.384,3.557 11.389,3.557C11.395,3.557 11.395,3.563 11.401,3.563C11.401,3.563 11.406,3.563 11.406,3.569C11.406,3.569 11.412,3.569 11.412,3.574C11.417,3.574 11.423,3.58 11.423,3.58C11.434,3.586 11.445,3.591 11.462,3.597L11.496,3.614L11.529,3.631C11.541,3.637 11.552,3.643 11.563,3.643C11.569,3.643 11.574,3.648 11.574,3.648C11.58,3.648 11.585,3.654 11.585,3.654C11.591,3.66 11.602,3.66 11.608,3.66C11.613,3.66 11.619,3.665 11.63,3.665C11.641,3.665 11.641,3.671 11.653,3.671C11.658,3.671 11.664,3.677 11.675,3.677H11.686C11.697,3.682 11.709,3.682 11.714,3.688C11.72,3.688 11.731,3.694 11.736,3.694C11.742,3.694 11.753,3.699 11.759,3.699C11.764,3.699 11.776,3.705 11.781,3.705H11.804C11.826,3.711 11.843,3.711 11.86,3.716C11.877,3.716 11.893,3.722 11.91,3.722C11.927,3.722 11.944,3.728 11.96,3.728C11.977,3.728 11.994,3.728 12.011,3.734H12.117C12.162,3.734 12.207,3.728 12.252,3.722C12.358,3.705 12.464,3.677 12.565,3.637C12.694,3.586 12.817,3.512 12.924,3.421C13.03,3.33 13.125,3.222 13.198,3.102C13.276,2.983 13.332,2.846 13.366,2.71C13.383,2.653 13.394,2.596 13.399,2.533C13.405,2.476 13.411,2.414 13.411,2.351C13.411,2.175 13.377,1.998 13.31,1.833C13.259,1.703 13.187,1.577 13.097,1.469C13.007,1.361 12.901,1.265 12.784,1.191C12.666,1.111 12.532,1.054 12.397,1.02C12.341,1.003 12.285,0.991 12.229,0.986C12.19,0.98 12.156,0.98 12.117,0.974C12.106,1.003 12.084,1.003 12.061,1.003Z"
+      android:fillColor="#009EDC"/>
+</vector>
diff --git a/merchant-sdk/sdk/src/main/res/drawable/gms_info_circle_icon.xml b/merchant-sdk/sdk/src/main/res/drawable/gms_info_circle_icon.xml
new file mode 100644
index 0000000000..27fcf60ae6
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/drawable/gms_info_circle_icon.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,19.031C16.142,19.031 19.5,15.883 19.5,12C19.5,8.117 16.142,4.969 12,4.969C7.858,4.969 4.5,8.117 4.5,12C4.5,15.883 7.858,19.031 12,19.031ZM12,20.438C16.971,20.438 21,16.66 21,12C21,7.34 16.971,3.563 12,3.563C7.029,3.563 3,7.34 3,12C3,16.66 7.029,20.438 12,20.438Z"
+      android:fillColor="#565656"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M11.06,16.688V9.676H12.748V16.688H11.06ZM11.9,8.536C11.595,8.536 11.344,8.454 11.148,8.292C10.953,8.125 10.854,7.914 10.854,7.658C10.854,7.401 10.953,7.192 11.148,7.03C11.344,6.863 11.595,6.78 11.9,6.78C12.21,6.78 12.461,6.863 12.652,7.03C12.848,7.192 12.946,7.401 12.946,7.658C12.946,7.914 12.848,8.125 12.652,8.292C12.461,8.454 12.21,8.536 11.9,8.536Z"
+      android:fillColor="#565656"/>
+</vector>
diff --git a/merchant-sdk/sdk/src/main/res/drawable/gms_lock.xml b/merchant-sdk/sdk/src/main/res/drawable/gms_lock.xml
new file mode 100644
index 0000000000..c98dccf56a
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/drawable/gms_lock.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="6dp"
+    android:height="12dp"
+    android:viewportWidth="6"
+    android:viewportHeight="12">
+  <path
+      android:pathData="M2,2C2,1.4477 2.4477,1 3,1C3.5523,1 4,1.4477 4,2L4,3L2,3L2,2ZM1,3L1,2C1,0.8954 1.8954,0 3,0C4.1046,0 5,0.8954 5,2L5,3C5.5523,3 6,3.4477 6,4L6,8C6,8.5523 5.5523,9 5,9L1,9C0.4477,9 0,8.5523 0,8L0,4C0,3.4477 0.4477,3 1,3Z"
+      android:fillColor="#7A7A7A"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/merchant-sdk/sdk/src/main/res/drawable/gms_payment_details_background.xml b/merchant-sdk/sdk/src/main/res/drawable/gms_payment_details_background.xml
new file mode 100644
index 0000000000..caca85adcb
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/drawable/gms_payment_details_background.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners
+        android:topLeftRadius="@dimen/gms_medium_12"
+        android:topRightRadius="@dimen/gms_medium_12">
+    </corners>
+    <solid android:color="@color/gms_payment_details_background_color"/>
+</shape>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/drawable/gms_payment_details_info_bar_background.xml b/merchant-sdk/sdk/src/main/res/drawable/gms_payment_details_info_bar_background.xml
new file mode 100644
index 0000000000..1ca941f97d
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/drawable/gms_payment_details_info_bar_background.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners
+        android:topLeftRadius="@dimen/gms_medium_12"
+        android:topRightRadius="@dimen/gms_medium_12">
+    </corners>
+    <solid android:color="@color/gms_success_01"/>
+</shape>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/drawable/gms_payment_input_edit_text_background.xml b/merchant-sdk/sdk/src/main/res/drawable/gms_payment_input_edit_text_background.xml
new file mode 100644
index 0000000000..dcc5e18277
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/drawable/gms_payment_input_edit_text_background.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="@dimen/gms_small"/>
+    <stroke android:color="@color/gms_payment_input_border_color" android:width="1dp"/>
+    <solid android:color="@color/gms_payment_input_background_color"/>
+</shape>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/drawable/gms_payment_input_edit_text_error_background.xml b/merchant-sdk/sdk/src/main/res/drawable/gms_payment_input_edit_text_error_background.xml
new file mode 100644
index 0000000000..0acf014bea
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/drawable/gms_payment_input_edit_text_error_background.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="@dimen/gms_small"/>
+    <stroke android:color="@color/gms_feedback_01" android:width="1dp"/>
+    <solid android:color="@color/gms_payment_input_background_color"/>
+</shape>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/drawable/gms_play_store_logo.xml b/merchant-sdk/sdk/src/main/res/drawable/gms_play_store_logo.xml
new file mode 100644
index 0000000000..8c5524305f
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/drawable/gms_play_store_logo.xml
@@ -0,0 +1,91 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="122dp"
+    android:height="36dp"
+    android:viewportWidth="122"
+    android:viewportHeight="36">
+  <group>
+    <clip-path
+        android:pathData="M0,0h122v36h-122z"/>
+    <group>
+      <clip-path
+          android:pathData="M122,0H0V36H122V0Z"/>
+      <group>
+        <clip-path
+            android:pathData="M122,0H0V36H122V0Z"/>
+        <path
+            android:pathData="M117.48,36H4.52C2.03,36 0,33.97 0,31.5V4.5C0,2.03 2.03,0 4.52,0H117.48C119.97,0 122,2.03 122,4.5V31.5C122,33.97 119.97,36 117.48,36Z"
+            android:fillColor="#000000"/>
+      </group>
+      <group>
+        <clip-path
+            android:pathData="M122,0H0V36H122V0Z"/>
+        <path
+            android:pathData="M117.48,0.72C119.57,0.72 121.28,2.42 121.28,4.5V31.5C121.28,33.59 119.57,35.28 117.48,35.28H4.52C2.43,35.28 0.72,33.59 0.72,31.5V4.5C0.72,2.42 2.43,0.72 4.52,0.72H117.48ZM117.48,0H4.52C2.03,0 0,2.03 0,4.5V31.5C0,33.98 2.03,36 4.52,36H117.48C119.97,36 122,33.98 122,31.5V4.5C122,2.03 119.97,0 117.48,0Z"
+            android:fillColor="#A6A5A5"/>
+      </group>
+      <group>
+        <clip-path
+            android:pathData="M122,0H0V36H122V0Z"/>
+        <path
+            android:pathData="M61.57,19.58C59.45,19.58 57.72,21.19 57.72,23.4C57.72,25.61 59.45,27.23 61.57,27.23C63.7,27.23 65.43,25.61 65.43,23.4C65.43,21.19 63.7,19.58 61.57,19.58ZM61.57,25.72C60.41,25.72 59.4,24.77 59.4,23.4C59.4,22.03 60.41,21.08 61.57,21.08C62.74,21.08 63.74,22.03 63.74,23.4C63.74,24.77 62.74,25.72 61.57,25.72ZM53.16,19.58C51.03,19.58 49.3,21.19 49.3,23.4C49.3,25.61 51.03,27.23 53.16,27.23C55.28,27.23 57.02,25.61 57.02,23.4C57.02,21.19 55.28,19.58 53.16,19.58ZM53.16,25.72C51.99,25.72 50.99,24.77 50.99,23.4C50.99,22.03 51.99,21.08 53.16,21.08C54.32,21.08 55.33,22.03 55.33,23.4C55.33,24.77 54.32,25.72 53.16,25.72ZM43.15,20.75V22.37H47.05C46.93,23.29 46.63,23.95 46.16,24.42C45.59,24.98 44.7,25.61 43.15,25.61C40.74,25.61 38.86,23.68 38.86,21.29C38.86,18.89 40.74,16.97 43.15,16.97C44.44,16.97 45.39,17.47 46.09,18.13L47.24,16.98C46.26,16.05 44.96,15.34 43.15,15.34C39.86,15.34 37.09,18.01 37.09,21.29C37.09,24.56 39.86,27.23 43.15,27.23C44.92,27.23 46.26,26.65 47.31,25.56C48.39,24.49 48.72,22.98 48.72,21.76C48.72,21.39 48.69,21.04 48.64,20.75H43.15ZM84.09,22.01C83.77,21.16 82.8,19.58 80.8,19.58C78.82,19.58 77.18,21.13 77.18,23.41C77.18,25.55 78.81,27.23 80.99,27.23C82.75,27.23 83.77,26.16 84.19,25.54L82.88,24.67C82.44,25.3 81.85,25.73 80.99,25.73C80.13,25.73 79.52,25.33 79.13,24.57L84.26,22.45L84.09,22.01ZM78.85,23.29C78.81,21.81 80,21.06 80.86,21.06C81.53,21.06 82.1,21.39 82.29,21.87L78.85,23.29ZM74.67,27H76.36V15.75H74.67V27ZM71.9,20.43H71.85C71.47,19.98 70.74,19.58 69.82,19.58C67.9,19.58 66.14,21.26 66.14,23.42C66.14,25.56 67.9,27.23 69.82,27.23C70.74,27.23 71.47,26.82 71.85,26.36H71.9V26.91C71.9,28.38 71.12,29.16 69.85,29.16C68.82,29.16 68.18,28.42 67.92,27.8L66.44,28.41C66.87,29.42 67.99,30.67 69.85,30.67C71.83,30.67 73.51,29.51 73.51,26.68V19.81H71.9V20.43ZM69.97,25.72C68.8,25.72 67.83,24.75 67.83,23.42C67.83,22.07 68.8,21.09 69.97,21.09C71.12,21.09 72.02,22.07 72.02,23.42C72.02,24.75 71.12,25.72 69.97,25.72ZM92,15.75H87.96V27H89.65V22.74H92C93.87,22.74 95.71,21.39 95.71,19.24C95.71,17.1 93.87,15.75 92,15.75ZM92.05,21.17H89.65V17.31H92.05C93.31,17.31 94.02,18.35 94.02,19.24C94.02,20.11 93.31,21.17 92.05,21.17ZM102.47,19.56C101.25,19.56 99.98,20.09 99.46,21.28L100.96,21.9C101.28,21.28 101.87,21.07 102.5,21.07C103.37,21.07 104.25,21.6 104.27,22.52V22.64C103.96,22.46 103.31,22.2 102.51,22.2C100.9,22.2 99.26,23.08 99.26,24.74C99.26,26.24 100.58,27.21 102.06,27.21C103.2,27.21 103.82,26.71 104.21,26.11H104.27V26.98H105.9V22.67C105.9,20.67 104.4,19.56 102.47,19.56ZM102.26,25.72C101.71,25.72 100.94,25.45 100.94,24.77C100.94,23.9 101.9,23.57 102.73,23.57C103.47,23.57 103.82,23.73 104.27,23.94C104.14,24.98 103.24,25.72 102.26,25.72ZM111.83,19.8L109.89,24.68H109.83L107.83,19.8H106.01L109.02,26.62L107.31,30.41H109.06L113.7,19.8H111.83ZM96.64,27H98.33V15.75H96.64V27Z"
+            android:fillColor="#ffffff"/>
+      </group>
+      <group>
+        <clip-path
+            android:pathData="M122,0H0V36H122V0Z"/>
+        <path
+            android:pathData="M18.72,17.48L9.1,27.65C9.1,27.65 9.1,27.66 9.1,27.66C9.4,28.76 10.41,29.57 11.61,29.57C12.09,29.57 12.54,29.44 12.93,29.22L12.96,29.2L23.79,22.97L18.72,17.48Z"
+            android:fillColor="#EA4435"/>
+      </group>
+      <group>
+        <clip-path
+            android:pathData="M122,0H0V36H122V0Z"/>
+        <path
+            android:pathData="M28.46,15.75L28.45,15.74L23.77,13.05L18.5,17.71L23.79,22.98L28.44,20.3C29.26,19.86 29.81,19.01 29.81,18.02C29.81,17.04 29.26,16.19 28.46,15.75Z"
+            android:fillColor="#F9BC15"/>
+      </group>
+      <group>
+        <clip-path
+            android:pathData="M122,0H0V36H122V0Z"/>
+        <path
+            android:pathData="M9.1,8.35C9.04,8.56 9.01,8.79 9.01,9.01V26.99C9.01,27.22 9.04,27.44 9.1,27.65L19.05,17.74L9.1,8.35Z"
+            android:fillColor="#547DBF"/>
+      </group>
+      <group>
+        <clip-path
+            android:pathData="M122,0H0V36H122V0Z"/>
+        <path
+            android:pathData="M18.79,18L23.77,13.04L12.96,6.8C12.56,6.56 12.1,6.43 11.61,6.43C10.41,6.43 9.4,7.24 9.1,8.35V8.35L18.79,18Z"
+            android:fillColor="#33A851"/>
+      </group>
+    </group>
+    <group>
+      <clip-path
+          android:pathData="M122,0H0V36H122V0Z"/>
+      <path
+          android:pathData="M38.01,11.6C37.69,11.37 37.46,11.04 37.33,10.62L38.13,10.29C38.21,10.58 38.34,10.79 38.52,10.93C38.69,11.06 38.89,11.13 39.13,11.13C39.41,11.13 39.63,11.04 39.79,10.85C39.95,10.66 40.04,10.41 40.04,10.1V6.21H40.9V10.07C40.9,10.46 40.82,10.8 40.67,11.08C40.52,11.37 40.31,11.58 40.04,11.72C39.77,11.87 39.47,11.94 39.13,11.94C38.7,11.94 38.32,11.83 38.01,11.6Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M42.27,6.21H45.68V7.03H43.13V8.61H45.43V9.42H43.13V11.01H45.68V11.82H42.27V6.21Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M48.05,7.03H46.47V6.21H50.49V7.03H48.92V11.82H48.05V7.03H48.05Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M51.14,10.94L54.09,7.03H51.27V6.21H55.09V7.09L52.16,11.01H55.12V11.82H51.14V10.94Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M57.44,7.03H55.86V6.21H59.88V7.03H58.3V11.82H57.44V7.03H57.44Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M62.55,6.21H64.66C64.96,6.21 65.23,6.28 65.49,6.41C65.75,6.54 65.95,6.72 66.1,6.95C66.25,7.17 66.33,7.43 66.33,7.7C66.33,7.98 66.26,8.22 66.12,8.43C65.98,8.63 65.8,8.79 65.56,8.9V8.94C65.86,9.04 66.09,9.2 66.26,9.43C66.44,9.66 66.52,9.93 66.52,10.25C66.52,10.55 66.44,10.83 66.28,11.06C66.12,11.3 65.91,11.49 65.64,11.62C65.37,11.75 65.07,11.82 64.75,11.82H62.55V6.21H62.55ZM64.62,8.57C64.88,8.57 65.09,8.49 65.25,8.33C65.4,8.17 65.48,7.99 65.48,7.78C65.48,7.57 65.4,7.39 65.25,7.24C65.09,7.08 64.89,7.01 64.65,7.01H63.41V8.57H64.62V8.57ZM64.75,11.02C65.02,11.02 65.24,10.94 65.41,10.77C65.57,10.61 65.66,10.41 65.66,10.18C65.66,9.95 65.57,9.76 65.4,9.59C65.23,9.42 65,9.34 64.72,9.34H63.42V11.02H64.75V11.02Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M67.66,6.21H71.07V7.03H68.52V8.61H70.82V9.42H68.52V11.01H71.07V11.82H67.66V6.21Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M72.3,6.21H73.16V11.82H72.3V6.21Z"
+          android:fillColor="#ffffff"/>
+    </group>
+  </group>
+</vector>
diff --git a/merchant-sdk/sdk/src/main/res/drawable/gms_selectable_payment_provider_background.xml b/merchant-sdk/sdk/src/main/res/drawable/gms_selectable_payment_provider_background.xml
new file mode 100644
index 0000000000..b5beffb234
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/drawable/gms_selectable_payment_provider_background.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true">
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/gms_small"/>
+            <solid android:color="?attr/colorSurface"/>
+            <stroke android:color="?attr/colorPrimary" android:width="@dimen/gms_small_2"/>
+        </shape>
+    </item>
+    <item android:state_selected="false">
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/gms_small"/>
+            <solid android:color="?attr/colorSurface"/>
+            <stroke android:color="@color/gms_payment_provider_border_color" android:width="@dimen/gms_small_2"/>
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/drawable/gms_tab_pager_selector.xml b/merchant-sdk/sdk/src/main/res/drawable/gms_tab_pager_selector.xml
new file mode 100644
index 0000000000..c461b6ba2a
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/drawable/gms_tab_pager_selector.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/gms_dot_selected" android:state_selected="true"/>
+    <item android:drawable="@drawable/gms_dot_unselected"/>
+</selector>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/layout/gms_bottom_sheet_bank_selection.xml b/merchant-sdk/sdk/src/main/res/layout/gms_bottom_sheet_bank_selection.xml
new file mode 100644
index 0000000000..7aa0d043b8
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/layout/gms_bottom_sheet_bank_selection.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.material.bottomsheet.BottomSheetDragHandleView
+        style="@style/GiniMerchantTheme.Widget.BottomSheet.DragHandle"
+        android:id="@+id/drag_handle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gms_medium"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/gms_header_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@id/gms_subtitle_label"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0"
+        app:layout_constraintVertical_chainStyle="packed">
+
+        <ImageView
+            android:id="@+id/gms_close_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/gms_small"
+            android:layout_marginTop="@dimen/gms_large_32"
+            android:paddingVertical="@dimen/gms_medium_12"
+            android:paddingHorizontal="@dimen/gms_medium_12"
+            android:contentDescription="@string/gms_close_content_description"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/gms_close_icon"
+            app:tint="?attr/colorOnBackground" />
+
+        <TextView
+            android:id="@+id/gms_title_label"
+            style="@style/GiniMerchantTheme.Typography.Subtitle1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/gms_large_24"
+            android:text="@string/gms_select_bank"
+            android:textColor="@color/gms_bank_selection_bottom_sheet_title"
+            app:layout_constraintBottom_toBottomOf="@+id/gms_close_button"
+            app:layout_constraintStart_toEndOf="@+id/gms_close_button"
+            app:layout_constraintTop_toTopOf="@+id/gms_close_button" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <TextView
+        android:id="@+id/gms_subtitle_label"
+        style="@style/GiniMerchantTheme.Typography.Caption1"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/gms_large"
+        android:layout_marginEnd="@dimen/gms_large"
+        android:text="@string/gms_payment_provider_apps_list_description"
+        android:textColor="@color/gms_bank_selection_bottom_sheet_caption"
+        app:layout_constraintBottom_toTopOf="@id/gms_payment_provider_apps_list"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/gms_header_container" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/gms_payment_provider_apps_list"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:fadingEdgeLength="@dimen/gms_large_32"
+        android:requiresFadingEdge="vertical"
+        android:layout_marginHorizontal="@dimen/gms_large"
+        android:layout_marginTop="@dimen/gms_large"
+        app:layout_constraintBottom_toTopOf="@id/gms_powered_by_gini_layout"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHeight_default="wrap"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/gms_subtitle_label"
+        tools:itemCount="13"
+        tools:listitem="@layout/gms_item_payment_provider_app" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/gms_more_information_label"
+        style="@style/GiniMerchantTheme.Typography.Caption2"
+        android:layout_marginStart="@dimen/gms_large"
+        android:drawableStart="@drawable/gms_info_circle_icon"
+        android:drawableTint="@color/gms_more_information_color"
+        android:drawablePadding="@dimen/gms_medium"
+        android:text="@string/gms_more_information_underlined_part"
+        android:textColor="@color/gms_payment_component_caption"
+        android:gravity="center_vertical"
+        app:layout_constraintTop_toTopOf="@id/gms_powered_by_gini_layout"
+        app:layout_constraintBottom_toBottomOf="@id/gms_powered_by_gini_layout"
+        app:layout_constraintStart_toStartOf="parent"
+        />
+
+    <include layout="@layout/gms_powered_by_gini"
+        android:id="@+id/gms_powered_by_gini_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/gms_payment_provider_apps_list"
+        android:layout_marginVertical="@dimen/gms_large"
+        android:layout_marginEnd="@dimen/gms_large"
+        />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/layout/gms_bottom_sheet_install_app.xml b/merchant-sdk/sdk/src/main/res/layout/gms_bottom_sheet_install_app.xml
new file mode 100644
index 0000000000..9aa3828a95
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/layout/gms_bottom_sheet_install_app.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="@dimen/gms_large"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <com.google.android.material.bottomsheet.BottomSheetDragHandleView
+        style="@style/GiniMerchantTheme.Widget.BottomSheet.DragHandle"
+        android:id="@+id/drag_handle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        />
+
+    <TextView
+        android:id="@+id/gms_install_app_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="@string/gms_install_app_title"
+        style="@style/GiniMerchantTheme.Typography.Subtitle1"
+        android:layout_marginHorizontal="@dimen/gms_large"
+        android:textColor="@color/gms_install_app_title_color"
+        app:layout_constraintTop_toBottomOf="@id/drag_handle"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        />
+
+    <include layout="@layout/gms_payment_provider_icon_holder"
+        android:id="@+id/gms_payment_provider_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gms_medium_12"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/gms_install_app_title"
+        app:layout_constraintBottom_toTopOf="@id/gms_install_app_details"/>
+
+    <TextView
+        android:id="@+id/gms_install_app_details"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="@string/gms_install_app_detail"
+        android:drawableLeft="@drawable/gms_info_circle_icon"
+        android:drawablePadding="@dimen/gms_large"
+        android:drawableTint="@color/gms_install_app_details_color"
+        android:textColor="@color/gms_install_app_details_color"
+        style="@style/GiniMerchantTheme.Typography.Caption1"
+        android:layout_marginHorizontal="@dimen/gms_large"
+        android:layout_marginTop="@dimen/gms_large"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/gms_payment_provider_icon"
+        />
+
+    <Button
+        android:id="@+id/gms_forward_button"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        style="@style/GiniMerchantTheme.Widget.Button.OutlinedButton"
+        android:text="@string/gms_forward"
+        android:visibility="gone"
+        android:layout_marginBottom="@dimen/gms_small"
+        android:layout_marginHorizontal="@dimen/gms_large"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/gms_powered_by_gini_layout"
+        app:layout_constraintTop_toBottomOf="@id/gms_install_app_details"/>
+
+    <ImageButton
+        android:id="@+id/gms_play_store_logo"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:src="@drawable/gms_play_store_logo"
+        android:background="@null"
+        android:visibility="visible"
+        android:contentDescription="@string/gms_play_store_content_description"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/gms_powered_by_gini_layout"
+        app:layout_constraintTop_toBottomOf="@id/gms_install_app_details"
+        />
+
+    <include layout="@layout/gms_powered_by_gini"
+        android:id="@+id/gms_powered_by_gini_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginBottom="@dimen/gms_large"
+        android:layout_marginEnd="@dimen/gms_large"
+        />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/layout/gms_bottom_sheet_open_with.xml b/merchant-sdk/sdk/src/main/res/layout/gms_bottom_sheet_open_with.xml
new file mode 100644
index 0000000000..cf8dc8d049
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/layout/gms_bottom_sheet_open_with.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <com.google.android.material.bottomsheet.BottomSheetDragHandleView
+        style="@style/GiniMerchantTheme.Widget.BottomSheet.DragHandle"
+        android:id="@+id/drag_handle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gms_medium"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/gms_open_with_title"
+        android:text="@string/gms_open_with_title"
+        style="@style/GiniMerchantTheme.Typography.Subtitle1"
+        android:textColor="@color/gms_open_with_title"
+        android:layout_marginHorizontal="@dimen/gms_large"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/gms_open_with_details"
+        android:text="@string/gms_open_with_details"
+        style="@style/GiniMerchantTheme.Typography.Caption1"
+        android:textColor="@color/gms_open_with_details"
+        android:layout_marginHorizontal="@dimen/gms_large"
+        android:layout_marginTop="@dimen/gms_large"
+        />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginTop="@dimen/gms_large"
+        android:background="@color/gms_open_with_apps_background"
+        android:paddingHorizontal="@dimen/gms_large"
+        android:paddingVertical="@dimen/gms_large"
+        android:weightSum="5">
+            <include layout="@layout/gms_item_open_with_app"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"/>
+            <include layout="@layout/gms_item_open_with_app"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"/>
+            <include layout="@layout/gms_item_open_with_app"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"/>
+            <include layout="@layout/gms_item_open_with_app"
+                android:id="@+id/gms_app_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"/>
+            <include layout="@layout/gms_item_open_with_app"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"/>
+    </LinearLayout>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/gms_open_with_info"
+        android:layout_marginHorizontal="@dimen/gms_large"
+        android:text="@string/gms_open_with_info"
+        android:textColor="@color/gms_open_with_details"
+        android:layout_marginTop="@dimen/gms_large_20"
+        android:drawableStart="@drawable/gms_info_circle_icon"
+        android:drawablePadding="@dimen/gms_large"/>
+
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/gms_forward_button"
+        android:layout_marginHorizontal="@dimen/gms_large"
+        android:layout_marginTop="@dimen/gms_large_20"
+        style="@style/GiniMerchantTheme.Widget.Button.OutlinedButton"
+        android:text="@string/gms_forward"/>
+
+    <include layout="@layout/gms_powered_by_gini"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/gms_large_20"
+        android:layout_gravity="end"
+        android:layout_marginEnd="@dimen/gms_large"
+        android:layout_marginTop="@dimen/gms_small"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/layout/gms_bottom_sheet_payment_component.xml b/merchant-sdk/sdk/src/main/res/layout/gms_bottom_sheet_payment_component.xml
new file mode 100644
index 0000000000..4a4ad6b601
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/layout/gms_bottom_sheet_payment_component.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <com.google.android.material.bottomsheet.BottomSheetDragHandleView
+        style="@style/GiniMerchantTheme.Widget.BottomSheet.DragHandle"
+        android:id="@+id/drag_handle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="@dimen/gms_medium"
+        />
+
+    // In the Figma design the height of the drag handle component is 36dp
+    // In Material3 the height of the BottomSheetDragHandleView is 44dp - this is where the margin difference came from.
+    // Switched to constraint to top of the view, not the drag handle, and set marginTop to 36dp.
+    <net.gini.android.merchant.sdk.paymentcomponent.PaymentComponentView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/gms_payment_component"
+        android:layout_marginTop="@dimen/gms_large_36"
+        android:layout_marginHorizontal="@dimen/gms_large"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/layout/gms_bottom_sheet_review.xml b/merchant-sdk/sdk/src/main/res/layout/gms_bottom_sheet_review.xml
new file mode 100644
index 0000000000..8ee0af525f
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/layout/gms_bottom_sheet_review.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <com.google.android.material.bottomsheet.BottomSheetDragHandleView
+        android:id="@+id/drag_handle"
+        style="@style/GiniMerchantTheme.Widget.BottomSheet.DragHandle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="@dimen/gms_medium"
+        />
+
+    // In the Figma design the height of the drag handle component is 36dp
+    // In Material3 the height of the BottomSheetDragHandleView is 44dp - this is where the margin difference came from.
+    // Switched to constraint to top of the view, not the drag handle, and set marginTop to 36dp.
+    <net.gini.android.merchant.sdk.review.reviewComponent.ReviewView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/gms_review_layout"
+        android:layout_marginHorizontal="@dimen/gms_large"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="@dimen/gms_large_36"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/layout/gms_fragment_merchant.xml b/merchant-sdk/sdk/src/main/res/layout/gms_fragment_merchant.xml
new file mode 100644
index 0000000000..00f33489f0
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/layout/gms_fragment_merchant.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/gms_fragment_container_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        />
+    <ProgressBar
+        android:id="@+id/loading"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="gone"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/layout/gms_fragment_payment_more_information.xml b/merchant-sdk/sdk/src/main/res/layout/gms_fragment_payment_more_information.xml
new file mode 100644
index 0000000000..cc05099afe
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/layout/gms_fragment_payment_more_information.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:scrollbars="none">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:background="@color/gms_more_information_fragment_background"
+            android:clickable="true">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/gms_payment_providers_icons_list"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="@dimen/gms_large"
+                android:layout_marginHorizontal="@dimen/gms_large"
+                android:clipToPadding="true"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                />
+
+            <include layout="@layout/gms_powered_by_gini"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="@dimen/gms_medium"/>
+
+            <TextView
+                android:id="@+id/gms_more_information_title"
+                style="@style/GiniMerchantTheme.Typography.Subtitle1"
+                android:text="@string/gms_more_information_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/gms_large"
+                android:layout_marginHorizontal="@dimen/gms_large"/>
+
+            <TextView
+                android:id="@+id/gms_more_information_details"
+                style="@style/GiniMerchantTheme.Typography.Body2"
+                android:text="@string/gms_more_information_details"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/gms_medium"
+                android:layout_marginHorizontal="@dimen/gms_large"/>
+
+            <TextView
+                android:id="@+id/gms_faq_title"
+                style="@style/GiniMerchantTheme.Typography.Subtitle1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/gms_large"
+                android:layout_marginTop="@dimen/gms_large_24"
+                android:text="@string/gms_frequently_asked_questions"/>
+
+            <!-- Setting RTL direction is least hacky way to set indicator on the right side   -->
+            <ExpandableListView
+                android:id="@+id/gms_faq_list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginHorizontal="@dimen/gms_large"
+                android:layoutDirection="rtl"
+                android:nestedScrollingEnabled="false"
+                android:divider="@color/gms_faq_divider"
+                android:dividerHeight="@dimen/gms_small_1"
+                android:groupIndicator="@drawable/gms_expandable_list_icon"
+                android:scrollbars="none"
+                tools:listitem="@layout/gms_item_faq_label"/>
+        </LinearLayout>
+    </ScrollView>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/layout/gms_fragment_review.xml b/merchant-sdk/sdk/src/main/res/layout/gms_fragment_review.xml
new file mode 100644
index 0000000000..394999297a
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/layout/gms_fragment_review.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/gms_light_07">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/constraint_root"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.viewpager2.widget.ViewPager2
+            android:id="@+id/pager"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="@id/pager_negative_space"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:visibility="visible" />
+
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/indicator"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/gms_large"
+            android:background="@color/gms_light_07"
+            android:visibility="gone"
+            app:layout_constraintBottom_toTopOf="@id/payment_details_scrollview"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:tabBackground="@drawable/gms_tab_pager_selector"
+            app:tabGravity="center"
+            app:tabIndicatorHeight="0dp"
+            app:tabMaxWidth="@dimen/gms_large"
+            app:tabMode="fixed"
+            tools:visibility="visible" />
+
+        <Space
+            android:id="@+id/pager_negative_space"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/gms_large"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@id/indicator" />
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/payment_details_info_bar"
+            style="@style/GiniMerchantTheme.PaymentDetails.InfoBar"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:paddingBottom="@dimen/gms_medium_12"
+            app:layout_constraintBottom_toTopOf="@id/payment_details_scrollview"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent">
+
+            <TextView
+                style="@style/GiniMerchantTheme.PaymentDetails.InfoBar.TextView"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:paddingVertical="@dimen/gms_medium_12"
+                android:text="@string/gms_payment_details_info_bar_text"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <ScrollView
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            xmlns:app="http://schemas.android.com/apk/res-auto"
+            style="@style/GiniMerchantTheme.PaymentDetailsCard"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:id="@+id/payment_details_scrollview"
+            android:paddingHorizontal="@dimen/gms_large"
+            android:paddingTop="@dimen/gms_medium_12"
+            android:paddingBottom="@dimen/gms_zero"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent">
+            <net.gini.android.merchant.sdk.review.reviewComponent.ReviewView
+                android:id="@+id/gms_review_view"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+        </ScrollView>
+
+        <ProgressBar
+            android:id="@+id/loading"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageButton
+            android:id="@+id/close"
+            style="@style/GiniMerchantTheme.CloseButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/gms_small"
+            android:layout_marginEnd="@dimen/gms_large"
+            android:nextFocusForward="@id/recipient_layout"
+            android:contentDescription="@string/gms_close_content_description"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/layout/gms_item_faq_answer.xml b/merchant-sdk/sdk/src/main/res/layout/gms_item_faq_answer.xml
new file mode 100644
index 0000000000..7a3d072189
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/layout/gms_item_faq_answer.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical">
+    <TextView
+        android:id="@+id/gms_faq_answer_label"
+        style="@style/GiniMerchantTheme.Typography.Body2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/gms_large"/>
+    <com.google.android.material.divider.MaterialDivider
+        android:id="@+id/divider2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:dividerColor="@color/gms_faq_divider"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/layout/gms_item_faq_label.xml b/merchant-sdk/sdk/src/main/res/layout/gms_item_faq_label.xml
new file mode 100644
index 0000000000..6f64e18bbb
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/layout/gms_item_faq_label.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/gms_faq_label"
+    style="@style/GiniMerchantTheme.Typography.Body1"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="@dimen/gms_large_24"
+    android:paddingVertical="@dimen/gms_large_24"/>
diff --git a/merchant-sdk/sdk/src/main/res/layout/gms_item_open_with_app.xml b/merchant-sdk/sdk/src/main/res/layout/gms_item_open_with_app.xml
new file mode 100644
index 0000000000..265c14dcba
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/layout/gms_item_open_with_app.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:paddingHorizontal="@dimen/gms_small">
+
+    <com.google.android.material.imageview.ShapeableImageView
+        android:layout_width="@dimen/gms_large_36"
+        android:layout_height="@dimen/gms_large_36"
+        android:id="@+id/gms_app_icon"
+        android:background="@color/gms_open_with_app_placeholder"
+        android:elevation="1dp"
+        android:layout_gravity="center_horizontal"
+        android:scaleType="fitCenter"
+        android:outlineSpotShadowColor="#66000000"
+        app:shapeAppearanceOverlay="@style/GiniMerchantTheme.Widget.RoundShapeableImageView.Corners"
+        />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/gms_app_name"
+        android:layout_marginTop="@dimen/gms_medium_10"
+        android:maxLines="2"
+        android:text="@string/gms_open_with_app"
+        style="@style/GiniMerchantTheme.Typography.Caption2"
+        android:textColor="@color/gms_open_with_details"
+        android:gravity="center_horizontal"
+        android:paddingHorizontal="@dimen/gms_small_1"/>
+    
+</LinearLayout>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/layout/gms_item_page_error.xml b/merchant-sdk/sdk/src/main/res/layout/gms_item_page_error.xml
new file mode 100644
index 0000000000..d749115525
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/layout/gms_item_page_error.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_gravity="center"
+        tools:ignore="UselessParent">
+
+        <TextView
+            android:id="@+id/page_error_text"
+            style="@style/GiniMerchantTheme.PageErrorText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/gms_error_failed_to_load_image" />
+
+        <Button
+            android:id="@+id/page_error_retry"
+            style="Widget.MaterialComponents.Button.OutlinedButton"
+            android:layout_gravity="center_horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/gms_snackbar_retry" />
+    </LinearLayout>
+</FrameLayout>
diff --git a/merchant-sdk/sdk/src/main/res/layout/gms_item_page_horizontal.xml b/merchant-sdk/sdk/src/main/res/layout/gms_item_page_horizontal.xml
new file mode 100644
index 0000000000..e02af69fc0
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/layout/gms_item_page_horizontal.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.github.chrisbanes.photoview.PhotoView
+        android:id="@+id/image"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingTop="@dimen/gms_zero"
+        tools:ignore="ContentDescription" />
+
+    <ProgressBar
+        android:id="@+id/loading"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center" />
+
+    <include
+        android:id="@+id/error"
+        layout="@layout/gms_item_page_error"
+        android:visibility="gone"
+        android:layout_gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/layout/gms_item_payment_provider_app.xml b/merchant-sdk/sdk/src/main/res/layout/gms_item_payment_provider_app.xml
new file mode 100644
index 0000000000..4b501deb8b
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/layout/gms_item_payment_provider_app.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="@dimen/gms_medium"
+    android:background="@drawable/gms_selectable_payment_provider_background"
+    >
+
+    <include layout="@layout/gms_payment_provider_picker_button"
+        android:id="@+id/gms_selector_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@null"
+        />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/layout/gms_payment_provider_icon_holder.xml b/merchant-sdk/sdk/src/main/res/layout/gms_payment_provider_icon_holder.xml
new file mode 100644
index 0000000000..f69209359e
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/layout/gms_payment_provider_icon_holder.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.imageview.ShapeableImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/gms_payment_provider_icon"
+    android:layout_width="@dimen/gms_large_36"
+    android:layout_height="@dimen/gms_large_36"
+    android:layout_marginHorizontal="@dimen/gms_small_2"
+    android:padding="@dimen/gms_small_1"
+    android:scaleType="fitXY"
+    app:shapeAppearanceOverlay="@style/GiniMerchantTheme.Widget.ShapeableImageView.Corners"
+    app:strokeColor="@color/gms_payment_provider_border_color"
+    app:strokeWidth="@dimen/gms_small_1" />
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/layout/gms_payment_provider_picker_button.xml b/merchant-sdk/sdk/src/main/res/layout/gms_payment_provider_picker_button.xml
new file mode 100644
index 0000000000..22bf974c04
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/layout/gms_payment_provider_picker_button.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+    <Button
+        android:id="@+id/gms_select_bank_button"
+        style="@style/GiniMerchantTheme.Widget.Button.PaymentProviderPicker"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:drawableRight="@drawable/gms_chevron_down_icon"
+        android:gravity="start|center_vertical"
+        android:text="@string/gms_select_bank"
+        android:layout_marginStart="-8dp"
+        android:clickable="false"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/gms_payment_provider_app_icon_holder"
+        app:layout_constraintTop_toTopOf="parent"
+        />
+    <include android:id="@+id/gms_payment_provider_app_icon_holder"
+        layout="@layout/gms_payment_provider_icon_holder"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/gms_large"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/layout/gms_payment_provider_selector_button.xml b/merchant-sdk/sdk/src/main/res/layout/gms_payment_provider_selector_button.xml
new file mode 100644
index 0000000000..7056ae5b46
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/layout/gms_payment_provider_selector_button.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+    <Button
+        android:id="@+id/gms_select_bank_button"
+        style="@style/GiniMerchantTheme.Widget.Button.PaymentProviderSelector"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:drawableRight="@drawable/gms_chevron_down_icon"
+        android:gravity="start|center_vertical"
+        android:text="@string/gms_select_bank"
+        android:layout_marginStart="-8dp"
+        android:clickable="false"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/gms_payment_provider_app_icon_holder"
+        app:layout_constraintTop_toTopOf="parent"
+        />
+    <include android:id="@+id/gms_payment_provider_app_icon_holder"
+        layout="@layout/gms_payment_provider_icon_holder"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/gms_large"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/layout/gms_powered_by_gini.xml b/merchant-sdk/sdk/src/main/res/layout/gms_powered_by_gini.xml
new file mode 100644
index 0000000000..76c153e3bc
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/layout/gms_powered_by_gini.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:contentDescription="@string/gms_powered_by_gini_content_description"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <TextView
+        android:id="@+id/gms_powered_by_gini_label"
+        style="@style/GiniMerchantTheme.Typography.Caption2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/gms_payment_powered_by_label"
+        android:textColor="@color/gms_payment_component_caption"
+        android:contentDescription="@string/gms_powered_by_gini_content_description"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"/>
+
+    <ImageView
+        android:id="@+id/gms_gini_logo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/gms_small"
+        app:layout_constraintBottom_toBottomOf="@id/gms_powered_by_gini_label"
+        app:layout_constraintStart_toEndOf="@id/gms_powered_by_gini_label"
+        app:layout_constraintTop_toTopOf="@id/gms_powered_by_gini_label"
+        app:srcCompat="@drawable/gms_gini_logo" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/layout/gms_review.xml b/merchant-sdk/sdk/src/main/res/layout/gms_review.xml
new file mode 100644
index 0000000000..0a5a884d26
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/layout/gms_review.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/gms_payment_details"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/recipient_layout"
+        style="@style/GiniMerchantTheme.PaymentInputLayout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/gms_medium"
+        android:nextFocusForward="@id/iban_layout"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/iban_layout">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/recipient"
+            style="@style/GiniMerchantTheme.DisabledPaymentInputEditTextStyle"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingTop="@dimen/gms_large_28"
+            android:paddingBottom="@dimen/gms_medium"
+            android:paddingStart="@dimen/gms_medium_12"
+            android:paddingEnd="@dimen/gms_zero"
+            />
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/iban_layout"
+        style="@style/GiniMerchantTheme.PaymentInputLayout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/gms_medium"
+        android:paddingTop="@dimen/gms_medium"
+        app:layout_constraintEnd_toStartOf="@id/amount_layout"
+        app:layout_constraintHorizontal_weight="@dimen/gms_float_0.7"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/amount_layout">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/iban"
+            style="@style/GiniMerchantTheme.DisabledPaymentInputEditTextStyle"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingTop="@dimen/gms_large_28"
+            android:paddingBottom="@dimen/gms_medium"
+            android:paddingStart="@dimen/gms_medium_12"
+            android:paddingEnd="@dimen/gms_zero"
+            android:nextFocusDown="@id/amount" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/amount_layout"
+        style="@style/GiniMerchantTheme.PaymentInputLayout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/gms_medium"
+        app:errorContentDescription="@string/gms_invalid_amount_content_description"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_weight="@dimen/gms_float_0.3"
+        app:layout_constraintStart_toEndOf="@id/iban_layout"
+        app:layout_constraintTop_toTopOf="@id/iban_layout"
+        app:suffixText="€">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/amount"
+            style="@style/GiniMerchantTheme.PaymentInputEditTextStyle"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingTop="@dimen/gms_large_28"
+            android:paddingBottom="@dimen/gms_medium"
+            android:paddingEnd="@dimen/gms_medium"
+            android:digits="0123456789.,"
+            android:hint="@string/gms_amount_hint"
+            android:inputType="numberDecimal" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/iban_amount_barrier_bottom"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="bottom"
+        app:constraint_referenced_ids="iban_layout,amount_layout" />
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/purpose_layout"
+        style="@style/GiniMerchantTheme.PaymentInputLayout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/gms_medium"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/iban_amount_barrier_bottom"
+        app:layout_constraintBottom_toTopOf="@id/payment">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/purpose"
+            style="@style/GiniMerchantTheme.DisabledPaymentInputEditTextStyle"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingTop="@dimen/gms_large_28"
+            android:paddingBottom="@dimen/gms_medium"
+            android:paddingStart="@dimen/gms_medium_12"
+            android:paddingEnd="@dimen/gms_zero" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/payment"
+        style="@style/GiniMerchantTheme.Widget.Button.OutlinedButton"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gms_medium"
+        android:enabled="false"
+        android:text="@string/gms_pay_button"
+        android:gravity="center"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/purpose_layout" />
+
+    <ProgressBar
+        android:id="@+id/payment_progress"
+        style="@style/GiniMerchant.PaymentButtonProgressStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:padding="@dimen/gms_medium"
+        app:layout_constraintBottom_toBottomOf="@id/payment"
+        app:layout_constraintEnd_toEndOf="@id/payment"
+        app:layout_constraintStart_toStartOf="@id/payment"
+        app:layout_constraintTop_toTopOf="@id/payment" />
+
+    <include layout="@layout/gms_powered_by_gini"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/gms_large"
+        android:layout_marginBottom="@dimen/gms_medium"
+        android:layout_marginTop="@dimen/gms_small"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/payment"
+        app:layout_constraintEnd_toEndOf="parent"
+        />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</merge>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/layout/gms_view_payment_component.xml b/merchant-sdk/sdk/src/main/res/layout/gms_view_payment_component.xml
new file mode 100644
index 0000000000..5f1d9cf5b6
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/layout/gms_view_payment_component.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <TextView
+        android:id="@+id/gms_select_bank_label"
+        style="@style/GiniMerchantTheme.Typography.Subtitle2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/gms_large"
+        android:text="@string/gms_select_bank_label"
+        android:textColor="@color/gms_select_bank_and_pay_color"
+        android:visibility="gone"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/gms_select_bank_picker_layout"
+        android:layout_marginTop="@dimen/gms_medium"
+        android:minHeight="@dimen/gms_accessibility_min_height"
+        app:layout_constraintTop_toBottomOf="@id/gms_select_bank_label"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <include layout="@layout/gms_view_single_line_bank_selection"
+            android:id="@+id/gms_single_row_bank_selection"
+            android:visibility="gone"
+            />
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/gms_two_rows_bank_selection"
+            android:visibility="visible"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <!--  Including the layout in a FrameLayout because background cannot be set on an `include` widget  -->
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/gms_large"
+                android:layout_marginBottom="@dimen/gms_medium"
+                android:background="@drawable/gms_bordered_background"
+                android:id="@+id/gms_two_rows_container"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                >
+                <include layout="@layout/gms_payment_provider_selector_button"
+                    android:id="@+id/gms_select_bank_picker"
+                    tools:visibility="visible"/>
+            </FrameLayout>
+
+            <Button
+                android:id="@+id/gms_pay_invoice_button_two_rows"
+                style="@style/GiniMerchantTheme.Widget.Button.OutlinedButton"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/gms_large"
+                android:layout_marginBottom="@dimen/gms_small"
+                android:layout_marginTop="@dimen/gms_medium"
+                android:text="@string/gms_pay_invoice_button"
+                android:visibility="gone"
+                app:layout_constraintBottom_toTopOf="@id/gms_powered_by_gini_label"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/gms_two_rows_container" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <FrameLayout
+        android:id="@+id/gms_powered_by_gini"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/gms_medium"
+        android:layout_marginBottom="@dimen/gms_medium"
+        android:layout_marginEnd="@dimen/gms_large"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/gms_select_bank_picker_layout">
+        <include layout="@layout/gms_powered_by_gini"/>
+    </FrameLayout>
+
+    <TextView
+        android:id="@+id/gms_more_information"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/gms_powered_by_gini"
+        app:layout_constraintTop_toTopOf="@id/gms_powered_by_gini"
+        app:layout_constraintBottom_toBottomOf="@id/gms_powered_by_gini"
+        style="@style/GiniMerchantTheme.Typography.Caption2"
+        android:layout_marginStart="@dimen/gms_large"
+        android:drawableStart="@drawable/gms_info_circle_icon"
+        android:drawablePadding="@dimen/gms_medium"
+        android:drawableTint="@color/gms_info_button_tint"
+        android:text="@string/gms_more_information_underlined_part"
+        android:textColor="@color/gms_payment_component_caption"
+        android:gravity="center_vertical"
+        android:visibility="visible"
+        android:ellipsize="end"
+        android:lines="1"
+        />
+</merge>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/layout/gms_view_single_line_bank_selection.xml b/merchant-sdk/sdk/src/main/res/layout/gms_view_single_line_bank_selection.xml
new file mode 100644
index 0000000000..0a2b9030a8
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/layout/gms_view_single_line_bank_selection.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:layout_constraintTop_toTopOf="parent">
+    <View
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:id="@+id/gms_background_view"
+        android:background="@drawable/gms_bordered_background"
+        app:layout_constraintStart_toStartOf="@id/gms_select_bank_button"
+        app:layout_constraintEnd_toEndOf="@id/gms_select_bank_button"
+        app:layout_constraintTop_toTopOf="@id/gms_select_bank_button"
+        app:layout_constraintBottom_toBottomOf="@id/gms_select_bank_button"/>
+
+    <include android:id="@+id/gms_payment_provider_app_icon_holder"
+        layout="@layout/gms_payment_provider_icon_holder"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/gms_medium"
+        app:layout_constraintStart_toStartOf="@id/gms_select_bank_button"
+        app:layout_constraintTop_toTopOf="@id/gms_select_bank_button"
+        app:layout_constraintBottom_toBottomOf="@id/gms_select_bank_button"
+        />
+
+    <Button
+        android:id="@+id/gms_select_bank_button"
+        style="@style/GiniMerchantTheme.Widget.Button.PaymentProviderSelector"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:drawableRight="@drawable/gms_chevron_down_icon"
+        android:layout_marginHorizontal="@dimen/gms_large"
+        android:clickable="false"
+        android:gravity="start|center_vertical"
+        android:paddingHorizontal="@dimen/gms_large"
+        android:contentDescription="@string/gms_select_bank_content_description"
+        app:layout_constraintHorizontal_chainStyle="spread_inside"
+        app:layout_constraintHorizontal_weight="1"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/gms_pay_invoice_button"
+        app:layout_constraintTop_toTopOf="parent"
+        />
+
+    <Button
+        android:id="@+id/gms_pay_invoice_button"
+        style="@style/GiniMerchantTheme.Widget.Button.OutlinedButton"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_marginEnd="@dimen/gms_large"
+        android:layout_marginStart="-4dp"
+        android:text="@string/gms_pay_invoice_button"
+        android:visibility="visible"
+        android:maxLines="1"
+        android:singleLine="true"
+        android:ellipsize="end"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/gms_background_view"
+        app:layout_constraintBottom_toBottomOf="@id/gms_background_view"
+        app:layout_constraintStart_toEndOf="@id/gms_select_bank_button"
+        app:layout_constraintHorizontal_weight="2.8"
+        />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/values-en/strings.xml b/merchant-sdk/sdk/src/main/res/values-en/strings.xml
new file mode 100644
index 0000000000..051e699e3d
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/values-en/strings.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="gms_amount_hint">Amount</string>
+    <string name="gms_purpose_hint">Reference number</string>
+    <string name="gms_recipient_hint">Recipient</string>
+    <string name="gms_iban_hint">IBAN</string>
+    <string name="gms_pay_button">To the banking app</string>
+    <string name="gms_continue_to_overview">Continue to Overview</string>
+    <string name="gms_bank_placeholder">Loading...</string>
+    <string name="gms_error_failed_to_load_image">Failed to load image</string>
+    <string name="gms_error_input_invalid_iban">IBAN is not valid.</string>
+    <string name="gms_error_input_amount_format">Invalid format</string>
+    <string name="gms_error_input_recipient_empty">Recipient is required.</string>
+    <string name="gms_error_input_iban_empty">IBAN is required.</string>
+    <string name="gms_error_input_amount_empty">Invalid.</string>
+    <string name="gms_error_input_purpose_empty">Purpose is required.</string>
+    <string name="gms_snackbar_retry">Retry</string>
+    <string name="gms_payment_details_info_bar_text">Please check the prefilled values</string>
+
+    <string name="gms_more_information_label">Transfer payment data to the banking app and pay there directly.</string>
+    <string name="gms_more_information_underlined_part"><u>More information.</u></string>
+    <string name="gms_select_bank_label">Select your bank to pay</string>
+    <string name="gms_select_bank">Your Bank</string>
+    <string name="gms_pay_invoice_button">Pay the invoice</string>
+    <string name="gms_payment_powered_by_label">Powered by</string>
+    <string name="gms_payment_provider_apps_list_description">You can only pay the bill if you have an account with one of the banks listed below.</string>
+
+    <!--  More Information & FAQ  -->
+    <string name="gms_more_information_title">Pay bills easily with the banking app.</string>
+    <string name="gms_more_information_details">Medical bills and other submitted receipts can now be paid very easily.\n\nThe payment data such as IBAN, amount, recipient and purpose are seamlessly transferred to the banking app, and the payment only needs to be confirmed there.\n\nYou can also park the invoice and pay it within 3 months after uploading.\n\nThe data is encrypted and transferred securely to your banking app. The data protection regulations of your bank apply.\n\nSupported by the largest banks. Integration by
+</string>
+    <string name="gms_frequently_asked_questions">Frequently asked questions</string>
+    <string name="gms_faq_1">Can I submit invoices and pay them later?</string>
+    <string name="gms_faq_2">Is the service free of charge?</string>
+    <string name="gms_faq_3">Is my data secure?</string>
+    <string name="gms_faq_4">Who or what is Gini?</string>
+    <string name="gms_faq_5">What format must the submitted invoice have?</string>
+    <string name="gms_faq_6">How do I know which banks are supported?</string>
+    <string name="gms_faq_answer_1">Yes, this is possible. Larger amounts in particular can be paid after the reimbursement has been made.</string>
+    <string name="gms_faq_answer_2">Yes, transferring the payment data to the selected banking app is free of charge. Charges may apply for the actual transfer, depending on the account model - please contact your bank for further details.</string>
+    <string name="gms_faq_answer_3">Yes, the data is transferred to the banking app in encrypted form via a Gini server. Gini receives the payment data and forwards it to the banking app. There you always have the option of checking the payment data before the transfer is executed. Gini has concluded contracts with the insurance company and the banks for this purpose, and both regularly audit us.</string>
+    <string name="gms_faq_answer_4">Gini simplifies payments. The Munich-based company behind the photo payment works with the leading German banks and insurance companies to enable direct payment with your bank.
+Gini is ISO 27001 certified for maximum data security and operates its own server machines in an ISO 27001 certified data center in Germany. Further information can be found in the %p and on the %s.</string>
+    <string name="gms_faq_answer_5">Whether a photo of an invoice, screenshot or digital PDF - any format is suitable. Please ensure that all payment information, such as IBAN, recipient, purpose and amount, are visible and not cut off.</string>
+    <string name="gms_faq_answer_6">The banks that support the Gini payment function are displayed in the bank selection menu. To use it, you must have installed your bank\'s mobile banking app on the same smartphone or tablet on which you use the insurance app. If you have not installed any of the banking apps, you can download them from the Apple App Store or Google Playstore. Subsequent activation of the banking app may be necessary.</string>
+    <string name="gms_gini_link">Gini</string>
+    <string name="gms_gini_website">Gini website</string>
+    <string name="gms_gini_link_url">https://gini.net/en</string>
+    <string name="gms_more_information_fragment_title">More Information</string>
+    <string name="gms_privacy_policy">privacy policy</string>
+
+    <string name="gms_payment_provider_logo_content_description">logo</string>
+    <string name="gms_close_content_description">Close</string>
+    <string name="gms_invalid_amount_content_description">Invalid amount</string>
+    <string name="gms_powered_by_gini_content_description">Powered by Gini</string>
+    <string name="gms_select_bank_content_description">Select Bank</string>
+
+    <!--  Install App  -->
+    <string name="gms_install_app_detail">Note: You must first update or install the %s app from the Google Play Store.</string>
+    <string name="gms_install_app_title">Invoice data ready to share with the %s bank</string>
+    <string name="gms_install_app_tap_to_continue">Tip: Tap \'Forward\' to complete the payment in the %s app.</string>
+    <string name="gms_forward">Forward</string>
+    <string name="gms_play_store_content_description">Google Play Store</string>
+
+    <!--  Open With bottom sheet  -->
+    <string name="gms_open_with_title">Invoice data ready to share with the %s bank</string>
+    <string name="gms_open_with_details">In the next step, select the %s app to open and complete your payment in the banking app.</string>
+    <string name="gms_open_with_info">Tip: if you don\'t see the app scroll until you find the %s app. If you haven\'t installed the %s app yet,</string>
+    <string name="gms_open_with_download_app">download it from the store</string>
+    <string name="gms_sharing_file">Sharing 1 file</string>
+
+    <string name="gms_generic_error_message">Oops, something went wrong. Please try again.</string>
+</resources>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/values-night/colors.xml b/merchant-sdk/sdk/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000000..bed02e4192
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/values-night/colors.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="gms_payment_component_caption">@color/gms_light_04</color>
+    <color name="gms_bank_selection_bottom_sheet_caption">@color/gms_light_03</color>
+    <color name="gms_bank_selection_bottom_sheet_title">@color/gms_light_02</color>
+    <color name="gms_more_information_fragment_background">@color/gms_light_07</color>
+    <color name="gms_payment_provider_border_color">@color/gms_light_05</color>
+    <color name="gms_payment_input_border_color">@color/gms_light_05</color>
+    <color name="gms_payment_input_hint">@color/gms_light_04</color>
+    <color name="gms_bordered_background_color">@color/gms_light_06</color>
+    <color name="gms_bank_selector_button_color">@color/gms_light_01</color>
+    <color name="gms_payment_details_background_color">@color/gms_light_07</color>
+    <color name="gms_payment_input_background_color">@color/gms_light_06</color>
+    <color name="gms_faq_divider">@color/gms_light_05</color>
+    <color name="gms_bottom_sheet_scrim">#fff</color>
+    <color name="gms_install_app_title_color">@color/gms_light_02</color>
+    <color name="gms_install_app_details_color">@color/gms_light_03</color>
+    <color name="gms_select_bank_and_pay_color">@color/gms_light_01</color>
+    <color name="gms_info_button_tint">@color/gms_light_02</color>
+    <color name="gms_more_information_color">@color/gms_light_02</color>
+
+    <!--  Open With  -->
+    <color name="gms_open_with_title">@color/gms_light_02</color>
+    <color name="gms_open_with_details">@color/gms_light_03</color>
+    <color name="gms_open_with_apps_background">@color/gms_light_05</color>
+    <color name="gms_open_with_app_placeholder">@color/gms_light_07</color>
+
+    <color name="gms_disabled_field_text_color">@color/gms_light_04</color>
+    <color name="gms_amount_field_border">@color/gms_light_01</color>
+
+</resources>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/values-night/styles.xml b/merchant-sdk/sdk/src/main/res/values-night/styles.xml
new file mode 100644
index 0000000000..3e0d99a5a7
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/values-night/styles.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!-- region Theme -->
+
+    <style name="GiniMerchantTheme" parent="Root.GiniMerchantTheme">
+        <item name="colorPrimary">@color/gms_accent_01</item>
+        <item name="colorPrimaryDark">@color/gms_dark_01</item>
+        <item name="colorOnPrimary">@color/gms_light_01</item>
+        <item name="colorSurface">@color/gms_light_07</item>
+        <item name="backgroundColor">@color/gms_dark_01</item>
+        <item name="colorOnBackground">@color/gms_light_01</item>
+        <item name="dividerColor">@color/gms_dark_02</item>
+        <item name="colorSurfaceInverse">@color/gms_light_04</item>
+        <item name="colorOnSurfaceInverse">@color/gms_dark_02</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <!-- endregion -->
+
+    <!-- region Widgets -->
+
+    <style name="GiniMerchantTheme.Widget.Button.OutlinedButton" parent="Root.GiniMerchantTheme.Widget.Button.OutlinedButton">
+        <item name="strokeColor">@color/gms_light_05</item>
+    </style>
+
+    <style name="GiniMerchantTheme.Widget.Button.IconButton" parent="Root.GiniMerchantTheme.Widget.Button.IconButton">
+        <item name="iconTint">@color/gms_light_02</item>
+    </style>
+
+    <style name="GiniMerchantTheme.ThemeOverlay.BottomSheetDialog" parent="Root.GiniMerchantTheme.ThemeOverlay.BottomSheetDialog">
+        <item name="colorPrimary">@color/gms_light_07</item>
+        <item name="bottomSheetStyle">@style/GiniMerchantTheme.Widget.BottomSheet</item>
+    </style>
+
+    <style name="GiniMerchantTheme.Widget.BottomSheet" parent="Root.GiniMerchantTheme.Widget.BottomSheet">
+        <item name="backgroundTint">@color/gms_light_07</item>
+    </style>
+
+    <style name="GiniMerchantTheme.Widget.BottomSheet.DragHandle" parent="Root.GiniMerchantTheme.Widget.BottomSheet.DragHandle">
+        <item name="tint">@color/gms_light_05</item>
+    </style>
+    <!-- endregion -->
+    
+</resources>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/values/colors.xml b/merchant-sdk/sdk/src/main/res/values/colors.xml
new file mode 100644
index 0000000000..dfab887a50
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/values/colors.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="gms_accent_01">#009EDC</color>
+    <color name="gms_accent_02">#45B4DF</color>
+    <color name="gms_accent_03">#89C8E1</color>
+    <color name="gms_accent_04">#BFE7F6</color>
+    <color name="gms_accent_05">#E5F5FB</color>
+
+    <color name="gms_dark_01">#191D30</color>
+    <color name="gms_dark_02">#565656</color>
+    <color name="gms_dark_03">#808080</color>
+    <color name="gms_dark_04">#8A8A8E</color>
+    <color name="gms_dark_05">#E8E9EB</color>
+    <color name="gms_dark_06">#F3F3F3</color>
+    <color name="gms_dark_07">#FAFAFA</color>
+
+    <color name="gms_light_01">#F2F2F2</color>
+    <color name="gms_light_02">#E8E9EB</color>
+    <color name="gms_light_03">#f3f3f3</color>
+    <color name="gms_light_04">#8A8A8E</color>
+    <color name="gms_light_05">#565656</color>
+    <color name="gms_light_06">#353535</color>
+    <color name="gms_light_07">#212121</color>
+
+    <color name="gms_success_01">#B0B347</color>
+    <color name="gms_success_02">#D5D6A0</color>
+    <color name="gms_success_03">#E7E8CD</color>
+    <color name="gms_success_04">#F2F2E7</color>
+
+    <color name="gms_feedback_01">#FA1C1C</color>
+    <color name="gms_feedback_02">#F19597</color>
+    <color name="gms_feedback_03">#ECD0D0</color>
+    <color name="gms_feedback_04">#EEDEDE</color>
+
+    <color name="gms_payment_component_caption">@color/gms_dark_04</color>
+    <color name="gms_bank_selection_bottom_sheet_caption">@color/gms_dark_03</color>
+    <color name="gms_bank_selection_bottom_sheet_title">@color/gms_dark_02</color>
+    <color name="gms_payment_details_background_color">@color/gms_dark_07</color>
+    <color name="gms_payment_input_border_color">@color/gms_dark_05</color>
+    <color name="gms_payment_input_background_color">@color/gms_dark_06</color>
+    <color name="gms_payment_input_hint">@color/gms_dark_04</color>
+    <color name="gms_more_information_fragment_background">@color/gms_dark_07</color>
+    <color name="gms_payment_provider_border_color">@color/gms_dark_05</color>
+    <color name="gms_bordered_background_color">@color/gms_dark_06</color>
+    <color name="gms_bank_selector_button_color">@color/gms_dark_01</color>
+    <color name="gms_faq_divider">@color/gms_dark_05</color>
+    <color name="gms_bottom_sheet_scrim">#000</color>
+    <color name="gms_install_app_title_color">@color/gms_dark_02</color>
+    <color name="gms_install_app_details_color">@color/gms_dark_03</color>
+    <color name="gms_select_bank_and_pay_color">@color/gms_dark_01</color>
+    <color name="gms_info_button_tint">@color/gms_dark_02</color>
+    <color name="gms_more_information_color">@color/gms_dark_02</color>
+
+    <!--  Open With  -->
+    <color name="gms_open_with_title">@color/gms_dark_02</color>
+    <color name="gms_open_with_details">@color/gms_dark_03</color>
+    <color name="gms_open_with_apps_background">@color/gms_dark_05</color>
+    <color name="gms_open_with_app_placeholder">@color/gms_dark_07</color>
+
+    <color name="gms_container_fragment_background">#60565656</color>
+    <color name="gms_disabled_field_text_color">@color/gms_dark_04</color>
+    <color name="gms_amount_field_border">@color/gms_dark_01</color>
+
+</resources>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/values/dimens.xml b/merchant-sdk/sdk/src/main/res/values/dimens.xml
new file mode 100644
index 0000000000..f42de7bef3
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/values/dimens.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <dimen name="gms_zero">0dp</dimen>
+    <dimen name="gms_small_1">1dp</dimen>
+    <dimen name="gms_small_2">2dp</dimen>
+    <dimen name="gms_small">4dp</dimen>
+    <dimen name="gms_medium">8dp</dimen>
+    <dimen name="gms_medium_10">10dp</dimen>
+    <dimen name="gms_medium_12">12dp</dimen>
+    <dimen name="gms_large">16dp</dimen>
+    <dimen name="gms_large_18">18dp</dimen>
+    <dimen name="gms_large_20">20dp</dimen>
+    <dimen name="gms_large_22">22dp</dimen>
+    <dimen name="gms_large_24">24dp</dimen>
+    <dimen name="gms_large_28">28dp</dimen>
+    <dimen name="gms_large_32">32dp</dimen>
+    <dimen name="gms_large_36">36dp</dimen>
+    <dimen name="gms_large_48">48dp</dimen>
+    <dimen name="gms_large_50">50dp</dimen>
+    <dimen name="gms_large_56">56dp</dimen>
+    <dimen name="gms_large_60">60dp</dimen>
+    <dimen name="gms_large_64">64dp</dimen>
+    <dimen name="gms_large_80">80dp</dimen>
+    <dimen name="gms_large_96">96dp</dimen>
+    <dimen name="gms_large_100">100dp</dimen>
+
+    <dimen name="gms_accessibility_min_height">44dp</dimen>
+    <dimen name="gms_payment_component_height">0dp</dimen>
+    <dimen name="gms_install_app_min_height">320dp</dimen>
+
+    <item name="gms_float_0.7" format="float" type="dimen">0.7</item>
+    <item name="gms_float_0.3" format="float" type="dimen">0.3</item>
+    <item name="gms_float_0.5" format="float" type="dimen">0.5</item>
+
+</resources>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/values/ids.xml b/merchant-sdk/sdk/src/main/res/values/ids.xml
new file mode 100644
index 0000000000..0d628dcf8b
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/values/ids.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item
+        type="id"
+        name="text_input_layout_tag_is_error_enabled" />
+    <item
+        type="id"
+        name="text_input_layout_tag_error_string_id" />
+</resources>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/values/strings.xml b/merchant-sdk/sdk/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..5d70933fd4
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/values/strings.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="gms_amount_hint">Betrag</string>
+    <string name="gms_purpose_hint">Verwendungszweck</string>
+    <string name="gms_recipient_hint">Empfänger</string>
+    <string name="gms_iban_hint">IBAN</string>
+    <string name="gms_pay_button">Zur Banking App</string>
+    <string name="gms_continue_to_overview">Weiter zur Übersicht</string>
+    <string name="gms_bank_placeholder">Wird geladen...</string>
+    <string name="gms_error_failed_to_load_image">Bild konnte nicht geladen werden</string>
+    <string name="gms_error_input_invalid_iban">IBAN ist ungültig.</string>
+    <string name="gms_error_input_amount_format">Ungültiges Format für Bezahlbetrag</string>
+    <string name="gms_error_input_recipient_empty">Empfänger ist notwendig.</string>
+    <string name="gms_error_input_iban_empty">IBAN ist notwendig.</string>
+    <string name="gms_error_input_amount_empty">Ungültig.</string>
+    <string name="gms_error_input_purpose_empty">Verwendungszweck ist notwendig.</string>
+    <string name="gms_snackbar_retry">Wiederholen</string>
+    <string name="gms_payment_details_info_bar_text">Bitte überprüfe die vorausgefüllten Felder</string>
+
+    <string name="gms_more_information_label">Bezahldaten an Banking-App übergeben und dort direkt bezahlen.</string>
+    <string name="gms_more_information_underlined_part"><u>Mehr Informationen.</u></string>
+    <string name="gms_select_bank_label">Bank auswählen und bezahlen</string>
+    <string name="gms_select_bank">Ihre Bank</string>
+    <string name="gms_pay_invoice_button">Rechnung bezahlen</string>
+    <string name="gms_payment_powered_by_label">Powered by</string>
+    <string name="gms_payment_provider_apps_list_description">Sie können die Rechnung nur bezahlen, wenn Sie ein Konto bei einer der unten aufgeführten Banken haben.</string>
+
+    <!--  More Information & FAQ  -->
+    <string name="gms_more_information_title">Rechnungen ganz einfach mit der Banking-App bezahlen.</string>
+    <string name="gms_more_information_details">Arztrechnungen und andere eingereichte Belege können jetzt ganz einfach bezahlt werden.\n\nDie Bezahldaten wie IBAN, Betrag, Empfänger und Verwendungszweck werden nahtlos in die Banking-App übergeben und dort nur noch bestätigt.\n\nSie können die Rechnung auch parken und innerhalb von 3 Monaten nach Upload begleichen.\n\nDie für die Zahlung notwendigen Daten werden verschlüsselt und sicher an Ihre Banking-App übertragen. Es gelten die Datenschutzbestimmungen Ihrer Bank.\n\nUnterstützt von den größten Bankinstituten. Integration durch
+</string>
+    <string name="gms_frequently_asked_questions">Häufig gestellte Fragen</string>
+    <string name="gms_faq_1">Kann ich Rechnungen einreichen und später bezahlen?</string>
+    <string name="gms_faq_2">Ist der Service kostenlos?</string>
+    <string name="gms_faq_3">Sind meine Daten sicher?</string>
+    <string name="gms_faq_4">Wer oder Was ist Gini?</string>
+    <string name="gms_faq_5">Welches Format muss die eingereichte Rechnung haben?</string>
+    <string name="gms_faq_6">Wie erkenne ich, welche Banken unterstützt werden?</string>
+    <string name="gms_faq_answer_1">Ja, das ist möglich. So können insbesondere größere Beträge erst nach der erfolgten Erstattung bezahlt werden.</string>
+    <string name="gms_faq_answer_2">Ja, die Übertragung der Bezahldaten in die gewählte Banking-App ist kostenlos. Für die eigentliche Überweisung können je nach Kontenmodell Gebühren anfallen – wenden Sie sich bitte für weitere Details an Ihre Bank.</string>
+    <string name="gms_faq_answer_3">Ja! Die Übertragung der Daten an die Banking-App erfolgt verschlüsselt über einen Server von Gini. Gini nimmt die Zahlungsdaten entgegen und leitet sie in die Banking-App weiter. Dort besteht stets die Möglichkeit, die Zahlungsdaten zu überprüfen, bevor die Überweisung ausgeführt wird. Gini hat hierfür sowohl mit der Versicherung als auch mit den Banken Verträge geschlossen, und wir lassen uns regelmäßig von beiden auditieren.</string>
+    <string name="gms_faq_answer_4">Gini macht das Bezahlen automagisch einfach. Das Münchner Unternehmen, das hinter der Fotoüberweisung steht, arbeitet mit den führenden deutschen Banken und Versicherungen zusammen, um die direkte Zahlung mit der Hausbank zu ermöglichen.
+        Gini ist für maximale Datensicherheit ISO 27001 zertifiziert und betreibt eigene Rechner in einem ISO 27001 zertifizierten Rechenzentrum in Deutschland. Weitere Informationen finden Sie in der %p sowie auf der %s.</string>
+    <string name="gms_faq_answer_5">Ob Foto einer Rechnung, Screenshot, oder digitales PDF – jedes Format ist geeignet. Bitte achten Sie lediglich darauf, dass alle Bezahlinformationen, wie IBAN, Empfänger, Verwendungszweck und Betrag sichtbar und nicht abgeschnitten sind.</string>
+    <string name="gms_faq_answer_6">Im Bank-Auswahlmenü werden die Banken angezeigt, die die Gini-Bezahlfunktion unterstützen. Voraussetzung für die Nutzung ist, dass Sie die mobile Banking-App ihrer Bank auf demselben Smartphone oder Tablet installiert haben, auf dem Sie die Versicherungs-App nutzen. Sollten Sie keine der Banking-Apps installiert haben, können Sie diese aus dem Apple App- oder Google Playstore herunterladen. Eine anschließende Aktivierung der Banking-App kann nötig sein.</string>
+    <string name="gms_gini_link">Gini</string>
+    <string name="gms_gini_website">Website von Gini</string>
+    <string name="gms_gini_link_url">https://gini.net/</string>
+    <string name="gms_more_information_fragment_title">Mehr Informationen</string>
+    <string name="gms_privacy_policy">Datenschutzerklärung</string>
+    <string name="gms_privacy_policy_link_url"/>
+
+    <string name="gms_payment_provider_logo_content_description">logo</string>
+    <string name="gms_close_content_description">Schließen</string>
+    <string name="gms_invalid_amount_content_description">Ungültiger Bezahlbetrag</string>
+    <string name="gms_powered_by_gini_content_description">Powered by Gini</string>
+    <string name="gms_select_bank_content_description">Bank Auswählen</string>
+
+    <!--  Install App  -->
+    <string name="gms_install_app_detail">Hinweis: Bitte aktualisieren oder installieren Sie zunächst die %s-App aus dem Google Play Store.</string>
+    <string name="gms_install_app_title">Rechnungsdaten bereit zum Teilen mit der %s</string>
+    <string name="gms_install_app_tap_to_continue">Tipp: Tippen Sie auf \'Weiter\', um die Zahlung in der %s-App abzuschließen.</string>
+    <string name="gms_forward">Weiter</string>
+    <string name="gms_play_store_content_description">Google Play Store</string>
+
+    <!--  Open With bottom sheet  -->
+    <string name="gms_open_with_title">Rechnungsdaten bereit zum Teilen mit der %s</string>
+    <string name="gms_open_with_details">Im nächsten Schritt wählen Sie die %s-App auf der Seite aus, um Ihre Zahlung in der Banking-App abzuschließen.</string>
+    <string name="gms_open_with_info">Tipp: Scrollen Sie, bis Sie die %s-App finden. Wenn Sie die DKB-App noch nicht installiert haben,</string>
+    <string name="gms_open_with_download_app">laden Sie sie im Store herunter</string>
+    <string name="gms_open_with_app">App</string>
+
+    <string name="gms_generic_error_message">Oh da ist was schief gelaufen. Probiere es bitte noch einmal.</string>
+</resources>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/values/styles.xml b/merchant-sdk/sdk/src/main/res/values/styles.xml
new file mode 100644
index 0000000000..a939e1e373
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/values/styles.xml
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!-- region Theme -->
+
+    <!-- Override this to change the theme for the Merchant SDK -->
+    <style name="Root.GiniMerchantTheme" parent="Theme.Material3.DayNight">
+        <item name="colorPrimary">@color/gms_accent_01</item>
+        <item name="colorPrimaryDark">@color/gms_light_02</item>
+        <item name="colorOnPrimary">@color/gms_light_01</item>
+        <item name="backgroundColor">@color/gms_light_01</item>
+        <item name="colorOnBackground">@color/gms_dark_01</item>
+        <item name="dividerColor">@color/gms_light_02</item>
+        <item name="colorSurface">@color/gms_dark_07</item>
+        <item name="colorOnSurface">?attr/colorOnBackground</item>
+        <item name="colorSurfaceInverse">@color/gms_dark_01</item>
+        <item name="colorOnSurfaceInverse">@color/gms_light_02</item>
+        <item name="colorSurfaceVariant">@color/gms_light_01</item>
+        <item name="colorOnSurfaceVariant">?attr/colorOnBackground</item>
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="colorAccent">?attr/colorPrimary</item>
+        <item name="alertDialogTheme">@style/GiniMerchantTheme.ThemeOverlay.Dialog.Alert</item>
+        <item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Surface</item>
+        <item name="bottomSheetDialogTheme">@style/GiniMerchantTheme.ThemeOverlay.BottomSheetDialog</item>
+        <item name="textAppearanceHeadline1">@style/GiniMerchantTheme.Typography.Headline1</item>
+        <item name="textAppearanceHeadline2">@style/GiniMerchantTheme.Typography.Headline2</item>
+        <item name="textAppearanceHeadline3">@style/GiniMerchantTheme.Typography.Headline3</item>
+        <item name="textAppearanceBody1">@style/GiniMerchantTheme.Typography.Body1</item>
+        <item name="textAppearanceBody2">@style/GiniMerchantTheme.Typography.Body2</item>
+        <item name="textAppearanceSubtitle1">@style/GiniMerchantTheme.Typography.Subtitle1</item>
+        <item name="textAppearanceSubtitle2">@style/GiniMerchantTheme.Typography.Subtitle2</item>
+        <item name="textAppearanceButton">@style/GiniMerchantTheme.Typography.Button</item>
+        <item name="textAppearanceCaption">@style/GiniMerchantTheme.Typography.Caption1</item>
+        <item name="textAppearanceOverline">@style/GiniMerchantTheme.Typography.Caption2</item>
+        <item name="textAppearanceDisplaySmall">?attr/textAppearanceHeadline1</item>
+        <item name="textAppearanceHeadlineLarge">?attr/textAppearanceHeadline2</item>
+        <item name="textAppearanceHeadlineMedium">?attr/textAppearanceHeadline3</item>
+        <item name="textAppearanceHeadlineSmall">?attr/textAppearanceHeadline4</item>
+        <item name="textAppearanceTitleLarge">?attr/textAppearanceHeadline5</item>
+        <item name="textAppearanceTitleMedium">?attr/textAppearanceSubtitle1</item>
+        <item name="textAppearanceTitleSmall">?attr/textAppearanceSubtitle2</item>
+        <item name="textAppearanceBodyLarge">?attr/textAppearanceBody1</item>
+        <item name="textAppearanceBodyMedium">?attr/textAppearanceBody2</item>
+        <item name="textAppearanceBodySmall">?attr/textAppearanceCaption</item>
+        <item name="textAppearanceLabelLarge">?attr/textAppearanceButton</item>
+        <item name="textAppearanceLabelMedium">?attr/textAppearanceOverline</item>
+        <item name="snackbarStyle">@style/GiniMerchantTheme.Widget.Snackbar</item>
+        <item name="snackbarButtonStyle">@style/GiniMerchantTheme.Widget.Snackbar.Button</item>
+        <item name="snackbarTextViewStyle">@style/GiniMerchantTheme.Widget.Snackbar.TextView</item>
+    </style>
+    <style name="GiniMerchantTheme" parent="Root.GiniMerchantTheme"/>
+
+    <style name="GiniMerchantTheme.ThemeOverlay.Dialog.Alert" parent="ThemeOverlay.MaterialComponents.Dialog.Alert">
+        <item name="colorPrimary">?attr/colorPrimary</item>
+    </style>
+
+    <!-- endregion -->
+
+    <!-- region Widgets -->
+
+    <style name="Root.GiniMerchantTheme.Widget.Button.UnelevatedButton" parent="Widget.Material3.Button.UnelevatedButton">
+        <item name="cornerRadius">@dimen/gms_small</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:autoSizeTextType">uniform</item>
+        <item name="android:autoSizeMaxTextSize">16sp</item>
+        <item name="android:minHeight">@dimen/gms_large_56</item>
+        <item name="android:insetTop">@dimen/gms_zero</item>
+        <item name="android:insetBottom">@dimen/gms_zero</item>
+        <item name="android:backgroundTint">@color/gms_unelevated_button_background</item>
+        <item name="android:textColor">@color/gms_unelevated_button_text</item>
+    </style>
+    <style name="GiniMerchantTheme.Widget.Button.UnelevatedButton" parent="Root.GiniMerchantTheme.Widget.Button.UnelevatedButton"/>
+
+    <style name="Root.GiniMerchantTheme.Widget.Button.IconButton" parent="Widget.Material3.Button.IconButton">
+        <item name="iconTint">@color/gms_dark_02</item>
+        <item name="android:insetTop">@dimen/gms_zero</item>
+        <item name="android:insetBottom">@dimen/gms_zero</item>
+    </style>
+    <style name="GiniMerchantTheme.Widget.Button.IconButton" parent="Root.GiniMerchantTheme.Widget.Button.IconButton"/>
+
+    <style name="Root.GiniMerchantTheme.Widget.Button.OutlinedButton" parent="Widget.Material3.Button.OutlinedButton">
+        <item name="cornerRadius">@dimen/gms_small</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:autoSizeTextType">uniform</item>
+        <item name="android:autoSizeMaxTextSize">16sp</item>
+        <item name="android:minHeight">@dimen/gms_large_56</item>
+        <item name="strokeColor">@color/gms_dark_05</item>
+        <item name="android:insetTop">@dimen/gms_zero</item>
+        <item name="android:insetBottom">@dimen/gms_zero</item>
+        <item name="iconPadding">@dimen/gms_large</item>
+        <item name="materialThemeOverlay">@style/GiniMerchantTheme.ThemeOverlay.Button.OutlinedButton.Picker</item>
+        <item name="android:textColor">@color/gms_outlined_button_text</item>
+        <item name="android:textAppearance">@style/GiniMerchantTheme.Typography.Button.Picker</item>
+    </style>
+    <style name="GiniMerchantTheme.Widget.Button.OutlinedButton" parent="Root.GiniMerchantTheme.Widget.Button.OutlinedButton"/>
+
+    <style name="Root.GiniMerchantTheme.ThemeOverlay.Button.OutlinedButton.Picker" parent="ThemeOverlay.Material3.Button">
+        <item name="colorPrimary">@color/gms_outlined_button_background</item>
+    </style>
+    <style name="GiniMerchantTheme.ThemeOverlay.Button.OutlinedButton.Picker" parent="Root.GiniMerchantTheme.ThemeOverlay.Button.OutlinedButton.Picker" />
+
+    <style name="Root.GiniMerchantTheme.ThemeOverlay.BottomSheetDialog" parent="ThemeOverlay.Material3.BottomSheetDialog">
+        <item name="colorPrimary">@color/gms_dark_07</item>
+        <item name="bottomSheetStyle">@style/GiniMerchantTheme.Widget.BottomSheet</item>
+    </style>
+    <style name="GiniMerchantTheme.ThemeOverlay.BottomSheetDialog" parent="Root.GiniMerchantTheme.ThemeOverlay.BottomSheetDialog" />
+
+    <style name="Root.GiniMerchantTheme.Widget.BottomSheet" parent="Widget.Material3.BottomSheet.Modal">
+        <item name="backgroundTint">@color/gms_dark_07</item>
+        <item name="shapeAppearance">@style/GiniMerchantTheme.Widget.BottomSheet.ShapeAppearance</item>
+    </style>
+    <style name="GiniMerchantTheme.Widget.BottomSheet" parent="Root.GiniMerchantTheme.Widget.BottomSheet" />
+
+    <style name="Root.GiniMerchantTheme.Widget.BottomSheet.ShapeAppearance" parent="ShapeAppearance.Material3.LargeComponent">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">@dimen/gms_medium_12</item>
+    </style>
+    <style name="GiniMerchantTheme.Widget.BottomSheet.ShapeAppearance" parent="Root.GiniMerchantTheme.Widget.BottomSheet.ShapeAppearance" />
+
+    <style name="Root.GiniMerchantTheme.Widget.BottomSheet.DragHandle" parent="Widget.Material3.BottomSheet.DragHandle">
+        <item name="tint">@color/gms_dark_05</item>
+    </style>
+    <style name="GiniMerchantTheme.Widget.BottomSheet.DragHandle" parent="Root.GiniMerchantTheme.Widget.BottomSheet.DragHandle" />
+
+    <style name="Root.GiniMerchantTheme.Widget.ShapeableImageView.Corners" parent="">
+        <item name="cornerSize">@dimen/gms_small_2</item>
+        <item name="cornerFamily">rounded</item>
+    </style>
+    <style name="GiniMerchantTheme.Widget.ShapeableImageView.Corners" parent="Root.GiniMerchantTheme.Widget.ShapeableImageView.Corners"/>
+
+    <style name="Root.GiniMerchantTheme.Widget.RoundShapeableImageView.Corners" parent="">
+        <item name="cornerSize">50%</item>
+        <item name="cornerFamily">rounded</item>
+    </style>
+    <style name="GiniMerchantTheme.Widget.RoundShapeableImageView.Corners" parent="Root.GiniMerchantTheme.Widget.RoundShapeableImageView.Corners"/>
+
+
+    <style name="Root.GiniMerchantTheme.Widget.Button.TransparentBackground" parent="Root.GiniMerchantTheme.Widget.Button.UnelevatedButton">
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:textColor">@color/gms_bank_selector_button_color</item>
+    </style>
+    <style name="GiniMerchantTheme.Widget.Button.TransparentBackground" parent="Root.GiniMerchantTheme.Widget.Button.TransparentBackground"/>
+
+    <style name="Root.GiniMerchantTheme.Widget.Snackbar" parent="Widget.Material3.Snackbar">
+        <item name="android:backgroundTint">?attr/backgroundColor</item>
+    </style>
+    <style name="GiniMerchantTheme.Widget.Snackbar" parent="Root.GiniMerchantTheme.Widget.Snackbar" />
+
+    <style name="Root.GiniMerchantTheme.Widget.Snackbar.Button" parent="Widget.Material3.Button.TextButton.Snackbar">
+        <item name="android:textColor">?attr/colorAccent</item>
+    </style>
+    <style name="GiniMerchantTheme.Widget.Snackbar.Button" parent="Root.GiniMerchantTheme.Widget.Snackbar.Button" />
+
+    <style name="Root.GiniMerchantTheme.Widget.Snackbar.TextView" parent="Widget.Material3.Snackbar.TextView">
+        <item name="android:textColor">?attr/colorOnBackground</item>
+    </style>
+    <style name="GiniMerchantTheme.Widget.Snackbar.TextView" parent="Root.GiniMerchantTheme.Widget.Snackbar.TextView" />
+    
+    <!-- endregion -->
+
+    <style name="Root.GiniMerchantTheme.PaymentInputLayout" parent="Widget.MaterialComponents.TextInputLayout.FilledBox">
+        <item name="errorIconDrawable">@null</item>
+        <item name="cornerRadius">@dimen/gms_small</item>
+        <item name="hintTextAppearance">@style/GiniMerchantTheme.Typography.Caption2</item>
+        <item name="android:textColorHint">@color/gms_payment_input_hint</item>
+        <item name="boxStrokeWidth">@dimen/gms_zero</item>
+        <item name="boxStrokeWidthFocused">@dimen/gms_zero</item>
+        <item name="boxBackgroundColor">@android:color/transparent</item>
+        <item name="boxCornerRadiusBottomStart">@dimen/gms_small</item>
+        <item name="boxCornerRadiusBottomEnd">@dimen/gms_small</item>
+        <item name="errorTextColor">@color/gms_feedback_01</item>
+        <item name="errorTextAppearance">@style/GiniMerchantTheme.Typography.Caption2</item>
+    </style>
+    <style name="GiniMerchantTheme.PaymentInputLayout" parent="Root.GiniMerchantTheme.PaymentInputLayout"/>
+
+    <style name="Root.GiniMerchantTheme.PaymentInputEditTextStyle" parent="Widget.MaterialComponents.TextInputEditText.FilledBox">
+        <item name="android:singleLine">true</item>
+        <item name="android:background">@drawable/gms_payment_input_edit_text_background</item>
+        <item name="android:textAppearance">@style/GiniMerchantTheme.Typography.Body1</item>
+        <item name="android:textColor">?attr/colorOnBackground</item>
+    </style>
+    <style name="GiniMerchantTheme.PaymentInputEditTextStyle" parent="Root.GiniMerchantTheme.PaymentInputEditTextStyle"/>
+
+    <style name="Root.GiniMerchantTheme.DisabledPaymentInputEditTextStyle" parent="Widget.MaterialComponents.TextInputEditText.FilledBox">
+        <item name="android:singleLine">true</item>
+        <item name="android:background">@drawable/gms_payment_input_edit_text_background</item>
+        <item name="android:textAppearance">@style/GiniMerchantTheme.Typography.Body1</item>
+        <item name="android:textColor">@color/gms_disabled_field_text_color</item>
+    </style>
+    <style name="GiniMerchantTheme.DisabledPaymentInputEditTextStyle" parent="Root.GiniMerchantTheme.DisabledPaymentInputEditTextStyle"/>
+
+    <style name="Root.GiniMerchantTheme.PageErrorText">
+        <item name="android:textColor">@color/gms_dark_07</item>
+    </style>
+    <!-- Style for error text that is displayed when loading a page fails -->
+    <style name="GiniMerchantTheme.PageErrorText" parent="Root.GiniMerchantTheme.PageErrorText" />
+
+    <style name="Root.GiniMerchantTheme.PaymentDetailsCard">
+        <item name="android:background">@drawable/gms_payment_details_background</item>
+        <item name="android:elevation">@dimen/gms_medium_12</item>
+    </style>
+
+    <!-- Style for the Payment Details card in ReviewFragment-->
+    <style name="GiniMerchantTheme.PaymentDetailsCard" parent="Root.GiniMerchantTheme.PaymentDetailsCard" />
+
+    <style name="Root.GiniMerchantTheme.PaymentButtonProgressStyle">
+        <item name="android:translationZ" tools:targetApi="lollipop">@dimen/gms_large_100</item>
+    </style>
+
+    <!-- Style for the progress indicator that is displayed on top of the Pay button in ReviewFragment -->
+    <style name="GiniMerchant.PaymentButtonProgressStyle" parent="Root.GiniMerchantTheme.PaymentButtonProgressStyle" />
+
+    <style name="Root.GiniMerchantTheme.CloseButtonStyle" parent="Widget.AppCompat.ImageButton">
+        <item name="android:minWidth">@dimen/gms_large_50</item>
+        <item name="android:minHeight">@dimen/gms_large_50</item>
+        <item name="android:background">@drawable/gms_close_button</item>
+    </style>
+
+    <!-- Style for close button in ReviewFragment -->
+    <style name="GiniMerchantTheme.CloseButtonStyle" parent="Root.GiniMerchantTheme.CloseButtonStyle"/>
+
+    <style name="Root.GiniMerchantTheme.PaymentDetails.InfoBar" parent="">
+        <item name="android:background">@drawable/gms_payment_details_info_bar_background</item>
+    </style>
+    <style name="GiniMerchantTheme.PaymentDetails.InfoBar" parent="Root.GiniMerchantTheme.PaymentDetails.InfoBar" />
+
+    <style name="Root.GiniMerchantTheme.PaymentDetails.InfoBar.TextView" parent="Widget.MaterialComponents.TextView">
+        <item name="android:gravity">center</item>
+        <item name="android:textAppearance">@style/GiniMerchantTheme.PaymentDetails.InfoBar.TextAppearance</item>
+    </style>
+    <style name="GiniMerchantTheme.PaymentDetails.InfoBar.TextView" parent="Root.GiniMerchantTheme.PaymentDetails.InfoBar.TextView" />
+
+    <style name="Root.GiniMerchantTheme.PaymentDetails.InfoBar.TextAppearance" parent="GiniMerchantTheme.Typography.Caption1">
+        <item name="android:textColor">@color/gms_dark_07</item>
+    </style>
+    <style name="GiniMerchantTheme.PaymentDetails.InfoBar.TextAppearance" parent="Root.GiniMerchantTheme.PaymentDetails.InfoBar.TextAppearance" />
+
+    <style name="Root.GiniMerchantTheme.Widget.Button.PaymentProviderSelector" parent="GiniMerchantTheme.Widget.Button.TransparentBackground">
+        <item name="android:textAppearance">@style/GiniMerchantTheme.Typography.Input</item>
+    </style>
+    <style name="GiniMerchantTheme.Widget.Button.PaymentProviderSelector" parent="Root.GiniMerchantTheme.Widget.Button.PaymentProviderSelector"/>
+    
+    <style name="Root.GiniMerchantTheme.Widget.Button.PaymentProviderPicker" parent="GiniMerchantTheme.Widget.Button.TransparentBackground">
+        <item name="android:textAppearance">@style/GiniMerchantTheme.Typography.Body1</item>
+    </style>
+    <style name="GiniMerchantTheme.Widget.Button.PaymentProviderPicker" parent="Root.GiniMerchantTheme.Widget.Button.PaymentProviderPicker"/>
+</resources>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/main/res/values/typography.xml b/merchant-sdk/sdk/src/main/res/values/typography.xml
new file mode 100644
index 0000000000..ce1684abcd
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/values/typography.xml
@@ -0,0 +1,111 @@
+<resources>
+
+    <style name="Root.GiniMerchantTheme.Typography.Headline1" parent="TextAppearance.MaterialComponents.Headline1">
+        <item name="android:textSize">26sp</item>
+        <item name="android:textColor">?attr/colorOnBackground</item>
+        <item name="android:lineSpacingMultiplier">1.3</item>
+    </style>
+
+    <style name="Root.GiniMerchantTheme.Typography.Headline2" parent="TextAppearance.MaterialComponents.Headline2">
+        <item name="android:textSize">20sp</item>
+        <item name="android:textColor">?attr/colorOnBackground</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:lineSpacingMultiplier">1.4</item>
+    </style>
+
+    <style name="Root.GiniMerchantTheme.Typography.Headline3" parent="TextAppearance.MaterialComponents.Headline3">
+        <item name="android:textSize">18sp</item>
+        <item name="android:textColor">?attr/colorOnBackground</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:lineSpacingMultiplier">1.3</item>
+    </style>
+
+    <style name="Root.GiniMerchantTheme.Typography.Subtitle1" parent="TextAppearance.MaterialComponents.Subtitle1">
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">?attr/colorOnBackground</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:lineSpacingMultiplier">1.5</item>
+    </style>
+
+    <style name="Root.GiniMerchantTheme.Typography.Subtitle2" parent="TextAppearance.MaterialComponents.Subtitle2">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">?attr/colorOnBackground</item>
+        <!-- Medium weight. See "weight" here for details: https://developer.android.com/training/wearables/wff/group/part/text/font -->
+        <item name="android:textFontWeight">500</item>
+        <item name="android:lineSpacingMultiplier">1.2</item>
+    </style>
+
+    <style name="Root.GiniMerchantTheme.Typography.Body1" parent="TextAppearance.MaterialComponents.Body1">
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">?attr/colorOnBackground</item>
+        <!-- See "weight" here for details: https://developer.android.com/training/wearables/wff/group/part/text/font -->
+        <item name="android:textFontWeight">400</item>
+        <item name="android:lineSpacingMultiplier">1.2</item>
+    </style>
+
+    <style name="Root.GiniMerchantTheme.Typography.Body2" parent="TextAppearance.MaterialComponents.Body2">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">?attr/colorOnBackground</item>
+        <item name="android:lineSpacingMultiplier">1.35</item>
+    </style>
+
+    <style name="Root.GiniMerchantTheme.Typography.Button" parent="TextAppearance.MaterialComponents.Button">
+        <item name="android:textSize">16sp</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:textColor">?attr/colorOnBackground</item>
+        <!-- See "weight" here for details: https://developer.android.com/training/wearables/wff/group/part/text/font -->
+        <item name="android:textFontWeight">700</item>
+        <item name="android:lineSpacingMultiplier">1.5</item>
+    </style>
+
+    <style name="Root.GiniMerchantTheme.Typography.Button.Picker" parent="Root.GiniMerchantTheme.Typography.Button">
+        <!-- See "weight" here for details: https://developer.android.com/training/wearables/wff/group/part/text/font -->
+        <item name="android:textFontWeight">500</item>
+    </style>
+
+    <style name="Root.GiniMerchantTheme.Typography.Button.ListItem" parent="Root.GiniMerchantTheme.Typography.Button">
+        <!-- See "weight" here for details: https://developer.android.com/training/wearables/wff/group/part/text/font -->
+        <item name="android:textFontWeight">400</item>
+    </style>
+
+    <style name="Root.GiniMerchantTheme.Typography.Caption1" parent="TextAppearance.MaterialComponents.Caption">
+        <item name="android:textSize">13sp</item>
+        <item name="android:textColor">?attr/colorOnBackground</item>
+        <item name="android:lineSpacingMultiplier">1.0</item>
+    </style>
+
+    <style name="Root.GiniMerchantTheme.Typography.Caption2" parent="TextAppearance.MaterialComponents.Caption">
+        <item name="android:textSize">12sp</item>
+        <item name="android:textColor">?attr/colorOnBackground</item>
+        <item name="android:lineSpacingMultiplier">1.33</item>
+    </style>
+
+    <style name="Root.GiniMerchantTheme.Typography.Link" parent="TextAppearance.MaterialComponents.Body2">
+        <item name="android:textColor">@color/gms_accent_01</item>
+        <item name="android:textFontWeight">700</item>
+        <item name="android:lineSpacingMultiplier">1.57</item>
+    </style>
+
+    <style name="Root.GiniMerchantTheme.Typography.Input" parent="TextAppearance.MaterialComponents.Button">
+        <item name="android:textColor">?attr/colorOnBackground</item>
+        <item name="android:textSize">14sp</item>
+        <!-- See "weight" here for details: https://developer.android.com/training/wearables/wff/group/part/text/font -->
+        <item name="android:textFontWeight">500</item>
+        <item name="android:lineSpacingMultiplier">1.57</item>
+    </style>
+
+    <style name="GiniMerchantTheme.Typography.Headline1" parent="Root.GiniMerchantTheme.Typography.Headline1"/>
+    <style name="GiniMerchantTheme.Typography.Headline2" parent="Root.GiniMerchantTheme.Typography.Headline2"/>
+    <style name="GiniMerchantTheme.Typography.Headline3" parent="Root.GiniMerchantTheme.Typography.Headline3"/>
+    <style name="GiniMerchantTheme.Typography.Body1" parent="Root.GiniMerchantTheme.Typography.Body1"/>
+    <style name="GiniMerchantTheme.Typography.Body2" parent="Root.GiniMerchantTheme.Typography.Body2"/>
+    <style name="GiniMerchantTheme.Typography.Subtitle1" parent="Root.GiniMerchantTheme.Typography.Subtitle1"/>
+    <style name="GiniMerchantTheme.Typography.Subtitle2" parent="Root.GiniMerchantTheme.Typography.Subtitle2"/>
+    <style name="GiniMerchantTheme.Typography.Button" parent="Root.GiniMerchantTheme.Typography.Button"/>
+    <style name="GiniMerchantTheme.Typography.Button.Picker" parent="Root.GiniMerchantTheme.Typography.Button.Picker"/>
+    <style name="GiniMerchantTheme.Typography.Button.ListItem" parent="Root.GiniMerchantTheme.Typography.Button.ListItem"/>
+    <style name="GiniMerchantTheme.Typography.Caption1" parent="Root.GiniMerchantTheme.Typography.Caption1"/>
+    <style name="GiniMerchantTheme.Typography.Caption2" parent="Root.GiniMerchantTheme.Typography.Caption2"/>
+    <style name="GiniMerchantTheme.Typography.Link" parent="Root.GiniMerchantTheme.Typography.Link"/>
+    <style name="GiniMerchantTheme.Typography.Input" parent="Root.GiniMerchantTheme.Typography.Input"/>
+</resources>
diff --git a/merchant-sdk/sdk/src/main/res/xml/file_paths.xml b/merchant-sdk/sdk/src/main/res/xml/file_paths.xml
new file mode 100644
index 0000000000..30c4032eb2
--- /dev/null
+++ b/merchant-sdk/sdk/src/main/res/xml/file_paths.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <external-cache-path name="external_cache" path="." />
+</paths>
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/GiniMerchantTest.kt b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/GiniMerchantTest.kt
new file mode 100644
index 0000000000..8c4fabd2ec
--- /dev/null
+++ b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/GiniMerchantTest.kt
@@ -0,0 +1,52 @@
+package net.gini.android.merchant.sdk
+
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import io.mockk.every
+import io.mockk.mockk
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import net.gini.android.health.api.GiniHealthAPI
+import net.gini.android.health.api.HealthApiDocumentManager
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+@ExperimentalCoroutinesApi
+class GiniMerchantTest {
+
+    private var context: Context? = null
+    private lateinit var giniMerchant: GiniMerchant
+    private val giniHealthAPI: GiniHealthAPI = mockk(relaxed = true) { GiniHealthAPI::class.java }
+    private val documentManager: HealthApiDocumentManager = mockk(relaxed = true) { HealthApiDocumentManager::class.java }
+
+    @Before
+    fun setUp() {
+        context = ApplicationProvider.getApplicationContext()
+        context!!.setTheme(R.style.GiniMerchantTheme)
+        every { giniHealthAPI.documentManager } returns documentManager
+        giniMerchant = GiniMerchant(mockk(relaxed = true)).apply {
+            replaceHealthApiInstance(this@GiniMerchantTest.giniHealthAPI)
+        }
+        val paymentComponent = PaymentComponent(context!!, giniHealthAPI)
+        giniMerchant.paymentComponent = paymentComponent
+    }
+
+    @Test(expected = IllegalStateException::class)
+    fun `throws IllegalStateException when trying to create PaymentFragment with incomplete information`() = runTest {
+        giniMerchant.createFragment("", "", "30", "")
+    }
+
+    @Test
+    fun `creates PaymentFragment when non-empty values are used`() = runTest {
+        // When
+        val paymentFragment = giniMerchant.createFragment("1234", "recipient", "30", "purpose")
+
+        // Then
+        assertThat(paymentFragment).isNotNull()
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/bankselectionbottomsheet/BankSelectionBottomSheetTest.kt b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/bankselectionbottomsheet/BankSelectionBottomSheetTest.kt
new file mode 100644
index 0000000000..c44a649276
--- /dev/null
+++ b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/bankselectionbottomsheet/BankSelectionBottomSheetTest.kt
@@ -0,0 +1,111 @@
+package net.gini.android.merchant.sdk.bankselectionbottomsheet
+
+import androidx.fragment.app.testing.launchFragmentInContainer
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth
+import io.mockk.every
+import io.mockk.mockk
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.MutableStateFlow
+import net.gini.android.health.api.models.PaymentProvider
+import net.gini.android.merchant.sdk.R
+import net.gini.android.merchant.sdk.bankselection.BankSelectionBottomSheet
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentProviderAppsState
+import net.gini.android.merchant.sdk.paymentcomponent.SelectedPaymentProviderAppState
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderApp
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderAppColors
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+
+@ExperimentalCoroutinesApi
+@RunWith(AndroidJUnit4::class)
+class BankSelectionBottomSheetTest {
+
+    private var paymentComponent: PaymentComponent? = null
+    private var paymentProvider1 = PaymentProviderApp(
+        name = "payment provider",
+        icon = null,
+        colors = PaymentProviderAppColors(-1, -1),
+        paymentProvider = PaymentProvider(
+            id = "payment provider id",
+            name = "payment provider name",
+            packageName = "com.paymentProvider.packageName",
+            appVersion = "appVersion",
+            colors = PaymentProvider.Colors(backgroundColorRGBHex = "", textColoRGBHex = ""),
+            icon = ByteArray(0),
+            gpcSupportedPlatforms = listOf("android"),
+            openWithSupportedPlatforms = listOf("android")
+        )
+    )
+
+    private var paymentProvider2 = PaymentProviderApp(
+        name = "payment provider 2",
+        icon = null,
+        colors = PaymentProviderAppColors(-1, -1),
+        paymentProvider = PaymentProvider(
+            id = "payment provider id",
+            name = "payment provider name",
+            packageName = "com.paymentProvider.packageName",
+            appVersion = "appVersion",
+            colors = PaymentProvider.Colors(backgroundColorRGBHex = "", textColoRGBHex = ""),
+            icon = ByteArray(0),
+            gpcSupportedPlatforms = listOf("android"),
+            openWithSupportedPlatforms = listOf("android")
+        )
+    )
+
+    private var paymentProvider3 = PaymentProviderApp(
+        name = "payment provider 3",
+        icon = null,
+        colors = PaymentProviderAppColors(-1, -1),
+        paymentProvider = PaymentProvider(
+            id = "payment provider id",
+            name = "payment provider name",
+            packageName = "com.paymentProvider.packageName",
+            appVersion = "appVersion",
+            colors = PaymentProvider.Colors(backgroundColorRGBHex = "", textColoRGBHex = ""),
+            icon = ByteArray(0),
+            gpcSupportedPlatforms = listOf("android"),
+            openWithSupportedPlatforms = listOf("android")
+        )
+    )
+
+    @Before
+    fun setup() {
+        paymentComponent = mockk(relaxed = true)
+    }
+
+    @After
+    fun tearDown() {
+        paymentComponent = null
+    }
+
+    @Test
+    fun `displays correct number of payment providers when returned from view model`() {
+        every {paymentComponent!!.paymentProviderAppsFlow} returns MutableStateFlow(
+            PaymentProviderAppsState.Success(
+            listOf(
+                paymentProvider1,
+                paymentProvider2,
+                paymentProvider3
+            )
+        ))
+        every { paymentComponent!!.selectedPaymentProviderAppFlow } returns MutableStateFlow(
+            SelectedPaymentProviderAppState.NothingSelected)
+
+        // When
+        launchFragmentInContainer {
+            BankSelectionBottomSheet.newInstance(paymentComponent!!)
+        }
+
+        // Then
+        onView(withId(R.id.gms_payment_provider_apps_list)).check { view, _ -> Truth.assertThat((view as RecyclerView).adapter!!.itemCount).isEqualTo(3) }
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/bankselectionbottomsheet/BankSelectionViewModelTest.kt b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/bankselectionbottomsheet/BankSelectionViewModelTest.kt
new file mode 100644
index 0000000000..fa8f9feb1b
--- /dev/null
+++ b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/bankselectionbottomsheet/BankSelectionViewModelTest.kt
@@ -0,0 +1,257 @@
+package net.gini.android.merchant.sdk.bankselectionbottomsheet
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import app.cash.turbine.test
+import com.google.common.truth.Truth.assertThat
+import io.mockk.coEvery
+import io.mockk.every
+import io.mockk.mockk
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.test.runTest
+import net.gini.android.health.api.models.PaymentProvider
+import net.gini.android.merchant.sdk.bankselection.BankSelectionViewModel
+import net.gini.android.merchant.sdk.bankselection.PaymentProviderAppsListState
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentProviderAppsState
+import net.gini.android.merchant.sdk.paymentcomponent.SelectedPaymentProviderAppState
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderApp
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderAppColors
+import net.gini.android.merchant.sdk.test.ViewModelTestCoroutineRule
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@OptIn(ExperimentalCoroutinesApi::class)
+@RunWith(AndroidJUnit4::class)
+class BankSelectionViewModelTest {
+
+    @get:Rule
+    val testCoroutineRule = ViewModelTestCoroutineRule()
+
+    private var paymentComponent: PaymentComponent? = null
+    private var paymentProvider1 = PaymentProviderApp(
+        name = "payment provider",
+        icon = null,
+        colors = PaymentProviderAppColors(-1, -1),
+        paymentProvider = PaymentProvider(
+            id = "payment provider id",
+            name = "payment provider name",
+            packageName = "com.paymentProvider.packageName",
+            appVersion = "appVersion",
+            colors = PaymentProvider.Colors(backgroundColorRGBHex = "", textColoRGBHex = ""),
+            icon = ByteArray(0),
+            gpcSupportedPlatforms = listOf("android"),
+            openWithSupportedPlatforms = listOf("android")
+        )
+    )
+
+    private var paymentProvider2 = PaymentProviderApp(
+        name = "payment provider 2",
+        icon = null,
+        colors = PaymentProviderAppColors(-1, -1),
+        paymentProvider = PaymentProvider(
+            id = "payment provider id",
+            name = "payment provider name",
+            packageName = "com.paymentProvider.packageName",
+            appVersion = "appVersion",
+            colors = PaymentProvider.Colors(backgroundColorRGBHex = "", textColoRGBHex = ""),
+            icon = ByteArray(0),
+            gpcSupportedPlatforms = listOf("android"),
+            openWithSupportedPlatforms = listOf("android")
+        )
+    )
+
+    private var paymentProvider3 = PaymentProviderApp(
+        name = "payment provider 3",
+        icon = null,
+        colors = PaymentProviderAppColors(-1, -1),
+        paymentProvider = PaymentProvider(
+            id = "payment provider id",
+            name = "payment provider name",
+            packageName = "com.paymentProvider.packageName",
+            appVersion = "appVersion",
+            colors = PaymentProvider.Colors(backgroundColorRGBHex = "", textColoRGBHex = ""),
+            icon = ByteArray(0),
+            gpcSupportedPlatforms = listOf("android"),
+            openWithSupportedPlatforms = listOf("android")
+        )
+    )
+
+    @Before
+    fun setup() {
+        paymentComponent = mockk(relaxed = true)
+        every { paymentComponent!!.paymentProviderAppsFlow } returns MutableStateFlow<PaymentProviderAppsState>(mockk()).asStateFlow()
+        every { paymentComponent!!.selectedPaymentProviderAppFlow } returns MutableStateFlow<SelectedPaymentProviderAppState>(mockk()).asStateFlow()
+    }
+
+    @After
+    fun tearDown() {
+        paymentComponent = null
+    }
+    @Test
+    fun `processes payment provider apps when emitted from payment component with none selected`() = runTest {
+        // Given
+        val viewModel = BankSelectionViewModel(paymentComponent, mockk())
+
+        every { paymentComponent!!.paymentProviderAppsFlow } returns MutableStateFlow(
+            PaymentProviderAppsState.Success(
+                listOf(
+                    paymentProvider1,
+                    paymentProvider2,
+                    paymentProvider3
+                )
+            )
+        )
+
+        every { paymentComponent!!.selectedPaymentProviderAppFlow } returns MutableStateFlow(SelectedPaymentProviderAppState.NothingSelected)
+
+        viewModel.start()
+
+        // When
+        viewModel.paymentProviderAppsListFlow.test {
+
+            // Then
+            val validation = awaitItem()
+            assertThat(validation).isInstanceOf(PaymentProviderAppsListState.Success::class.java)
+
+            val validationResult = validation as PaymentProviderAppsListState.Success
+            assertThat(validationResult.paymentProviderAppsList).isNotEmpty()
+            assertThat(validationResult.paymentProviderAppsList).hasSize(3)
+            assertThat(validationResult.paymentProviderAppsList.filter { it.isSelected }.size).isEqualTo(0)
+
+            cancelAndConsumeRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `processes payment provider apps when emitted from payment component with default selected`() = runTest {
+        // Given
+        val viewModel = BankSelectionViewModel(paymentComponent, mockk())
+
+        every { paymentComponent!!.paymentProviderAppsFlow } returns MutableStateFlow(
+            PaymentProviderAppsState.Success(
+                listOf(
+                    paymentProvider1,
+                    paymentProvider2,
+                    paymentProvider3
+                )
+            )
+        )
+
+        every { paymentComponent!!.selectedPaymentProviderAppFlow } returns MutableStateFlow(SelectedPaymentProviderAppState.AppSelected(paymentProviderApp = paymentProvider1))
+
+        viewModel.start()
+
+        // When
+        viewModel.paymentProviderAppsListFlow.test {
+
+            // Then
+            val validation = awaitItem()
+            assertThat(validation).isInstanceOf(PaymentProviderAppsListState.Success::class.java)
+
+            val validationResult = validation as PaymentProviderAppsListState.Success
+            assertThat(validationResult.paymentProviderAppsList).isNotEmpty()
+            assertThat(validationResult.paymentProviderAppsList).hasSize(3)
+
+            val selectedPaymentProviderAppsList = validationResult.paymentProviderAppsList.filter { it.isSelected }
+            assertThat(selectedPaymentProviderAppsList.size).isEqualTo(1)
+            assertThat(selectedPaymentProviderAppsList.first().paymentProviderApp.name).isEqualTo("payment provider")
+
+            cancelAndConsumeRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `sets selected payment provider app`() = runTest {
+        // Given
+        val viewModel = BankSelectionViewModel(paymentComponent, mockk())
+
+        every { paymentComponent!!.paymentProviderAppsFlow } returns MutableStateFlow(
+            PaymentProviderAppsState.Success(
+                listOf(
+                    paymentProvider1,
+                    paymentProvider2,
+                    paymentProvider3
+                )
+            )
+        )
+
+        val paymentAppProviderFlow = MutableStateFlow<SelectedPaymentProviderAppState> (SelectedPaymentProviderAppState.NothingSelected)
+        every { paymentComponent!!.selectedPaymentProviderAppFlow } returns paymentAppProviderFlow
+
+        coEvery { paymentComponent!!.setSelectedPaymentProviderApp(paymentProvider1) } coAnswers  {
+            paymentAppProviderFlow.emit(SelectedPaymentProviderAppState.AppSelected(paymentProvider1))
+        }
+
+        viewModel.start()
+
+        viewModel.paymentProviderAppsListFlow.test {
+            val nothingSelectedValidation = awaitItem()
+            assertThat(nothingSelectedValidation).isInstanceOf(PaymentProviderAppsListState.Success::class.java)
+            assertThat((nothingSelectedValidation as PaymentProviderAppsListState.Success).paymentProviderAppsList.filter { it.isSelected }.size).isEqualTo(0)
+
+            // When
+            viewModel.setSelectedPaymentProviderApp(paymentProvider1)
+
+            // Then
+            val paymentAppProviderSelectedValidation = awaitItem()
+            assertThat(paymentAppProviderSelectedValidation).isInstanceOf(PaymentProviderAppsListState.Success::class.java)
+
+            val selectedPaymentProvidersList = (paymentAppProviderSelectedValidation as PaymentProviderAppsListState.Success).paymentProviderAppsList.filter { it.isSelected }
+            assertThat(selectedPaymentProvidersList.size).isEqualTo(1)
+            assertThat(selectedPaymentProvidersList.first().paymentProviderApp.name).isEqualTo(paymentProvider1.name)
+        }
+    }
+
+    // Text recheck
+
+    @Test
+    fun `rechecks which payment provider apps are installed`() = runTest {
+        // Given
+        val viewModel = BankSelectionViewModel(paymentComponent, mockk())
+
+        val paymentProvider1: PaymentProviderApp = mockk()
+        every { paymentProvider1.isInstalled() } returns false
+
+        val paymentProviderAppsList = listOf(
+            paymentProvider1,
+            paymentProvider2,
+            paymentProvider3
+        )
+
+        val paymentProvidersListFlow = MutableStateFlow(
+            PaymentProviderAppsState.Success(
+                paymentProviderAppsList
+            )
+        )
+        every { paymentComponent!!.paymentProviderAppsFlow } returns paymentProvidersListFlow
+
+        coEvery { paymentComponent!!.recheckWhichPaymentProviderAppsAreInstalled() } coAnswers {
+            paymentProvidersListFlow.emit(PaymentProviderAppsState.Success(paymentProviderAppsList))
+        }
+
+        viewModel.start()
+
+        viewModel.paymentProviderAppsListFlow.test {
+            val validateNoPaymentProviderAppInstalled = awaitItem()
+            assertThat(validateNoPaymentProviderAppInstalled).isInstanceOf(PaymentProviderAppsListState.Success::class.java)
+            assertThat((validateNoPaymentProviderAppInstalled as PaymentProviderAppsListState.Success).paymentProviderAppsList).isNotEmpty()
+            assertThat(validateNoPaymentProviderAppInstalled.paymentProviderAppsList.filter { it.paymentProviderApp.isInstalled() }).isEmpty()
+
+            // When
+            every { paymentProvider1.isInstalled() } returns true
+
+            viewModel.recheckWhichPaymentProviderAppsAreInstalled()
+
+            // Then
+            val validateOnePaymentProviderAppInstalled = awaitItem()
+            assertThat(validateOnePaymentProviderAppInstalled).isInstanceOf(PaymentProviderAppsListState.Success::class.java)
+            assertThat((validateOnePaymentProviderAppInstalled as PaymentProviderAppsListState.Success).paymentProviderAppsList).isNotEmpty()
+            assertThat(validateOnePaymentProviderAppInstalled.paymentProviderAppsList.filter { it.paymentProviderApp.isInstalled() }).isNotEmpty()
+        }
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/integratedFlow/PaymentFlowFragmentTest.kt b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/integratedFlow/PaymentFlowFragmentTest.kt
new file mode 100644
index 0000000000..b9bd8367a0
--- /dev/null
+++ b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/integratedFlow/PaymentFlowFragmentTest.kt
@@ -0,0 +1,186 @@
+package net.gini.android.merchant.sdk.integratedFlow
+
+import android.content.Context
+import androidx.fragment.app.testing.launchFragmentInContainer
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.test.runTest
+import net.gini.android.merchant.sdk.GiniMerchant
+import net.gini.android.merchant.sdk.R
+import net.gini.android.merchant.sdk.api.payment.model.PaymentDetails
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.merchant.sdk.review.reviewBottomSheet.ReviewBottomSheet
+import net.gini.android.merchant.sdk.util.DisplayedScreen
+import net.gini.android.merchant.sdk.util.PaymentNextStep
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@ExperimentalCoroutinesApi
+@RunWith(AndroidJUnit4::class)
+class PaymentFlowFragmentTest {
+    private var context: Context? = null
+    private var giniMerchant : GiniMerchant? = null
+    private var paymentComponent: PaymentComponent? = null
+    private var paymentFlowViewModel: PaymentFlowViewModel? = null
+    private lateinit var viewModelFactory: ViewModelProvider.Factory
+
+    @Before
+    fun setUp() {
+        context = ApplicationProvider.getApplicationContext()
+        context!!.setTheme(R.style.GiniMerchantTheme)
+
+        giniMerchant = mockk<GiniMerchant>(relaxed = true)
+        every { giniMerchant!!.eventsFlow } returns MutableStateFlow(mockk(relaxed = true))
+        every { giniMerchant!!.paymentFlow } returns MutableStateFlow(mockk(relaxed = true))
+//        every { giniMerchant!!.getPaymentReviewFragment("1234", any()) } returns mockk(relaxed = true)
+
+        paymentComponent = mockk<PaymentComponent>(relaxed = true)
+        every { paymentComponent!!.selectedPaymentProviderAppFlow } returns MutableStateFlow(mockk(relaxed = true))
+
+        paymentFlowViewModel = mockk<PaymentFlowViewModel>(relaxed = true)
+        every { paymentFlowViewModel!!.giniMerchant } returns giniMerchant!!
+        every { paymentFlowViewModel!!.paymentComponent } returns paymentComponent!!
+        every { paymentFlowViewModel!!.backButtonEvent } returns MutableSharedFlow()
+        every { paymentFlowViewModel!!.shareWithFlowStarted } returns MutableStateFlow(false)
+        viewModelFactory = object : ViewModelProvider.Factory {
+            override fun <T : ViewModel> create(modelClass: Class<T>): T {
+                @Suppress("UNCHECKED_CAST")
+                return paymentFlowViewModel as T
+            }
+        }
+    }
+
+    @Test
+    fun `shows payment component bottom sheet on startup`() = runTest {
+        // Given
+        every { paymentFlowViewModel!!.getLastBackstackEntry() } returns DisplayedScreen.Nothing
+        every { paymentFlowViewModel!!.paymentNextStep } returns MutableSharedFlow()
+        val fragment = PaymentFragment.newInstance(
+            giniMerchant = giniMerchant!!,
+            paymentDetails = mockk(relaxed = true),
+            paymentFlowConfiguration = mockk(relaxed = true),
+            viewModelFactory = viewModelFactory
+        )
+
+        // When
+        launchFragmentInContainer(themeResId = R.style.GiniMerchantTheme) {
+            fragment
+        }
+
+        // Then
+        verify { fragment.showPaymentComponentBottomSheet() }
+    }
+
+    @Test
+    fun `shows review fragment when payment button is tapped and config allows showing of review fragment`() = runTest {
+        // Given
+        every { paymentFlowViewModel!!.paymentFlowConfiguration!!.shouldHandleErrorsInternally } returns false
+        every { paymentFlowViewModel!!.paymentFlowConfiguration!!.shouldShowReviewFragment } returns true
+        every { paymentFlowViewModel!!.paymentFlowConfiguration!!.isAmountFieldEditable } returns false
+        every { paymentFlowViewModel!!.giniMerchant!!.createFragment("", "", "", "") } returns mockk(relaxed = true)
+        every { paymentFlowViewModel!!.paymentNextStep } returns MutableSharedFlow()
+        every { paymentFlowViewModel!!.giniMerchant.eventsFlow } returns MutableStateFlow(mockk(relaxed = true))
+        every { paymentFlowViewModel!!.giniMerchant.paymentFlow } returns MutableStateFlow(mockk(relaxed = true))
+        every { paymentFlowViewModel!!.paymentComponent!!.selectedPaymentProviderAppFlow } returns MutableStateFlow(
+            mockk(relaxed = true)
+        )
+        val fragment = PaymentFragment.newInstance(
+            giniMerchant = giniMerchant!!,
+            paymentDetails = mockk(relaxed = true),
+            paymentFlowConfiguration = PaymentFlowConfiguration(shouldShowReviewFragment = true),
+            viewModelFactory = viewModelFactory
+        )
+
+        launchFragmentInContainer(themeResId = R.style.GiniMerchantTheme) {
+            fragment
+        }
+
+        // When
+        fragment.handlePayFlow()
+
+        // Then
+        verify { fragment.showReviewBottomDialog() }
+    }
+
+    @Test
+    fun `updates payment details when payment button is tapped on the review fragment`() = runTest {
+        // Given
+        every { paymentFlowViewModel!!.paymentFlowConfiguration!!.shouldHandleErrorsInternally } returns false
+        every { paymentFlowViewModel!!.paymentFlowConfiguration!!.shouldShowReviewFragment } returns true
+        every { paymentFlowViewModel!!.paymentFlowConfiguration!!.isAmountFieldEditable } returns false
+        every { paymentFlowViewModel!!.giniMerchant!!.createFragment("", "", "", "") } returns mockk(relaxed = true)
+        every { paymentFlowViewModel!!.paymentNextStep } returns MutableSharedFlow()
+        every { paymentFlowViewModel!!.giniMerchant.eventsFlow } returns MutableStateFlow(mockk(relaxed = true))
+        every { paymentFlowViewModel!!.giniMerchant.paymentFlow } returns MutableStateFlow(mockk(relaxed = true))
+        every { paymentFlowViewModel!!.giniPaymentManager.paymentValidation } returns MutableStateFlow(mockk(relaxed = true))
+        every { paymentFlowViewModel!!.giniPaymentManager.lastFullyValidatedPaymentDetails } returns MutableStateFlow(mockk(relaxed = true))
+        every { paymentFlowViewModel!!.paymentComponent!!.selectedPaymentProviderAppFlow } returns MutableStateFlow(
+            mockk(relaxed = true)
+        )
+
+        val scenario = launchFragmentInContainer(themeResId = R.style.GiniMerchantTheme) {
+            PaymentFragment.newInstance(
+                giniMerchant = giniMerchant!!,
+                paymentDetails = mockk(relaxed = true),
+                paymentFlowConfiguration = PaymentFlowConfiguration(shouldShowReviewFragment = true),
+                viewModelFactory = viewModelFactory
+            )
+        }
+
+        val updatedPaymentDetails = PaymentDetails("recipient", "iban", "amount", "purpose")
+
+        scenario.onFragment { paymentFragment ->
+            // When
+            paymentFragment.handlePayFlow()
+
+            InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+            val reviewFragment = paymentFragment.childFragmentManager.fragments.first {
+                it is ReviewBottomSheet
+            } as ReviewBottomSheet
+
+            reviewFragment.paymentButtonListener?.onPaymentButtonTapped(updatedPaymentDetails)
+        }
+
+        // Then
+        verify { paymentFlowViewModel!!.updatePaymentDetails(eq(updatedPaymentDetails)) }
+    }
+
+    @Test
+    fun `forwards payment request to viewModel when config doesn't allow showing ReviewFragment`() = runTest {
+        // Given
+        val paymentFlow = MutableSharedFlow<PaymentNextStep>(extraBufferCapacity = 1)
+        every { paymentFlowViewModel!!.getLastBackstackEntry() } returns DisplayedScreen.Nothing
+        every { paymentFlowViewModel!!.paymentNextStep } returns paymentFlow.also { it.tryEmit(PaymentNextStep.RedirectToBank) }
+        every { paymentFlowViewModel!!.paymentFlowConfiguration!!.shouldHandleErrorsInternally } returns false
+        every { paymentFlowViewModel!!.paymentFlowConfiguration!!.shouldShowReviewFragment } returns false
+        every { paymentFlowViewModel!!.paymentFlowConfiguration!!.isAmountFieldEditable } returns false
+        val fragment = PaymentFragment.newInstance(
+            giniMerchant = giniMerchant!!,
+            paymentDetails = mockk(relaxed = true),
+            paymentFlowConfiguration = PaymentFlowConfiguration(shouldShowReviewFragment = false),
+            viewModelFactory = viewModelFactory
+        )
+
+        launchFragmentInContainer(themeResId = R.style.GiniMerchantTheme) {
+            fragment
+        }
+
+        // When
+        fragment.handlePayFlow()
+
+        // Then
+        verify { paymentFlowViewModel!!.onPaymentButtonTapped(any()) }
+    }
+
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/integratedFlow/PaymentFlowViewModelTest.kt b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/integratedFlow/PaymentFlowViewModelTest.kt
new file mode 100644
index 0000000000..3e6355c009
--- /dev/null
+++ b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/integratedFlow/PaymentFlowViewModelTest.kt
@@ -0,0 +1,412 @@
+package net.gini.android.merchant.sdk.integratedFlow
+
+import android.content.Context
+import androidx.lifecycle.viewModelScope
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import app.cash.turbine.test
+import com.google.common.truth.Truth.assertThat
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.test.runTest
+import net.gini.android.core.api.Resource
+import net.gini.android.health.api.GiniHealthAPI
+import net.gini.android.health.api.HealthApiDocumentManager
+import net.gini.android.health.api.models.PaymentProvider
+import net.gini.android.merchant.sdk.GiniMerchant
+import net.gini.android.merchant.sdk.R
+import net.gini.android.merchant.sdk.api.payment.model.PaymentDetails
+import net.gini.android.merchant.sdk.api.payment.model.PaymentRequest
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.merchant.sdk.paymentcomponent.SelectedPaymentProviderAppState
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderApp
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderAppColors
+import net.gini.android.merchant.sdk.review.openWith.OpenWithPreferences
+import net.gini.android.merchant.sdk.test.ViewModelTestCoroutineRule
+import net.gini.android.merchant.sdk.util.DisplayedScreen
+import net.gini.android.merchant.sdk.util.GiniPaymentManager
+import net.gini.android.merchant.sdk.util.PaymentNextStep
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+
+@ExperimentalCoroutinesApi
+@RunWith(AndroidJUnit4::class)
+class PaymentFlowViewModelTest {
+    @get:Rule
+    val testCoroutineRule = ViewModelTestCoroutineRule()
+
+    private val giniHealthAPI: GiniHealthAPI = mockk(relaxed = true) { GiniHealthAPI::class.java }
+    private val documentManager: HealthApiDocumentManager = mockk { HealthApiDocumentManager::class.java }
+    private var giniMerchant: GiniMerchant? = null
+    private var paymentComponent: PaymentComponent? = null
+    private var giniPayment: GiniPaymentManager? = null
+    private var context: Context? = null
+
+    private var initialPaymentProviderApp =  PaymentProviderApp(
+        name = "payment provider",
+        icon = null,
+        colors = PaymentProviderAppColors(-1, -1),
+        paymentProvider = PaymentProvider(
+            id = "payment provider id",
+            name = "payment provider name",
+            packageName = "com.paymentProvider.packageName",
+            appVersion = "appVersion",
+            colors = PaymentProvider.Colors(backgroundColorRGBHex = "", textColoRGBHex = ""),
+            icon = ByteArray(0),
+            gpcSupportedPlatforms = listOf("android"),
+            openWithSupportedPlatforms = listOf("android")
+        )
+    )
+
+    private var changedPaymentProviderApp =  PaymentProviderApp(
+        name = "payment provider2",
+        icon = null,
+        colors = PaymentProviderAppColors(-1, -1),
+        paymentProvider = PaymentProvider(
+            id = "payment provider2 id",
+            name = "payment provider name",
+            packageName = "com.paymentProvider.packageName",
+            appVersion = "appVersion",
+            colors = PaymentProvider.Colors(backgroundColorRGBHex = "", textColoRGBHex = ""),
+            icon = ByteArray(0),
+            gpcSupportedPlatforms = listOf("android"),
+            openWithSupportedPlatforms = listOf("android")
+        )
+    )
+
+    @Before
+    fun setUp() {
+        context = ApplicationProvider.getApplicationContext()
+        context!!.setTheme(R.style.GiniMerchantTheme)
+        every { giniHealthAPI.documentManager } returns documentManager
+        giniMerchant = mockk(relaxed = true)
+        giniPayment = mockk(relaxed = true)
+        paymentComponent = mockk(relaxed = true)
+
+        every { paymentComponent!!.paymentProviderAppsFlow } returns MutableStateFlow(mockk())
+        every { paymentComponent!!.selectedPaymentProviderAppFlow } returns MutableStateFlow<SelectedPaymentProviderAppState>(SelectedPaymentProviderAppState.AppSelected(initialPaymentProviderApp))
+        every { giniMerchant!!.giniHealthAPI } returns giniHealthAPI
+        every { giniMerchant!!.paymentFlow } returns MutableStateFlow(mockk())
+    }
+
+    @After
+    fun tearDown() {
+        giniMerchant = null
+        paymentComponent = null
+    }
+
+    @Test
+    fun `adds to backstack`() = runTest {
+        // Given
+        val viewModel = PaymentFlowViewModel(
+            paymentComponent = paymentComponent!!,
+            paymentDetails = PaymentDetails("", "", "", ""),
+            paymentFlowConfiguration = null,
+            giniMerchant = giniMerchant!!,
+            giniPaymentManager = GiniPaymentManager(giniMerchant)
+        )
+
+        // When
+        viewModel.addToBackStack(DisplayedScreen.BankSelectionBottomSheet)
+
+        // Then
+        assertThat(viewModel.getLastBackstackEntry()).isInstanceOf(DisplayedScreen.BankSelectionBottomSheet::class.java)
+    }
+
+    @Test
+    fun `pops backstack`() = runTest {
+        // Given
+        val viewModel = PaymentFlowViewModel(
+            paymentComponent = paymentComponent!!,
+            paymentDetails = PaymentDetails("", "", "", ""),
+            paymentFlowConfiguration = null,
+            giniMerchant = giniMerchant!!,
+            giniPaymentManager = GiniPaymentManager(giniMerchant)
+        )
+
+        // When
+        viewModel.addToBackStack(DisplayedScreen.BankSelectionBottomSheet)
+        viewModel.addToBackStack(DisplayedScreen.MoreInformationFragment)
+
+        assertThat(viewModel.getLastBackstackEntry()).isInstanceOf(DisplayedScreen.MoreInformationFragment::class.java)
+
+        // Then
+        viewModel.popBackStack()
+        assertThat(viewModel.getLastBackstackEntry()).isInstanceOf(DisplayedScreen.BankSelectionBottomSheet::class.java)
+    }
+
+    @Test
+    fun `peek backstack returns last value in backstack`() = runTest {
+        // Given
+        val viewModel = PaymentFlowViewModel(
+            paymentComponent = paymentComponent!!,
+            paymentDetails = PaymentDetails("", "", "", ""),
+            paymentFlowConfiguration = null,
+            giniMerchant = giniMerchant!!,
+            giniPaymentManager = GiniPaymentManager(giniMerchant)
+        )
+
+        // When
+        viewModel.addToBackStack(DisplayedScreen.BankSelectionBottomSheet)
+        viewModel.addToBackStack(DisplayedScreen.MoreInformationFragment)
+
+        // Then
+        assertThat(viewModel.getLastBackstackEntry()).isInstanceOf(DisplayedScreen.MoreInformationFragment::class.java)
+    }
+
+    @Test
+    fun `returns true if payment provider app has been changed`() = runTest {
+        // Given
+        val viewModel = PaymentFlowViewModel(
+            paymentComponent = paymentComponent!!,
+            paymentDetails = PaymentDetails("", "", "", ""),
+            paymentFlowConfiguration = null,
+            giniMerchant = giniMerchant!!,
+            giniPaymentManager = GiniPaymentManager(giniMerchant)
+        )
+
+        // Then
+        assertThat(viewModel.paymentProviderAppChanged(changedPaymentProviderApp)).isTrue()
+    }
+
+    @Test
+    fun `forwards on payment action to giniPayment`() = runTest {
+        // Given
+        coEvery { giniPayment!!.onPayment(any(), any()) } coAnswers {  }
+        val viewModel = PaymentFlowViewModel(
+            paymentComponent = paymentComponent!!,
+            paymentDetails = PaymentDetails("", "", "", ""),
+            paymentFlowConfiguration = null,
+            giniMerchant = giniMerchant!!,
+            giniPaymentManager = giniPayment!!
+        )
+
+        // Then
+        viewModel.onPayment()
+        coVerify(exactly = 1) { giniPayment!!.onPayment(any(), any()) }
+    }
+
+    @Test
+    fun `checks bank app installed state`() = runTest {
+        val viewModel = PaymentFlowViewModel(
+            paymentComponent = paymentComponent!!,
+            paymentDetails = PaymentDetails("", "", "", ""),
+            paymentFlowConfiguration = null,
+            giniMerchant = giniMerchant!!,
+            giniPaymentManager = giniPayment!!
+        )
+
+        viewModel.checkBankAppInstallState(changedPaymentProviderApp)
+        assertThat(viewModel.getPaymentProviderApp()?.paymentProvider?.id).isEqualTo(changedPaymentProviderApp.paymentProvider.id)
+    }
+
+    @Test
+    fun `emits share with started event`() = runTest {
+        val viewModel = PaymentFlowViewModel(
+            paymentComponent = paymentComponent!!,
+            paymentDetails = PaymentDetails("", "", "", ""),
+            paymentFlowConfiguration = null,
+            giniMerchant = giniMerchant!!,
+            giniPaymentManager = giniPayment!!
+        )
+
+        viewModel.emitShareWithStartedEvent()
+        viewModel.shareWithFlowStarted.test {
+            val validation = awaitItem()
+            assertThat(validation).isTrue()
+        }
+    }
+
+    @Test
+    fun `forwards sdk event to giniMerchant`() = runTest {
+        val viewModel = PaymentFlowViewModel(
+            paymentComponent = paymentComponent!!,
+            paymentDetails = PaymentDetails("", "", "", ""),
+            paymentFlowConfiguration = null,
+            giniMerchant = giniMerchant!!,
+            giniPaymentManager = giniPayment!!
+        )
+
+        viewModel.emitSDKEvent(GiniMerchant.PaymentState.Loading)
+        verify { giniMerchant!!.emitSDKEvent(any()) }
+    }
+
+    @Test
+    fun `returns payment request from giniPaymentManager`() = runTest {
+        val viewModel = PaymentFlowViewModel(
+            paymentComponent = paymentComponent!!,
+            paymentDetails = PaymentDetails("", "", "", ""),
+            paymentFlowConfiguration = null,
+            giniMerchant = giniMerchant!!,
+            giniPaymentManager = giniPayment!!
+        )
+
+        coEvery { giniPayment!!.getPaymentRequest(any(), any()) } coAnswers { PaymentRequest("1234", null, null, "", "", null, "20", "", PaymentRequest.Status.INVALID) }
+
+        val paymentRequest = viewModel.getPaymentRequest()
+        assertThat(paymentRequest.id).isEqualTo("1234")
+    }
+
+    @Test
+    fun `returns document as byteArray from giniMerchant`() = runTest {
+        val viewModel = PaymentFlowViewModel(
+            paymentComponent = paymentComponent!!,
+            paymentDetails = PaymentDetails("", "", "", ""),
+            paymentFlowConfiguration = null,
+            giniMerchant = giniMerchant!!,
+            giniPaymentManager = giniPayment!!
+        )
+        val byteArray = byteArrayOf()
+
+        coEvery { giniMerchant!!.giniHealthAPI.documentManager.getPaymentRequestDocument("1234") } coAnswers { Resource.Success(byteArray)}
+
+        val document = viewModel.getPaymentRequestDocument(PaymentRequest("1234", "", "", "", "", "", "", "", PaymentRequest.Status.OPEN))
+        assertThat(document.data).isEqualTo(byteArray)
+    }
+
+    @Test
+    fun `increments 'Open With' counter`() = runTest {
+        // Given
+        val paymentProviderApp = mockk<PaymentProviderApp>()
+        every { paymentProviderApp.paymentProvider.id } returns "123"
+
+        val openWithPreferences= OpenWithPreferences(context!!)
+        every { paymentComponent!!.selectedPaymentProviderAppFlow } returns MutableStateFlow(
+            SelectedPaymentProviderAppState.AppSelected(paymentProviderApp))
+
+        val viewModel = PaymentFlowViewModel(
+            paymentComponent = paymentComponent!!,
+            paymentDetails = PaymentDetails("", "", "", ""),
+            paymentFlowConfiguration = null,
+            giniMerchant = giniMerchant!!,
+            giniPaymentManager = giniPayment!!
+        ).also {
+            it.openWithPreferences = openWithPreferences
+        }
+
+        // When
+        viewModel.incrementOpenWithCounter(viewModel.viewModelScope, paymentProviderApp.paymentProvider.id)
+
+        // Then
+        coVerify { openWithPreferences.incrementCountForPaymentProviderId(paymentProviderApp.paymentProvider.id) }
+    }
+
+    @Test
+    fun `returns 'RedirectToBank' when payment provider app supports GPC and is installed`() = runTest {
+        // Given
+        val paymentProviderApp = mockk<PaymentProviderApp>()
+        every { paymentProviderApp.paymentProvider.gpcSupported() } returns true
+        every { paymentProviderApp.isInstalled() } returns true
+
+        val viewModel = PaymentFlowViewModel(
+            paymentComponent = paymentComponent!!,
+            paymentDetails = PaymentDetails("", "", "", ""),
+            paymentFlowConfiguration = null,
+            giniMerchant = giniMerchant!!,
+            giniPaymentManager = giniPayment!!
+        )
+        viewModel.checkBankAppInstallState(paymentProviderApp)
+        viewModel.paymentNextStep.test {
+            // When
+            viewModel.onPaymentButtonTapped(context!!.externalCacheDir)
+            val nextStep = awaitItem()
+
+            // Then
+            assertThat(nextStep).isEqualTo(PaymentNextStep.RedirectToBank)
+            cancelAndConsumeRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `returns 'ShowOpenWith' when payment provider app does not support GPC`() = runTest {
+        // Given
+        val paymentProviderApp = mockk<PaymentProviderApp>()
+        every { paymentProviderApp.paymentProvider.gpcSupported() } returns false
+
+        every { paymentComponent!!.selectedPaymentProviderAppFlow } returns MutableStateFlow(
+            SelectedPaymentProviderAppState.AppSelected(paymentProviderApp))
+
+        val viewModel = PaymentFlowViewModel(
+            paymentComponent = paymentComponent!!,
+            paymentDetails = PaymentDetails("", "", "", ""),
+            paymentFlowConfiguration = null,
+            giniMerchant = giniMerchant!!,
+            giniPaymentManager = giniPayment!!
+        )
+
+        viewModel.paymentNextStep.test {
+            // When
+            viewModel.onPaymentButtonTapped(context!!.externalCacheDir)
+            val nextStep = awaitItem()
+
+            // Then
+            assertThat(nextStep).isEqualTo(PaymentNextStep.ShowOpenWithSheet)
+            cancelAndConsumeRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `returns 'DownloadPaymentRequestFile' when payment provider app does not support GPC and 'Open With' was shown 3 times`() = runTest {
+        // Given
+        val paymentProviderApp = mockk<PaymentProviderApp>()
+        every { paymentProviderApp.paymentProvider.gpcSupported() } returns false
+        every { paymentProviderApp.paymentProvider.id } returns "123"
+
+        val openWithPreferences = mockk<OpenWithPreferences>()
+        every { openWithPreferences.getLiveCountForPaymentProviderId(any()) } returns flowOf(3)
+
+        every { paymentComponent!!.selectedPaymentProviderAppFlow } returns MutableStateFlow(
+            SelectedPaymentProviderAppState.AppSelected(paymentProviderApp))
+
+        val viewModel = PaymentFlowViewModel(
+            paymentComponent = paymentComponent!!,
+            paymentDetails = PaymentDetails("", "", "", ""),
+            paymentFlowConfiguration = null,
+            giniMerchant = giniMerchant!!,
+            giniPaymentManager = giniPayment!!
+        ).also {
+            it.openWithPreferences = openWithPreferences
+        }
+        viewModel.startObservingOpenWithCount(viewModel.viewModelScope, paymentProviderApp.paymentProvider.id)
+
+        viewModel.paymentNextStep.test {
+            // When
+            viewModel.onPaymentButtonTapped(context!!.externalCacheDir)
+            val nextStep = awaitItem()
+
+            // Then
+            assertThat(nextStep).isEqualTo(PaymentNextStep.SetLoadingVisibility(true))
+            cancelAndConsumeRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `updates payment details`() {
+        // Given
+        val viewModel = PaymentFlowViewModel(
+            paymentComponent = paymentComponent!!,
+            paymentDetails = PaymentDetails("", "", "", ""),
+            paymentFlowConfiguration = null,
+            giniMerchant = giniMerchant!!,
+            giniPaymentManager = giniPayment!!
+        )
+
+        val updatedPaymentDetails = PaymentDetails("recipient", "iban", "amount", "purpose")
+
+        // When
+        viewModel.updatePaymentDetails(updatedPaymentDetails)
+
+        // Then
+        assertThat(viewModel.paymentDetails).isEqualTo(updatedPaymentDetails)
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/moreinformation/MoreInformationTest.kt b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/moreinformation/MoreInformationTest.kt
new file mode 100644
index 0000000000..783abfb08f
--- /dev/null
+++ b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/moreinformation/MoreInformationTest.kt
@@ -0,0 +1,111 @@
+package net.gini.android.merchant.sdk.moreinformation
+
+import android.widget.ExpandableListView
+import androidx.fragment.app.testing.launchFragmentInContainer
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import io.mockk.every
+import io.mockk.mockk
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import net.gini.android.health.api.models.PaymentProvider
+import net.gini.android.merchant.sdk.R
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentProviderAppsState
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderApp
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderAppColors
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@ExperimentalCoroutinesApi
+@RunWith(AndroidJUnit4::class)
+class MoreInformationTest {
+    private var paymentComponent: PaymentComponent? = null
+
+    @Before
+    fun setup() {
+        paymentComponent = mockk(relaxed = true)
+        every { paymentComponent!!.paymentProviderAppsFlow } returns MutableStateFlow<PaymentProviderAppsState>(mockk()).asStateFlow()
+    }
+
+    @Test
+    fun `loads payment provider icons when returned from view model`() {
+        // Given
+        every { paymentComponent!!.paymentProviderAppsFlow } returns MutableStateFlow(
+            PaymentProviderAppsState.Success(
+                listOf(
+                    PaymentProviderApp(
+                        name = "payment provider",
+                        icon = null,
+                        colors = PaymentProviderAppColors(-1, -1),
+                        paymentProvider = PaymentProvider(
+                            id = "payment provider id",
+                            name = "payment provider name",
+                            packageName = "com.paymentProvider.packageName",
+                            appVersion = "appVersion",
+                            colors = PaymentProvider.Colors(backgroundColorRGBHex = "", textColoRGBHex = ""),
+                            icon = ByteArray(0),
+                            gpcSupportedPlatforms = listOf("android"),
+                            openWithSupportedPlatforms = listOf("android")
+                        )
+                    ),
+                    PaymentProviderApp(
+                        name = "payment provider 2",
+                        icon = null,
+                        colors = PaymentProviderAppColors(-1, -1),
+                        paymentProvider = PaymentProvider(
+                            id = "payment provider id",
+                            name = "payment provider name",
+                            packageName = "com.paymentProvider.packageName",
+                            appVersion = "appVersion",
+                            colors = PaymentProvider.Colors(backgroundColorRGBHex = "", textColoRGBHex = ""),
+                            icon = ByteArray(0),
+                            gpcSupportedPlatforms = listOf("android"),
+                            openWithSupportedPlatforms = listOf("android")
+                        )
+                    ),
+                    PaymentProviderApp(
+                        name = "payment provider 3",
+                        icon = null,
+                        colors = PaymentProviderAppColors(-1, -1),
+                        paymentProvider = PaymentProvider(
+                            id = "payment provider id",
+                            name = "payment provider name",
+                            packageName = "com.paymentProvider.packageName",
+                            appVersion = "appVersion",
+                            colors = PaymentProvider.Colors(backgroundColorRGBHex = "", textColoRGBHex = ""),
+                            icon = ByteArray(0),
+                            gpcSupportedPlatforms = listOf("android"),
+                            openWithSupportedPlatforms = listOf("android")
+                        )
+                    )
+                )
+            )
+        )
+
+        // When
+        launchFragmentInContainer {
+            MoreInformationFragment.newInstance(paymentComponent)
+        }
+
+        // Then
+        onView(withId(R.id.gms_payment_providers_icons_list)).check { view, _ -> assertThat ((view as RecyclerView).adapter!!.itemCount).isEqualTo(3) }
+    }
+
+    @Test
+    fun `displays all FAQ questions`() {
+        val fragment = MoreInformationFragment.newInstance(paymentComponent)
+        // When
+        launchFragmentInContainer {
+            fragment
+        }
+
+        // Then
+        onView(withId(R.id.gms_faq_list)).check { view, _ -> assertThat ((view as ExpandableListView).adapter!!.count).isEqualTo(fragment.faqList.size) }
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/moreinformation/MoreInformationViewModelTest.kt b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/moreinformation/MoreInformationViewModelTest.kt
new file mode 100644
index 0000000000..82dd2940c5
--- /dev/null
+++ b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/moreinformation/MoreInformationViewModelTest.kt
@@ -0,0 +1,103 @@
+package net.gini.android.merchant.sdk.moreinformation
+
+import app.cash.turbine.test
+import com.google.common.truth.Truth.assertThat
+import io.mockk.every
+import io.mockk.mockk
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.test.runTest
+import net.gini.android.health.api.models.PaymentProvider
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentProviderAppsState
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderApp
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderAppColors
+import net.gini.android.merchant.sdk.test.ViewModelTestCoroutineRule
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+
+@ExperimentalCoroutinesApi
+class MoreInformationViewModelTest {
+
+    @get:Rule
+    val testCoroutineRule = ViewModelTestCoroutineRule()
+
+    private var paymentComponent: PaymentComponent? = null
+
+    @Before
+    fun setup() {
+        paymentComponent = mockk(relaxed = true)
+        every { paymentComponent!!.paymentProviderAppsFlow } returns MutableStateFlow<PaymentProviderAppsState>(mockk()).asStateFlow()
+    }
+
+    @After
+    fun tearDown() {
+        paymentComponent = null
+    }
+
+    @Test
+    fun `gets payment provider apps successfully`() = runTest {
+        // Given
+        val viewModel = MoreInformationViewModel(paymentComponent)
+
+        // When
+        every { paymentComponent!!.paymentProviderAppsFlow } returns MutableStateFlow(
+            PaymentProviderAppsState.Success(
+                listOf(
+                    PaymentProviderApp(
+                        name = "payment provider",
+                        icon = null,
+                        colors = PaymentProviderAppColors(-1, -1),
+                        paymentProvider = PaymentProvider(
+                            id = "payment provider id",
+                            name = "payment provider name",
+                            packageName = "com.paymentProvider.packageName",
+                            appVersion = "appVersion",
+                            colors = PaymentProvider.Colors(backgroundColorRGBHex = "", textColoRGBHex = ""),
+                            icon = ByteArray(0),
+                            gpcSupportedPlatforms = listOf("android"),
+                            openWithSupportedPlatforms = listOf("android")
+                        )
+                    )
+                )
+            )
+        )
+        viewModel.start()
+
+        // Then
+        viewModel.paymentProviderAppsListFlow.test {
+            val validation = awaitItem()
+            assertThat(validation).isInstanceOf(MoreInformationViewModel.PaymentProviderAppsListState.Success::class.java)
+
+            val validationResult = validation as MoreInformationViewModel.PaymentProviderAppsListState.Success
+            assertThat(validationResult.paymentProviderAppsList).isNotEmpty()
+            assertThat(validationResult.paymentProviderAppsList).hasSize(1)
+            assertThat(validationResult.paymentProviderAppsList.first().name).isEqualTo("payment provider")
+
+            cancelAndConsumeRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `processes error from payment component`() = runTest {
+        // Given
+        val viewModel = MoreInformationViewModel(paymentComponent)
+
+        // When
+        every { paymentComponent!!.paymentProviderAppsFlow } returns MutableStateFlow(
+            PaymentProviderAppsState.Error(Throwable())
+        )
+        viewModel.start()
+
+        // Then
+        viewModel.paymentProviderAppsListFlow.test {
+            val validation = awaitItem()
+            assertThat(validation).isInstanceOf(MoreInformationViewModel.PaymentProviderAppsListState.Error::class.java)
+
+            cancelAndConsumeRemainingEvents()
+        }
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/paymentComponent/PaymentComponentBottomSheetTest.kt b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/paymentComponent/PaymentComponentBottomSheetTest.kt
new file mode 100644
index 0000000000..e8e5f63922
--- /dev/null
+++ b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/paymentComponent/PaymentComponentBottomSheetTest.kt
@@ -0,0 +1,62 @@
+package net.gini.android.merchant.sdk.paymentComponent
+
+import androidx.fragment.app.testing.launchFragmentInContainer
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.test.runTest
+import net.gini.android.merchant.sdk.paymentComponentBottomSheet.PaymentComponentBottomSheet
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.merchant.sdk.paymentcomponent.SelectedPaymentProviderAppState
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+class PaymentComponentBottomSheetTest {
+    private lateinit var paymentComponent: PaymentComponent
+    private lateinit var paymentComponentListener: PaymentComponent.Listener
+
+    @Before
+    fun setUp() {
+        paymentComponent = mockk(relaxed = true)
+        paymentComponentListener = mockk(relaxed = true)
+        every { paymentComponent.listener } returns paymentComponentListener
+        every { paymentComponent.selectedPaymentProviderAppFlow } returns MutableStateFlow(SelectedPaymentProviderAppState.AppSelected(
+            mockk(relaxed = true)
+        ))
+    }
+
+    @Test
+    fun `calls onMoreInformation method of listener when clicking on info button`() = runTest {
+        // Given
+        val paymentComponentBottomSheet = PaymentComponentBottomSheet.newInstance(paymentComponent, false, mockk(relaxed = true))
+        launchFragmentInContainer {
+            paymentComponentBottomSheet
+        }
+
+        // When
+        paymentComponentBottomSheet.paymentComponentView.getMoreInformationLabel().performClick()
+
+        // Then
+        verify { paymentComponentListener.onMoreInformationClicked() }
+    }
+
+    @Test
+    fun `calls onBankPickerClicked method of listener when clicking on select bank button`() = runTest {
+        // Given
+        val paymentComponentBottomSheet = PaymentComponentBottomSheet.newInstance(paymentComponent, false, mockk(relaxed = true))
+
+        launchFragmentInContainer {
+            paymentComponentBottomSheet
+        }
+
+        // When
+        paymentComponentBottomSheet.paymentComponentView.getBankPickerButton().performClick()
+
+        // Then
+        verify { paymentComponentListener.onBankPickerClicked() }
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/paymentComponent/PaymentComponentPreferencesTest.kt b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/paymentComponent/PaymentComponentPreferencesTest.kt
new file mode 100644
index 0000000000..36033da150
--- /dev/null
+++ b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/paymentComponent/PaymentComponentPreferencesTest.kt
@@ -0,0 +1,88 @@
+package net.gini.android.merchant.sdk.paymentComponent
+
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.runTest
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponentPreferences
+import net.gini.android.merchant.sdk.test.ViewModelTestCoroutineRule
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@ExperimentalCoroutinesApi
+@RunWith(AndroidJUnit4::class)
+class PaymentComponentPreferencesTest {
+
+    @get:Rule
+    val testCoroutineRule = ViewModelTestCoroutineRule()
+    private lateinit var context: Context
+    private val testCoroutineDispatcher = StandardTestDispatcher()
+    private val testCoroutineScope =
+        TestScope(testCoroutineDispatcher + Job())
+
+    @Before
+    fun setup() {
+        context = ApplicationProvider.getApplicationContext()
+    }
+
+    @After
+    fun tearDown() {
+        testCoroutineScope.runTest {
+            PaymentComponentPreferences(context).apply {
+                clearData()
+            }
+        }
+    }
+
+    @Test
+    fun `sets selected payment provider app`() = runTest {
+        // Given
+        val paymentComponentPreferences = PaymentComponentPreferences(context)
+
+        assertThat(paymentComponentPreferences.getSelectedPaymentProviderId()).isNull()
+
+        // When
+        paymentComponentPreferences.saveSelectedPaymentProviderId("123")
+
+        // Then
+        assertThat(paymentComponentPreferences.getSelectedPaymentProviderId()).isEqualTo("123")
+    }
+
+    @Test
+    fun `deletes selected payment provider app`() = runTest {
+        // Given
+        val paymentComponentPreferences = PaymentComponentPreferences(context)
+
+        assertThat(paymentComponentPreferences.getSelectedPaymentProviderId()).isNull()
+        paymentComponentPreferences.saveSelectedPaymentProviderId("123")
+        assertThat(paymentComponentPreferences.getSelectedPaymentProviderId()).isEqualTo("123")
+
+        // When
+        paymentComponentPreferences.deleteSelectedPaymentProviderId()
+
+        // Then
+        assertThat(paymentComponentPreferences.getSelectedPaymentProviderId()).isNull()
+    }
+
+    @Test
+    fun `sets returning user`() = runTest {
+        // Given
+        val paymentComponentPreferences = PaymentComponentPreferences(context)
+
+        assertThat(paymentComponentPreferences.getReturningUser()).isFalse()
+
+        // When
+        paymentComponentPreferences.saveReturningUser()
+
+        // Then
+        assertThat(paymentComponentPreferences.getReturningUser()).isTrue()
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/paymentComponent/PaymentComponentTest.kt b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/paymentComponent/PaymentComponentTest.kt
new file mode 100644
index 0000000000..450df5fad6
--- /dev/null
+++ b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/paymentComponent/PaymentComponentTest.kt
@@ -0,0 +1,538 @@
+package net.gini.android.merchant.sdk.paymentComponent
+
+import android.content.Context
+import android.content.pm.PackageManager
+import android.content.res.Resources
+import androidx.test.core.app.ApplicationProvider.getApplicationContext
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import app.cash.turbine.test
+import com.google.common.truth.Truth.assertThat
+import io.mockk.coEvery
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.spyk
+import io.mockk.unmockkAll
+import io.mockk.verify
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.runTest
+import net.gini.android.core.api.Resource
+import net.gini.android.health.api.GiniHealthAPI
+import net.gini.android.health.api.HealthApiDocumentManager
+import net.gini.android.health.api.models.PaymentProvider
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponentPreferences
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentProviderAppsState
+import net.gini.android.merchant.sdk.paymentcomponent.SelectedPaymentProviderAppState
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderApp
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderAppColors
+import net.gini.android.merchant.sdk.paymentprovider.getInstalledPaymentProviderApps
+import net.gini.android.merchant.sdk.paymentprovider.getPaymentProviderApps
+import net.gini.android.merchant.sdk.test.ViewModelTestCoroutineRule
+import net.gini.android.merchant.sdk.util.extensions.generateBitmapDrawableIcon
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@ExperimentalCoroutinesApi
+@RunWith(AndroidJUnit4::class)
+class PaymentComponentTest {
+
+    @get:Rule
+    val testCoroutineRule = ViewModelTestCoroutineRule()
+
+    private var context: Context? = null
+    private val giniHealthAPI: GiniHealthAPI = mockk(relaxed = true) { GiniHealthAPI::class.java }
+    private val documentManager: HealthApiDocumentManager = mockk { HealthApiDocumentManager::class.java }
+    private val testCoroutineDispatcher = StandardTestDispatcher()
+    private val testCoroutineScope =
+        TestScope(testCoroutineDispatcher + Job())
+
+    private val paymentProvider = PaymentProvider(
+        id = "payment provider id",
+        name = "payment provider name",
+        packageName = "net.gini.android.bank.exampleapp1",
+        appVersion = "appVersion",
+        colors = PaymentProvider.Colors(
+            backgroundColorRGBHex = "112233",
+            textColoRGBHex = "ffffff"
+        ),
+        icon = byteArrayOf(),
+        playStoreUrl = "",
+        gpcSupportedPlatforms = listOf("android"),
+        openWithSupportedPlatforms = listOf("android")
+        )
+
+    private val paymentProvider1 = PaymentProvider(
+        id = "payment provider id 1",
+        name = "payment provider name",
+        packageName = "net.gini.android.bank.exampleapp2",
+        appVersion = "appVersion",
+        colors = PaymentProvider.Colors(
+            backgroundColorRGBHex = "112233",
+            textColoRGBHex = "ffffff"
+        ),
+        icon = byteArrayOf(),
+        playStoreUrl = "",
+        gpcSupportedPlatforms = listOf("android"),
+        openWithSupportedPlatforms = listOf("android")
+        )
+
+    private val paymentProvider2 = PaymentProvider(
+        id = "payment provider id 2",
+        name = "payment provider name",
+        packageName = "net.gini.android.bank.exampleapp3",
+        appVersion = "appVersion",
+        colors = PaymentProvider.Colors(
+            backgroundColorRGBHex = "112233",
+            textColoRGBHex = "ffffff"
+        ),
+        icon = byteArrayOf(),
+        playStoreUrl = "",
+        gpcSupportedPlatforms = listOf("android"),
+        openWithSupportedPlatforms = listOf("android")
+    )
+
+    @Before
+    fun setUp() {
+        every { giniHealthAPI.documentManager } returns documentManager
+        context = getApplicationContext()
+    }
+
+    @After
+    fun tearDown() {
+        testCoroutineScope.runTest {
+            PaymentComponentPreferences(context!!).apply {
+                clearData()
+            }
+        }
+        context = null
+        unmockkAll()
+    }
+
+    private fun createMockedContextAndSetDependencies(paymentProviderList: List<PaymentProvider>, paymentProviderAppsList: List<PaymentProviderApp>): Context {
+        val privateContext: Context = mockk()
+        val resources: Resources = spyk(context!!.resources)
+        val packageManager: PackageManager = mockk(relaxed = true)
+
+        mockkStatic(Context::generateBitmapDrawableIcon)
+        mockkStatic(PackageManager::getPaymentProviderApps)
+        every { privateContext.applicationContext } returns context
+        every { privateContext.packageManager } returns packageManager
+        every { privateContext.resources } returns resources
+        every { privateContext.generateBitmapDrawableIcon(any(), any()) } returns null
+        every { packageManager.getPaymentProviderApps(paymentProviderList, privateContext) } returns paymentProviderAppsList
+
+        return privateContext
+    }
+
+    private fun buildPaymentProviderApp(paymentProvider: PaymentProvider, isInstalled: Boolean) = PaymentProviderApp(
+        name = paymentProvider.name,
+        icon = null,
+        colors = PaymentProviderAppColors(
+            backgroundColor = 0,
+            textColor = 0
+        ),
+        paymentProvider = paymentProvider,
+        installedPaymentProviderApp = if (isInstalled) mockk(relaxed = true) else null
+    )
+
+    @Test
+    fun `emits error when it cannot load payment providers`() = runTest {
+        // Given
+        coEvery { documentManager.getPaymentProviders() } returns Resource.Error()
+
+        // When
+        val paymentComponent = PaymentComponent(context!!, giniHealthAPI)
+        paymentComponent.loadPaymentProviderApps()
+
+        // Then
+        paymentComponent.paymentProviderAppsFlow.test {
+            assertThat(awaitItem()).isInstanceOf(PaymentProviderAppsState.Error::class.java)
+        }
+    }
+
+    @Test
+    fun `emits error when loading payment providers is cancelled`() = runTest {
+        // Given
+        coEvery { documentManager.getPaymentProviders() } returns Resource.Cancelled()
+
+        // When
+        val paymentComponent = PaymentComponent(context!!, giniHealthAPI)
+        paymentComponent.loadPaymentProviderApps()
+
+        // Then
+        paymentComponent.paymentProviderAppsFlow.test {
+            assertThat(awaitItem()).isInstanceOf(PaymentProviderAppsState.Error::class.java)
+        }
+    }
+
+    @Test
+    fun `emits payment provider apps when loaded`() = runTest {
+        // Given
+        val paymentProviderList = listOf(
+            paymentProvider,
+            paymentProvider1,
+            paymentProvider2
+        )
+
+        coEvery { documentManager.getPaymentProviders() } returns Resource.Success(paymentProviderList)
+
+        // When
+        val paymentComponent = PaymentComponent(context!!, giniHealthAPI)
+        paymentComponent.loadPaymentProviderApps()
+
+        // Then
+        paymentComponent.paymentProviderAppsFlow.test {
+            val validation = awaitItem()
+            assertThat(validation).isInstanceOf(PaymentProviderAppsState.Success::class.java)
+            assertThat((validation as PaymentProviderAppsState.Success).paymentProviderApps.size).isEqualTo(3)
+
+            cancelAndConsumeRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `installed payment providers are prioritized to top of list`() = runTest {
+        // Given
+        val paymentProviderList = listOf(
+            paymentProvider,
+            paymentProvider1,
+            paymentProvider2
+        )
+
+        coEvery { documentManager.getPaymentProviders() } returns Resource.Success(paymentProviderList)
+
+        val paymentProviderAppList = listOf<PaymentProviderApp>(
+            buildPaymentProviderApp(paymentProvider, false),
+            buildPaymentProviderApp(paymentProvider1, false),
+            buildPaymentProviderApp(paymentProvider2, false),
+        )
+        val mockedContext = createMockedContextAndSetDependencies(paymentProviderList, paymentProviderAppList)
+        mockkStatic(PackageManager::getInstalledPaymentProviderApps)
+        every { mockedContext.packageManager.getInstalledPaymentProviderApps() } returns emptyList()
+
+        //When
+        val paymentComponent = PaymentComponent(mockedContext, giniHealthAPI)
+        paymentComponent.loadPaymentProviderApps()
+
+        // Then
+        paymentComponent.paymentProviderAppsFlow.test {
+            val validation = awaitItem()
+            assertThat(validation).isInstanceOf(PaymentProviderAppsState.Success::class.java)
+            assertThat((validation as PaymentProviderAppsState.Success).paymentProviderApps.size).isEqualTo(3)
+            assertThat(validation.paymentProviderApps.indexOfFirst { it.paymentProvider.id == paymentProvider2.id }).isEqualTo(2)
+            assertThat(validation.paymentProviderApps.filter { it.isInstalled() }).isEmpty()
+
+            val paymentProviderAppListWithInstalled = listOf<PaymentProviderApp>(
+                buildPaymentProviderApp(paymentProvider, false),
+                buildPaymentProviderApp(paymentProvider1, false),
+                buildPaymentProviderApp(paymentProvider2, true),
+            )
+            every { mockedContext.packageManager.getPaymentProviderApps(paymentProviderList, mockedContext) } returns paymentProviderAppListWithInstalled
+
+            paymentComponent.recheckWhichPaymentProviderAppsAreInstalled()
+            val installedIsFirstItemValidation = awaitItem()
+
+            assertThat(installedIsFirstItemValidation).isInstanceOf(PaymentProviderAppsState.Success::class.java)
+            assertThat((installedIsFirstItemValidation as PaymentProviderAppsState.Success).paymentProviderApps.size).isEqualTo(3)
+            assertThat(installedIsFirstItemValidation.paymentProviderApps.indexOfFirst { it.paymentProvider.id == paymentProvider2.id }).isEqualTo(0)
+
+            cancelAndConsumeRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `sorting of installed GPC apps is stable`() = runTest {
+        // Given
+        val paymentProviderList = listOf(
+            paymentProvider,
+            paymentProvider1,
+            paymentProvider2
+        )
+
+        coEvery { documentManager.getPaymentProviders() } returns Resource.Success(paymentProviderList)
+
+        val paymentProviderAppList = listOf<PaymentProviderApp>(
+            buildPaymentProviderApp(paymentProvider, false),
+            buildPaymentProviderApp(paymentProvider1, false),
+            buildPaymentProviderApp(paymentProvider2, false),
+        )
+        val mockedContext = createMockedContextAndSetDependencies(paymentProviderList, paymentProviderAppList)
+
+        //When
+        val paymentComponent = PaymentComponent(mockedContext, giniHealthAPI)
+        paymentComponent.loadPaymentProviderApps()
+
+        // Then
+        paymentComponent.paymentProviderAppsFlow.test {
+            val validation = awaitItem()
+            assertThat(validation).isInstanceOf(PaymentProviderAppsState.Success::class.java)
+            assertThat((validation as PaymentProviderAppsState.Success).paymentProviderApps.size).isEqualTo(3)
+            assertThat(validation.paymentProviderApps.indexOfFirst { it.paymentProvider.id == paymentProvider1.id }).isEqualTo(1)
+            assertThat(validation.paymentProviderApps.indexOfFirst { it.paymentProvider.id == paymentProvider2.id }).isEqualTo(2)
+            assertThat(validation.paymentProviderApps.filter { it.isInstalled() }).isEmpty()
+
+            val paymentProviderAppListWithInstalled = listOf<PaymentProviderApp>(
+                buildPaymentProviderApp(paymentProvider, false),
+                buildPaymentProviderApp(paymentProvider1, true),
+                buildPaymentProviderApp(paymentProvider2, true),
+            )
+            every { mockedContext.packageManager.getPaymentProviderApps(paymentProviderList, mockedContext) } returns paymentProviderAppListWithInstalled
+
+            paymentComponent.recheckWhichPaymentProviderAppsAreInstalled()
+            val installedIsFirstItemValidation = awaitItem()
+
+            assertThat(installedIsFirstItemValidation).isInstanceOf(PaymentProviderAppsState.Success::class.java)
+            assertThat((installedIsFirstItemValidation as PaymentProviderAppsState.Success).paymentProviderApps.size).isEqualTo(3)
+            assertThat(installedIsFirstItemValidation.paymentProviderApps.indexOfFirst { it.paymentProvider.id == paymentProvider1.id }).isEqualTo(0)
+            assertThat(installedIsFirstItemValidation.paymentProviderApps.indexOfFirst { it.paymentProvider.id == paymentProvider2.id }).isEqualTo(1)
+
+            cancelAndConsumeRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `rechecks which payment provider apps are installed`() = runTest {
+        //Given
+        val paymentProviderList = mutableListOf(
+            paymentProvider
+        )
+
+        coEvery { documentManager.getPaymentProviders() } returns Resource.Success(paymentProviderList)
+
+        //When
+        val paymentComponent = PaymentComponent(context!!, giniHealthAPI)
+        paymentComponent.loadPaymentProviderApps()
+
+        // Then
+        paymentComponent.paymentProviderAppsFlow.test {
+            val validation = awaitItem()
+            assertThat(validation).isInstanceOf(PaymentProviderAppsState.Success::class.java)
+            assertThat((validation as PaymentProviderAppsState.Success).paymentProviderApps).isNotEmpty()
+
+            paymentComponent.recheckWhichPaymentProviderAppsAreInstalled()
+            val validateRecheckEmpty = awaitItem()
+            assertThat(validateRecheckEmpty).isInstanceOf(PaymentProviderAppsState.Success::class.java)
+            assertThat((validateRecheckEmpty as PaymentProviderAppsState.Success).paymentProviderApps).isNotEmpty()
+
+            cancelAndConsumeRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `sets selected payment provider`() = runTest {
+        // Given
+        val paymentProviderList = listOf(
+            paymentProvider,
+            paymentProvider1,
+            paymentProvider2,
+        )
+
+        coEvery { documentManager.getPaymentProviders() } returns Resource.Success(paymentProviderList)
+
+        val paymentComponentPreferences = PaymentComponentPreferences(context!!)
+        paymentComponentPreferences.deleteSelectedPaymentProviderId()
+
+        val paymentComponent = PaymentComponent(context!!, giniHealthAPI)
+        paymentComponent.loadPaymentProviderApps()
+
+        paymentComponent.selectedPaymentProviderAppFlow.test {
+            val noPaymentProviderSelectedValidation = awaitItem()
+
+            assertThat(noPaymentProviderSelectedValidation).isInstanceOf(
+                SelectedPaymentProviderAppState.NothingSelected::class.java)
+            assertThat(paymentComponent.paymentProviderAppsFlow.value).isInstanceOf(PaymentProviderAppsState.Success::class.java)
+
+            //When
+            val paymentProviderToBeSelected = (paymentComponent.paymentProviderAppsFlow.value as PaymentProviderAppsState.Success).paymentProviderApps.last()
+            paymentComponent.setSelectedPaymentProviderApp(paymentProviderToBeSelected)
+
+            // Then
+            val paymentProviderSelectedValidation = awaitItem()
+            assertThat(paymentProviderSelectedValidation).isInstanceOf(
+                SelectedPaymentProviderAppState.AppSelected::class.java)
+            assertThat((paymentProviderSelectedValidation as SelectedPaymentProviderAppState.AppSelected).paymentProviderApp.paymentProvider.id).isEqualTo(paymentProviderList.last().id)
+
+            cancelAndConsumeRemainingEvents()
+        }
+
+        paymentComponentPreferences.deleteSelectedPaymentProviderId()
+    }
+
+    @Test
+    fun `restores previously selected payment provider`() = runTest {
+        // Given
+        val paymentProviderList = listOf(
+            paymentProvider,
+            paymentProvider1,
+            paymentProvider2,
+        )
+
+        coEvery { documentManager.getPaymentProviders() } returns Resource.Success(paymentProviderList)
+
+        val paymentComponentPreferences = PaymentComponentPreferences(context!!)
+        paymentComponentPreferences.deleteSelectedPaymentProviderId()
+
+        val paymentComponent = PaymentComponent(context!!, giniHealthAPI)
+        paymentComponent.loadPaymentProviderApps()
+
+        paymentComponent.selectedPaymentProviderAppFlow.test {
+            val noPaymentProviderSelectedValidation = awaitItem()
+
+            assertThat(noPaymentProviderSelectedValidation).isInstanceOf(
+                SelectedPaymentProviderAppState.NothingSelected::class.java)
+            assertThat(paymentComponent.paymentProviderAppsFlow.value).isInstanceOf(PaymentProviderAppsState.Success::class.java)
+
+            val paymentProviderToBeSelected = (paymentComponent.paymentProviderAppsFlow.value as PaymentProviderAppsState.Success).paymentProviderApps.last()
+            paymentComponent.setSelectedPaymentProviderApp(paymentProviderToBeSelected)
+
+            cancelAndConsumeRemainingEvents()
+        }
+
+        // When
+        val newPaymentComponent = PaymentComponent(context!!, giniHealthAPI)
+        newPaymentComponent.loadPaymentProviderApps()
+
+        paymentComponent.selectedPaymentProviderAppFlow.test {
+            // Then
+            val paymentProviderSelectedValidation = awaitItem()
+            assertThat(paymentProviderSelectedValidation).isInstanceOf(
+                SelectedPaymentProviderAppState.AppSelected::class.java)
+            assertThat((paymentProviderSelectedValidation as SelectedPaymentProviderAppState.AppSelected).paymentProviderApp.paymentProvider.id).isEqualTo(paymentProviderList.last().id)
+
+            cancelAndConsumeRemainingEvents()
+        }
+
+        paymentComponentPreferences.deleteSelectedPaymentProviderId()
+    }
+
+    @Test
+    fun `sort function brings installed GCP apps to the front of the line`() = runTest {
+        // Given
+        val paymentComponent = PaymentComponent(context!!, giniHealthAPI)
+        val paymentProviderAppList = listOf<PaymentProviderApp>(
+            buildPaymentProviderApp(paymentProvider, false),
+            buildPaymentProviderApp(paymentProvider1, false),
+            buildPaymentProviderApp(paymentProvider2, true),
+        )
+
+        assertThat(paymentProviderAppList.indexOfFirst { it.isInstalled()}).isEqualTo(2)
+
+        // When
+        val sortedPaymentProviderAppList = paymentComponent.sortPaymentProviderApps(paymentProviderAppList)
+
+        // Then
+        assertThat(sortedPaymentProviderAppList.indexOfFirst { it.isInstalled() }).isEqualTo(0)
+    }
+
+    @Test
+    fun `updates selected payment provider app`() = runTest {
+        // Given
+        val paymentProviderList = listOf(
+            paymentProvider,
+            paymentProvider1,
+            paymentProvider2
+        )
+
+        coEvery { documentManager.getPaymentProviders() } returns Resource.Success(paymentProviderList)
+
+        val paymentComponentPreferences = PaymentComponentPreferences(context!!)
+        paymentComponentPreferences.deleteSelectedPaymentProviderId()
+
+        val paymentProviderAppList = listOf<PaymentProviderApp>(
+            buildPaymentProviderApp(paymentProvider, false),
+            buildPaymentProviderApp(paymentProvider1, false),
+            buildPaymentProviderApp(paymentProvider2, false),
+        )
+        val mockedContext = createMockedContextAndSetDependencies(paymentProviderList, paymentProviderAppList)
+
+        val paymentComponent = PaymentComponent(mockedContext, giniHealthAPI)
+        paymentComponent.loadPaymentProviderApps()
+        paymentComponent.setSelectedPaymentProviderApp(paymentProviderAppList[0])
+
+        paymentComponent.selectedPaymentProviderAppFlow.test {
+            var selectedPaymentProviderAppState = awaitItem()
+
+            assertThat(selectedPaymentProviderAppState).isInstanceOf(SelectedPaymentProviderAppState.AppSelected::class.java)
+            assertThat((selectedPaymentProviderAppState as SelectedPaymentProviderAppState.AppSelected).paymentProviderApp.isInstalled()).isFalse()
+
+            val paymentProviderAppListWithInstalled = listOf(
+                buildPaymentProviderApp(paymentProvider, true),
+                buildPaymentProviderApp(paymentProvider1, false),
+                buildPaymentProviderApp(paymentProvider2, false),
+            )
+            every { mockedContext.packageManager.getPaymentProviderApps(paymentProviderList, mockedContext) } returns paymentProviderAppListWithInstalled
+
+            // When
+            paymentComponent.recheckWhichPaymentProviderAppsAreInstalled()
+
+            // Then
+            selectedPaymentProviderAppState = awaitItem()
+            assertThat((selectedPaymentProviderAppState as SelectedPaymentProviderAppState.AppSelected).paymentProviderApp.isInstalled()).isTrue()
+
+            cancelAndConsumeRemainingEvents()
+        }
+
+        paymentComponentPreferences.deleteSelectedPaymentProviderId()
+    }
+
+    @Test
+    fun `rechecks returning user`() = runTest {
+        // Given
+        val paymentComponent = PaymentComponent(context!!, giniHealthAPI)
+        paymentComponent.shouldCheckReturningUser = true
+
+        paymentComponent.checkReturningUser()
+
+        paymentComponent.returningUserFlow.test {
+            assertThat(awaitItem()).isEqualTo(false)
+
+            // When
+            paymentComponent.paymentComponentPreferences.saveReturningUser()
+            paymentComponent.checkReturningUser()
+
+            // Then
+            assertThat(awaitItem()).isEqualTo(true)
+        }
+    }
+
+    @Test
+    fun `calls to save returning user`() = runTest {
+        // Given
+        val paymentComponent = PaymentComponent(context!!, giniHealthAPI)
+        paymentComponent.shouldCheckReturningUser = true
+
+        paymentComponent.checkReturningUser()
+
+        paymentComponent.returningUserFlow.test {
+            assertThat(awaitItem()).isEqualTo(false)
+
+            // When
+            paymentComponent.onPayInvoiceClicked("123")
+            paymentComponent.checkReturningUser()
+
+            // Then
+            assertThat(awaitItem()).isEqualTo(true)
+        }
+    }
+
+    @Test
+    fun `forwards onPay call to listener`() = runTest {
+        // Given
+        val paymentComponent = PaymentComponent(context!!, giniHealthAPI)
+        paymentComponent.listener = mockk(relaxed = true)
+
+        // When
+        paymentComponent.onPayInvoiceClicked("123")
+
+        // Then
+        verify { paymentComponent.listener?.onPayInvoiceClicked("123") }
+    }
+
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/paymentprovider/PaymentProviderAppTest.kt b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/paymentprovider/PaymentProviderAppTest.kt
new file mode 100644
index 0000000000..ecf9877674
--- /dev/null
+++ b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/paymentprovider/PaymentProviderAppTest.kt
@@ -0,0 +1,211 @@
+package net.gini.android.merchant.sdk.paymentprovider
+
+import android.content.ComponentName
+import android.content.Intent
+import android.content.pm.*
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import io.mockk.CapturingSlot
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.slot
+import net.gini.android.health.api.models.PaymentProvider
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Created by Alpár Szotyori on 09.12.21.
+ *
+ * Copyright (c) 2021 Gini GmbH.
+ */
+
+private val installedPaymentProviderAppsFixture = listOf(
+    InstalledPaymentProviderApp(
+        packageName = "net.gini.android.bank.exampleapp1",
+        version = "1.2.3",
+        launchIntent = Intent().apply {
+            action = Intent.ACTION_VIEW
+            component = ComponentName("net.gini.android.bank.exampleapp1.screens.main", "MainScreenActivity")
+        }
+    ),
+    InstalledPaymentProviderApp(
+        packageName = "net.gini.android.bank.exampleapp2",
+        version = "3.4.5",
+        launchIntent = Intent().apply {
+            action = Intent.ACTION_VIEW
+            component = ComponentName("net.gini.android.bank.exampleapp2.screens.main", "MainScreenActivity")
+        }
+    )
+)
+
+val resolveInfosFixture = installedPaymentProviderAppsFixture.map { installedPaymentProviderApp ->
+    ResolveInfo().apply {
+        activityInfo = ActivityInfo().apply {
+            applicationInfo = ApplicationInfo().apply {
+                packageName = installedPaymentProviderApp.packageName
+            }
+            packageName = installedPaymentProviderApp.launchIntent.component!!.packageName
+            name = installedPaymentProviderApp.launchIntent.component!!.className
+        }
+    }
+}
+
+val packageInfosFixture = installedPaymentProviderAppsFixture.map { installedPaymentProviderApp ->
+    installedPaymentProviderApp.packageName to PackageInfo().apply {
+        versionName = installedPaymentProviderApp.version
+    }
+}
+
+val paymentProvidersFixture = installedPaymentProviderAppsFixture.map { installedPaymentProviderApp ->
+    PaymentProvider(
+        id = "id",
+        name = "name",
+        packageName = installedPaymentProviderApp.packageName,
+        appVersion = installedPaymentProviderApp.version,
+        colors = PaymentProvider.Colors(
+            backgroundColorRGBHex = "112233",
+            textColoRGBHex = "ffffff"
+        ),
+        icon = byteArrayOf(),
+        gpcSupportedPlatforms = listOf("android"),
+        openWithSupportedPlatforms = listOf("android")
+    )
+}
+
+@RunWith(AndroidJUnit4::class)
+class PaymentProviderAppTest {
+
+    private var packageManager: PackageManager? = null
+    private var intentQuerySlot: CapturingSlot<Intent>? = null
+
+    @Before
+    fun setup() {
+        intentQuerySlot = slot()
+
+        packageManager = mockk(relaxed = true)
+        every { packageManager!!.queryIntentActivities(capture(intentQuerySlot!!), 0) } returns resolveInfosFixture
+
+        packageInfosFixture.forEach { (packageName, packageInfo) ->
+            every { packageManager!!.getPackageInfo(eq(packageName), 0) } returns packageInfo
+        }
+    }
+
+    @After
+    fun tearDown() {
+        packageManager = null
+        intentQuerySlot = null
+    }
+
+    @Test
+    fun `queries with correct uri`() {
+        // When
+        packageManager!!.getInstalledPaymentProviderApps()
+
+        // Then
+        intentQuerySlot!!.captured.let { intent ->
+            assertThat(intent.action).isEqualTo(Intent.ACTION_VIEW)
+            assertThat(intent.data!!.scheme).isEqualTo("ginipay")
+            assertThat(intent.data!!.host).isEqualTo("payment")
+            assertThat(intent.data!!.path).isEqualTo("/id")
+        }
+    }
+
+    @Test
+    fun `finds installed payment provider apps`() {
+        // When
+        val installedPaymentProviderApps = packageManager!!.getInstalledPaymentProviderApps()
+
+        // Then
+        assertThat(installedPaymentProviderApps).containsExactlyElementsIn(installedPaymentProviderAppsFixture)
+    }
+
+    @Test
+    fun `returns empty list if there are no installed payment provider apps`() {
+        // Given
+        every { packageManager!!.queryIntentActivities(any(), 0) } returns emptyList()
+
+        // When
+        val installedPaymentProviderApps = packageManager!!.getInstalledPaymentProviderApps()
+
+        // Then
+        assertThat(installedPaymentProviderApps).isEmpty()
+    }
+
+    @Test
+    fun `link installed payment provider apps with payment providers`() {
+        // Given
+        val paymentProviders = listOf(paymentProvidersFixture[1])
+
+        // When
+        val installedPaymentProviderApps = packageManager!!.linkInstalledPaymentProviderAppsWithPaymentProviders(paymentProviders)
+
+        // Then
+        assertThat(installedPaymentProviderApps).containsExactly(installedPaymentProviderAppsFixture[1] to paymentProvidersFixture[1])
+    }
+
+    @Test
+    fun `returns empty list if there are no installed bank apps with a corresponding payment provider`() {
+        // Given
+        val paymentProviders = emptyList<PaymentProvider>()
+
+        // When
+        val installedPaymentProviderApps = packageManager!!.linkInstalledPaymentProviderAppsWithPaymentProviders(paymentProviders)
+
+        // Then
+        assertThat(installedPaymentProviderApps).isEmpty()
+    }
+
+    @Test
+    fun `finds installed payment provider app for each payment provider`() {
+        // When
+        val paymentProviderApps =
+            packageManager!!.getPaymentProviderApps(paymentProvidersFixture, ApplicationProvider.getApplicationContext())
+
+        // Then
+        assertThat(paymentProviderApps).hasSize(2)
+        for (i in paymentProvidersFixture.indices) {
+            assertThat(paymentProviderApps[i].name).isEqualTo(paymentProvidersFixture[i].name)
+            assertThat(paymentProviderApps[i].icon).isNotNull()
+            assertThat(paymentProviderApps[i].colors).isNotNull()
+            assertThat(paymentProviderApps[i].paymentProvider).isEqualTo(paymentProvidersFixture[i])
+            assertThat(paymentProviderApps[i].installedPaymentProviderApp).isNotNull()
+            assertThat(paymentProviderApps[i].installedPaymentProviderApp!!.packageName).isEqualTo(
+                paymentProvidersFixture[i].packageName)
+            assertThat(paymentProviderApps[i].installedPaymentProviderApp!!.launchIntent).isNotNull()
+        }
+
+    }
+
+    @Test
+    fun `returns empty list if there are no payment providers`() {
+        // Given
+        val paymentProviders = emptyList<PaymentProvider>()
+
+        // When
+        val paymentProviderApps =
+            packageManager!!.getPaymentProviderApps(paymentProviders, ApplicationProvider.getApplicationContext())
+
+        // Then
+        assertThat(paymentProviderApps).isEmpty()
+    }
+
+    @Test
+    fun `creates intent for payment provider app with payment request id`() {
+        // Given
+        val paymentProviderApps =
+            packageManager!!.getPaymentProviderApps(paymentProvidersFixture, ApplicationProvider.getApplicationContext())
+        val paymentRequestId = "payment-request-1234"
+
+        // When
+        val intent = paymentProviderApps[0].getIntent(paymentRequestId)
+
+        assertThat(intent).isNotNull()
+        assertThat(intent!!.action).isEqualTo(Intent.ACTION_VIEW)
+        assertThat(intent.data!!.scheme).isEqualTo("ginipay")
+        assertThat(intent.data!!.host).isEqualTo("payment")
+        assertThat(intent.data!!.path).isEqualTo("/$paymentRequestId")
+    }
+}
diff --git a/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/review/PaymentValidationTest.kt b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/review/PaymentValidationTest.kt
new file mode 100644
index 0000000000..f47910ea2d
--- /dev/null
+++ b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/review/PaymentValidationTest.kt
@@ -0,0 +1,101 @@
+package net.gini.android.merchant.sdk.review
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.test.runTest
+import net.gini.android.merchant.sdk.api.payment.model.PaymentDetails
+import org.junit.Test
+import org.junit.runner.RunWith
+
+
+@RunWith(AndroidJUnit4::class)
+class PaymentValidationTest {
+    @Test
+    fun `emits empty recipient`() = runTest {
+        val paymentDetails = PaymentDetails(
+            recipient = "",
+            amount = "30",
+            iban = "1234",
+            purpose = "purpose"
+        )
+
+        val validation = paymentDetails.validate()
+
+        assertThat(validation).isNotEmpty()
+        assertThat(validation).contains(ValidationMessage.Empty(PaymentField.Recipient))
+    }
+
+    @Test
+    fun `emits empty amount`() = runTest {
+        val paymentDetails = PaymentDetails(
+            recipient = "recipient",
+            amount = "",
+            iban = "1234",
+            purpose = "purpose"
+        )
+
+        val validation = paymentDetails.validate()
+
+        assertThat(validation).isNotEmpty()
+        assertThat(validation).contains(ValidationMessage.Empty(PaymentField.Amount))
+    }
+
+    @Test
+    fun `emits invalid amount`() = runTest {
+        val paymentDetails = PaymentDetails(
+            recipient = "recipient",
+            amount = "abc",
+            iban = "",
+            purpose = "purpose"
+        )
+
+        val validation = paymentDetails.validate()
+
+        assertThat(validation).isNotEmpty()
+        assertThat(validation).contains(ValidationMessage.AmountFormat)
+    }
+
+    @Test
+    fun `emits empty iban`() = runTest {
+        val paymentDetails = PaymentDetails(
+            recipient = "recipient",
+            amount = "2",
+            iban = "",
+            purpose = "purpose"
+        )
+
+        val validation = paymentDetails.validate()
+
+        assertThat(validation).isNotEmpty()
+        assertThat(validation).contains(ValidationMessage.Empty(PaymentField.Iban))
+    }
+
+    @Test
+    fun `validates iban iban`() = runTest {
+        val paymentDetails = PaymentDetails(
+            recipient = "recipient",
+            amount = "3",
+            iban = "DE91 1000 0000 0123 4567 89",
+            purpose = "purpose"
+        )
+
+        val validation = paymentDetails.validate()
+
+        assertThat(validation).isEmpty()
+    }
+
+    @Test
+    fun `emits invalid iban`() = runTest {
+        val paymentDetails = PaymentDetails(
+            recipient = "recipient",
+            amount = "3",
+            iban = "DE91 ",
+            purpose = "purpose"
+        )
+
+        val validation = paymentDetails.validate()
+
+        assertThat(validation).isNotEmpty()
+        assertThat(validation).contains(ValidationMessage.InvalidIban)
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/review/installApp/InstallAppBottomSheetTest.kt b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/review/installApp/InstallAppBottomSheetTest.kt
new file mode 100644
index 0000000000..e6eaf2e986
--- /dev/null
+++ b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/review/installApp/InstallAppBottomSheetTest.kt
@@ -0,0 +1,114 @@
+package net.gini.android.merchant.sdk.review.installApp
+
+import android.view.View
+import androidx.fragment.app.testing.launchFragmentInContainer
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.test.runTest
+import net.gini.android.merchant.sdk.R
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.merchant.sdk.paymentcomponent.SelectedPaymentProviderAppState
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderApp
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class InstallAppBottomSheetTest {
+
+    private lateinit var paymentProviderApp: PaymentProviderApp
+    private lateinit var paymentComponent: PaymentComponent
+
+    @Before
+    fun setup() {
+        val paymentProviderName = "Test Bank App"
+        paymentProviderApp = mockk(relaxed = true)
+        every { paymentProviderApp.name } returns paymentProviderName
+
+        paymentComponent = mockk<PaymentComponent>()
+        every { paymentComponent.recheckWhichPaymentProviderAppsAreInstalled() } returns Unit
+    }
+
+    @Test
+    fun `get it on play store button visible if bank app not installed`() = runTest {
+        every { paymentProviderApp.isInstalled() } returns false
+        every { paymentComponent.selectedPaymentProviderAppFlow } returns MutableStateFlow(
+            SelectedPaymentProviderAppState.AppSelected(paymentProviderApp))
+
+        // Given
+        val bottomSheet = InstallAppBottomSheet.newInstance(
+            paymentComponent,
+            mockk(),
+            mockk(),
+            0
+        )
+
+        // When
+        launchFragmentInContainer(themeResId = R.style.GiniMerchantTheme) {
+            bottomSheet
+        }
+
+        // Then
+        onView(withId(R.id.gms_play_store_logo)).check { view, _ -> Truth.assertThat(view.visibility).isEqualTo(View.VISIBLE) }
+    }
+
+    @Test
+    fun `forward button visible if bank app not installed`() = runTest {
+        // Given
+        every { paymentProviderApp.isInstalled() } returns true
+        every { paymentComponent.selectedPaymentProviderAppFlow } returns MutableStateFlow(
+            SelectedPaymentProviderAppState.AppSelected(paymentProviderApp))
+
+        val bottomSheet = InstallAppBottomSheet.newInstance(
+            paymentComponent,
+            mockk(),
+            mockk(),
+            0
+        )
+
+        // When
+        launchFragmentInContainer(themeResId = R.style.GiniMerchantTheme) {
+            bottomSheet
+        }
+
+        // Then
+        onView(withId(R.id.gms_forward_button)).check { view, _ -> Truth.assertThat(view.visibility).isEqualTo(View.VISIBLE) }
+    }
+
+    @Test
+    fun `redirect to bank called when tapping on forward button`() = runTest {
+        // Given
+        every { paymentProviderApp.isInstalled() } returns true
+        every { paymentComponent.selectedPaymentProviderAppFlow } returns MutableStateFlow(
+            SelectedPaymentProviderAppState.AppSelected(paymentProviderApp))
+
+        val listener: InstallAppForwardListener = mockk()
+        every { listener.onForwardToBankSelected() } returns mockk()
+
+        val bottomSheet = InstallAppBottomSheet.newInstance(
+            paymentComponent,
+            listener,
+            mockk(relaxed = true),
+            0
+        )
+
+        launchFragmentInContainer(themeResId = R.style.GiniMerchantTheme) {
+            bottomSheet
+        }
+
+        onView(withId(R.id.gms_forward_button)).check { view, _ -> Truth.assertThat(view.visibility).isEqualTo(View.VISIBLE) }
+
+        // When
+        onView(withId(R.id.gms_forward_button)).perform(ViewActions.click())
+
+        // Then
+        verify(exactly = 1) { listener.onForwardToBankSelected() }
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/review/model/PaymentDetailsTest.kt b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/review/model/PaymentDetailsTest.kt
new file mode 100644
index 0000000000..b8142bdaac
--- /dev/null
+++ b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/review/model/PaymentDetailsTest.kt
@@ -0,0 +1,69 @@
+package net.gini.android.merchant.sdk.review.model
+
+import com.google.common.truth.Truth.assertThat
+import net.gini.android.merchant.sdk.api.payment.model.PaymentDetails
+import net.gini.android.merchant.sdk.api.payment.model.overwriteEmptyFields
+import org.junit.Before
+import org.junit.Test
+import java.util.Locale
+
+/**
+ * Created by Alpár Szotyori on 01.02.22.
+ *
+ * Copyright (c) 2022 Gini GmbH.
+ */
+class PaymentDetailsTest {
+
+    @Before
+    fun setUp() {
+        Locale.setDefault(Locale.US)
+    }
+
+    @Test
+    fun `Overwrites empty fields`() {
+        // Given
+        val paymentDetails = PaymentDetails(
+            recipient = "",
+            iban = "iban",
+            amount = "30",
+            purpose = "payment"
+        )
+
+        val nonEmptyPaymentFields = PaymentDetails(
+            recipient = "recipient",
+            iban = "iban",
+            amount = "30",
+            purpose = "payment"
+        )
+
+        // When
+        val newPaymentDetails = paymentDetails.overwriteEmptyFields(nonEmptyPaymentFields)
+
+        // Then
+        assertThat(newPaymentDetails.recipient).isEqualTo("recipient")
+    }
+
+    @Test
+    fun `Keeps original value if field not empty`() {
+        // Given
+        val paymentDetails = PaymentDetails(
+            recipient = "",
+            iban = "iban",
+            amount = "30",
+            purpose = "payment"
+        )
+
+        val nonEmptyPaymentFields = PaymentDetails(
+            recipient = "recipient",
+            iban = "iban2",
+            amount = "30",
+            purpose = "payment"
+        )
+
+        // When
+        val newPaymentDetails = paymentDetails.overwriteEmptyFields(nonEmptyPaymentFields)
+
+        // Then
+        assertThat(newPaymentDetails.iban).isEqualTo("iban")
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/review/openWith/OpenWithBottomSheetTest.kt b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/review/openWith/OpenWithBottomSheetTest.kt
new file mode 100644
index 0000000000..a7fc50bc15
--- /dev/null
+++ b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/review/openWith/OpenWithBottomSheetTest.kt
@@ -0,0 +1,37 @@
+package net.gini.android.merchant.sdk.review.openWith
+
+import androidx.fragment.app.testing.launchFragmentInContainer
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import org.junit.runner.RunWith
+import net.gini.android.merchant.sdk.R
+
+@RunWith(AndroidJUnit4::class)
+class OpenWithBottomSheetTest {
+    @Test
+    fun `listener method called when 'Forward' button tapped`() = runTest {
+        // Given
+        val listener: OpenWithForwardListener = mockk()
+        every { listener.onForwardSelected() } returns mockk()
+
+        launchFragmentInContainer(themeResId = R.style.GiniMerchantTheme) {
+            OpenWithBottomSheet.newInstance(
+                mockk(relaxed = true),
+                listener
+            )
+        }
+
+        // When
+        onView(withId(R.id.gms_forward_button)).perform(ViewActions.click())
+
+        // Then
+        verify { listener.onForwardSelected() }
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/review/openWith/OpenWithPreferencesTest.kt b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/review/openWith/OpenWithPreferencesTest.kt
new file mode 100644
index 0000000000..96f7df1a04
--- /dev/null
+++ b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/review/openWith/OpenWithPreferencesTest.kt
@@ -0,0 +1,48 @@
+package net.gini.android.merchant.sdk.review.openWith
+
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import app.cash.turbine.test
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.junit.Before
+import org.junit.Rule
+import org.junit.runner.RunWith
+import com.google.common.truth.Truth.assertThat
+import net.gini.android.merchant.sdk.test.ViewModelTestCoroutineRule
+import org.junit.Test
+
+
+@ExperimentalCoroutinesApi
+@RunWith(AndroidJUnit4::class)
+class OpenWithPreferencesTest {
+
+    @get:Rule
+    val testCoroutineRule = ViewModelTestCoroutineRule()
+    private lateinit var context: Context
+
+    @Before
+    fun setup() {
+        context = ApplicationProvider.getApplicationContext()
+    }
+
+    @Test
+    fun `increments open with counter`() = runTest {
+        // Given
+        val openWithPreferences = OpenWithPreferences(context)
+        val paymentProviderId = "test_payment_provider"
+
+        openWithPreferences.getLiveCountForPaymentProviderId(paymentProviderId).test {
+            val initialCount = awaitItem()
+            assertThat(initialCount).isNull()
+
+            // When
+            openWithPreferences.incrementCountForPaymentProviderId(paymentProviderId)
+
+            // Then
+            val updatedCount = awaitItem()
+            assertThat(updatedCount).isEqualTo(1)
+        }
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/review/reviewComponent/ReviewComponentTest.kt b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/review/reviewComponent/ReviewComponentTest.kt
new file mode 100644
index 0000000000..f39ca8283c
--- /dev/null
+++ b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/review/reviewComponent/ReviewComponentTest.kt
@@ -0,0 +1,139 @@
+package net.gini.android.merchant.sdk.review.reviewComponent
+
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import app.cash.turbine.test
+import com.google.common.truth.Truth.assertThat
+import io.mockk.every
+import io.mockk.mockk
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.runTest
+import net.gini.android.merchant.sdk.GiniMerchant
+import net.gini.android.merchant.sdk.R
+import net.gini.android.merchant.sdk.api.ResultWrapper
+import net.gini.android.merchant.sdk.api.payment.model.PaymentDetails
+import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent
+import net.gini.android.merchant.sdk.util.GiniPaymentManager
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@ExperimentalCoroutinesApi
+@RunWith(AndroidJUnit4::class)
+class ReviewComponentTest {
+    private lateinit var context: Context
+    private lateinit var giniMerchant: GiniMerchant
+    private lateinit var paymentComponent: PaymentComponent
+    private lateinit var giniPaymentManager: GiniPaymentManager
+    private val testCoroutineDispatcher = StandardTestDispatcher()
+    private val testCoroutineScope =
+        TestScope(testCoroutineDispatcher + Job())
+
+    @Before
+    fun setup() {
+        context = ApplicationProvider.getApplicationContext()
+        context.setTheme(R.style.GiniMerchantTheme)
+        giniMerchant = mockk(relaxed = true)
+        paymentComponent = mockk(relaxed = true)
+        giniPaymentManager = mockk(relaxed = true)
+    }
+
+
+    @Test
+    fun `sets payment button not enabled if payment details are empty`() = runTest {
+        // Given
+        val paymentDetails = PaymentDetails(
+            recipient = "",
+            iban = "",
+            amount = "",
+            purpose = ""
+        )
+
+        // When
+        every { giniMerchant.paymentFlow } returns MutableStateFlow(ResultWrapper.Success(paymentDetails))
+
+        val reviewComponent = ReviewComponent(
+            paymentComponent = paymentComponent,
+            reviewConfig = mockk(relaxed = true),
+            giniMerchant = giniMerchant,
+            giniPaymentManager = giniPaymentManager,
+            coroutineScope = testCoroutineScope
+        )
+
+        // Then
+        reviewComponent.isPaymentButtonEnabled.test {
+            val validation = awaitItem()
+            assertThat(validation).isFalse()
+        }
+    }
+
+    @Test
+    fun `sets payment button not enabled if still loading`() = runTest {
+        //Given
+        every { giniMerchant.paymentFlow } returns MutableStateFlow(ResultWrapper.Loading())
+
+        val reviewComponent = ReviewComponent(
+            paymentComponent = paymentComponent,
+            reviewConfig = mockk(relaxed = true),
+            giniMerchant = giniMerchant,
+            giniPaymentManager = giniPaymentManager,
+            coroutineScope = testCoroutineScope
+        )
+
+        // Then
+        reviewComponent.isPaymentButtonEnabled.test {
+            val validation = awaitItem()
+            assertThat(validation).isFalse()
+        }
+    }
+
+    @Test
+    fun `sets payment button enabled`() = runTest {
+        // Given
+        val paymentDetails = PaymentDetails(
+            recipient = "",
+            iban = "",
+            amount = "",
+            purpose = ""
+        )
+
+        every { giniMerchant.paymentFlow } returns MutableStateFlow(ResultWrapper.Success(paymentDetails))
+
+        val reviewComponent = ReviewComponent(
+            paymentComponent = paymentComponent,
+            reviewConfig = mockk(relaxed = true),
+            giniMerchant = giniMerchant,
+            giniPaymentManager = giniPaymentManager,
+            coroutineScope = testCoroutineScope
+        )
+
+        reviewComponent.isPaymentButtonEnabled.test {
+            val validation = awaitItem()
+            assertThat(validation).isFalse()
+
+            // When
+            reviewComponent.setRecipient("recipient")
+            awaitItem()
+
+            reviewComponent.setAmount("30")
+            awaitItem()
+
+            reviewComponent.setIban("GR96 0810 0010 0000 0123 4567 890")
+            awaitItem()
+
+            reviewComponent.setPurpose("purpose")
+
+            // Then
+            val enabledValidation = awaitItem()
+            assertThat(enabledValidation).isTrue()
+
+            cancelAndConsumeRemainingEvents()
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/test/ViewModelTestCoroutineRule.kt b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/test/ViewModelTestCoroutineRule.kt
new file mode 100644
index 0000000000..53bfef22df
--- /dev/null
+++ b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/test/ViewModelTestCoroutineRule.kt
@@ -0,0 +1,39 @@
+package net.gini.android.merchant.sdk.test
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.resetMain
+import kotlinx.coroutines.test.setMain
+import org.junit.rules.TestRule
+import org.junit.runner.Description
+import org.junit.runners.model.Statement
+
+/**
+ * Created by Alpár Szotyori on 13.12.21.
+ *
+ * Copyright (c) 2021 Gini GmbH.
+ */
+
+/**
+ * Source: https://blog.mindorks.com/unit-testing-viewmodel-with-kotlin-coroutines-and-livedata
+ *
+ * Updated according to the migration guide for 1.6.0:
+ * https://github.com/Kotlin/kotlinx.coroutines/blob/1.6.0/kotlinx-coroutines-test/MIGRATION.md#simplify-code-by-removing-unneeded-entities
+ */
+@ExperimentalCoroutinesApi
+class ViewModelTestCoroutineRule : TestRule {
+
+    override fun apply(base: Statement, description: Description?) = object : Statement() {
+        @Throws(Throwable::class)
+        override fun evaluate() {
+            Dispatchers.setMain(UnconfinedTestDispatcher())
+
+            base.evaluate()
+
+            Dispatchers.resetMain()
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/util/GiniPaymentTest.kt b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/util/GiniPaymentTest.kt
new file mode 100644
index 0000000000..dd769fd8db
--- /dev/null
+++ b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/util/GiniPaymentTest.kt
@@ -0,0 +1,134 @@
+package net.gini.android.merchant.sdk.util
+
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import app.cash.turbine.test
+import com.google.common.truth.Truth.assertThat
+import io.mockk.coEvery
+import io.mockk.every
+import io.mockk.mockk
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import net.gini.android.core.api.Resource
+import net.gini.android.health.api.GiniHealthAPI
+import net.gini.android.health.api.HealthApiDocumentManager
+import net.gini.android.health.api.models.PaymentProvider
+import net.gini.android.merchant.sdk.GiniMerchant
+import net.gini.android.merchant.sdk.R
+import net.gini.android.merchant.sdk.api.payment.model.PaymentDetails
+import net.gini.android.merchant.sdk.api.payment.model.PaymentRequest
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderApp
+import net.gini.android.merchant.sdk.paymentprovider.PaymentProviderAppColors
+import net.gini.android.merchant.sdk.review.ValidationMessage
+import net.gini.android.merchant.sdk.test.ViewModelTestCoroutineRule
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@ExperimentalCoroutinesApi
+@RunWith(AndroidJUnit4::class)
+class GiniPaymentTest {
+
+    @get:Rule
+    val testCoroutineRule = ViewModelTestCoroutineRule()
+
+    private val giniHealthAPI: GiniHealthAPI = mockk(relaxed = true) { GiniHealthAPI::class.java }
+    private val documentManager: HealthApiDocumentManager = mockk { HealthApiDocumentManager::class.java }
+    private var giniMerchant: GiniMerchant? = null
+    private var context: Context? = null
+
+
+    private var paymentProviderApp =  PaymentProviderApp(
+            name = "payment provider",
+            icon = null,
+            colors = PaymentProviderAppColors(-1, -1),
+            paymentProvider = PaymentProvider(
+                id = "payment provider id",
+                name = "payment provider name",
+                packageName = "com.paymentProvider.packageName",
+                appVersion = "appVersion",
+                colors = PaymentProvider.Colors(backgroundColorRGBHex = "", textColoRGBHex = ""),
+                icon = ByteArray(0),
+                gpcSupportedPlatforms = listOf("android"),
+                openWithSupportedPlatforms = listOf("android")
+            )
+        )
+
+    private var paymentDetails = PaymentDetails(
+        recipient = "recipient",
+        iban = "iban",
+        amount = "20",
+        purpose = "purpose",
+    )
+
+    @Before
+    fun setUp() {
+        every { giniHealthAPI.documentManager } returns documentManager
+        context = ApplicationProvider.getApplicationContext()
+        context!!.setTheme(R.style.GiniMerchantTheme)
+        giniMerchant = mockk(relaxed = true)
+        every { giniMerchant!!.giniHealthAPI } returns giniHealthAPI
+    }
+
+    @Test(expected = Exception::class)
+    fun `throws exception if payment provider is null when creating payment request`() = runTest {
+        // Given
+        val giniPayment = GiniPaymentManager(giniMerchant)
+
+        // When - Then should throw error
+        giniPayment.getPaymentRequest(null, paymentDetails)
+    }
+
+    @Test(expected = Exception::class)
+    fun `throws exception if payment request was canceled`() = runTest {
+        // Given
+        coEvery { documentManager.createPaymentRequest(any()) } coAnswers  { Resource.Cancelled() }
+        val giniPayment = GiniPaymentManager(giniMerchant)
+
+        // When - Then should throw error
+        giniPayment.getPaymentRequest(paymentProviderApp, paymentDetails)
+    }
+
+    @Test(expected = Exception::class)
+    fun `throws exception if payment request was not successful`() = runTest {
+        // Given
+        coEvery { documentManager.createPaymentRequest(any()) } coAnswers  { Resource.Error() }
+        val giniPayment = GiniPaymentManager(giniMerchant)
+
+        // When - Then should throw error
+        giniPayment.getPaymentRequest(paymentProviderApp, paymentDetails)
+    }
+
+    @Test
+    fun `returns successful if payment request was successful`() = runTest {
+        //Given
+        coEvery { documentManager.createPaymentRequest(any()) } coAnswers  { Resource.Success("123") }
+        coEvery { documentManager.getPaymentRequest(any()) } coAnswers  { Resource.Success(mockk(relaxed = true)) }
+        val giniPayment = GiniPaymentManager(giniMerchant)
+
+        // Then
+        assertThat(giniPayment.getPaymentRequest(paymentProviderApp, paymentDetails)).isInstanceOf(PaymentRequest::class.java)
+    }
+
+    @Test
+    fun `emits validation on flow`() = runTest {
+        // Given
+        val giniPayment = GiniPaymentManager(giniMerchant)
+
+        // When
+        giniPayment.emitPaymentValidation(emptyList())
+
+        // Then
+        giniPayment.paymentValidation.test {
+            assertThat(awaitItem()).isEmpty()
+
+            giniPayment.emitPaymentValidation(listOf(ValidationMessage.InvalidIban))
+            val newItem = awaitItem()
+
+            assertThat(newItem).isNotEmpty()
+            assertThat(newItem[0]).isInstanceOf(ValidationMessage.InvalidIban::class.java)
+        }
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/util/IbanValidatorKtTest.kt b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/util/IbanValidatorKtTest.kt
new file mode 100644
index 0000000000..239ab7568f
--- /dev/null
+++ b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/util/IbanValidatorKtTest.kt
@@ -0,0 +1,27 @@
+package net.gini.android.merchant.sdk.util
+
+import org.junit.Test
+
+class IbanValidatorKtTest {
+
+    @Test
+    fun testValidIban() {
+        assert(isValidIban("GB33BUKB20201555555555"))
+        assert(isValidIban("GB94BARC10201530093459"))
+        assert(!isValidIban("GB94BARC20201530093459"))
+        assert(!isValidIban("GB96BARC202015300934591"))
+        assert(isValidIban("BE71 0961 2345 6769"))
+        assert(isValidIban("BR15 0000 0000 0000 1093 2840 814 P2"))
+        assert(isValidIban("FR76 3000 6000 0112 3456 7890 189"))
+        assert(isValidIban("DE91 1000 0000 0123 4567 89"))
+        assert(isValidIban("GR96 0810 0010 0000 0123 4567 890"))
+        assert(isValidIban("MU43 BOMM 0101 1234 5678 9101 000 MUR"))
+        assert(isValidIban("PK70 BANK 0000 1234 5678 9000"))
+        assert(isValidIban("PL10 1050 0099 7603 1234 5678 9123"))
+        assert(isValidIban("RO09 BCYP 0000 0012 3456 7890"))
+        assert(isValidIban("SA44 2000 0001 2345 6789 1234"))
+        assert(isValidIban("ES79 2100 0813 6101 2345 6789"))
+        assert(isValidIban("CH56 0483 5012 3456 7800 9"))
+        assert(isValidIban("GB98 MIDL 0700 9312 3456 78"))
+    }
+}
\ No newline at end of file
diff --git a/merchant-sdk/sdk/src/test/resources/robolectric.properties b/merchant-sdk/sdk/src/test/resources/robolectric.properties
new file mode 100644
index 0000000000..d2994456ce
--- /dev/null
+++ b/merchant-sdk/sdk/src/test/resources/robolectric.properties
@@ -0,0 +1 @@
+instrumentedPackages=androidx.loader.content
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 1c1a02c6e5..31c0a9b8db 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -29,3 +29,6 @@ include("capture-sdk:default-network")
 
 include("bank-sdk:sdk")
 include("bank-sdk:example-app")
+
+include("merchant-sdk:sdk")
+include("merchant-sdk:example-app")