diff --git a/cardio/build.gradle b/cardio/build.gradle
index 9424d30e..60631890 100644
--- a/cardio/build.gradle
+++ b/cardio/build.gradle
@@ -38,6 +38,4 @@ dependencies {
     implementation project(':ui')
 
     testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
diff --git a/core/build.gradle b/core/build.gradle
index 9d20c379..d8330905 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -20,6 +20,7 @@ dependencies {
     implementation "com.squareup.okhttp3:okhttp:${okHttpVersion}"
     implementation "com.google.code.gson:gson:$gsonVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
     testImplementation 'junit:junit:4.13'
 }
 
diff --git a/core/src/main/java/ru/tinkoff/acquiring/sdk/AcquiringSdk.kt b/core/src/main/java/ru/tinkoff/acquiring/sdk/AcquiringSdk.kt
index 22fd3415..ab9bfb6b 100644
--- a/core/src/main/java/ru/tinkoff/acquiring/sdk/AcquiringSdk.kt
+++ b/core/src/main/java/ru/tinkoff/acquiring/sdk/AcquiringSdk.kt
@@ -226,6 +226,10 @@ class AcquiringSdk(
         }
     }
 
+    fun getTerminalPayMethods() : GetTerminalPayMethodsRequest {
+        return GetTerminalPayMethodsRequest(terminalKey)
+    }
+
     fun submit3DSAuthorization(threeDSServerTransID: String, transStatus: String, request: (Submit3DSAuthorizationRequest.() -> Unit)? = null): Submit3DSAuthorizationRequest {
         return Submit3DSAuthorizationRequest().apply {
             terminalKey = this@AcquiringSdk.terminalKey
diff --git a/core/src/main/java/ru/tinkoff/acquiring/sdk/models/paysources/YandexPay.kt b/core/src/main/java/ru/tinkoff/acquiring/sdk/models/paysources/YandexPay.kt
new file mode 100644
index 00000000..144d7831
--- /dev/null
+++ b/core/src/main/java/ru/tinkoff/acquiring/sdk/models/paysources/YandexPay.kt
@@ -0,0 +1,12 @@
+package ru.tinkoff.acquiring.sdk.models.paysources
+
+import ru.tinkoff.acquiring.sdk.models.PaymentSource
+
+/**
+ * Тип оплаты с помощью Yandex Pay
+ *
+ * @param yandexPayToken токен для оплаты, полученный через Yandex Pay
+ *
+ * Created by i.golovachev
+ */
+class YandexPay(var yandexPayToken: String) : PaymentSource
\ No newline at end of file
diff --git a/core/src/main/java/ru/tinkoff/acquiring/sdk/network/AcquiringApi.kt b/core/src/main/java/ru/tinkoff/acquiring/sdk/network/AcquiringApi.kt
index a7d7200b..d3cb081c 100644
--- a/core/src/main/java/ru/tinkoff/acquiring/sdk/network/AcquiringApi.kt
+++ b/core/src/main/java/ru/tinkoff/acquiring/sdk/network/AcquiringApi.kt
@@ -43,6 +43,7 @@ object AcquiringApi {
     const val SUBMIT_3DS_AUTHORIZATION = "Submit3DSAuthorization"
     const val SUBMIT_3DS_AUTHORIZATION_V2 = "Submit3DSAuthorizationV2"
     const val COMPLETE_3DS_METHOD_V2 = "Complete3DSMethodv2"
+    const val GET_TERMINAL_PAY_METHODS = "GetTerminalPayMethods"
 
     const val API_ERROR_CODE_3DSV2_NOT_SUPPORTED = "106"
     const val API_ERROR_CODE_CUSTOMER_NOT_FOUND = "7"
diff --git a/core/src/main/java/ru/tinkoff/acquiring/sdk/network/NetworkClient.kt b/core/src/main/java/ru/tinkoff/acquiring/sdk/network/NetworkClient.kt
index 6307b957..efc3d00c 100644
--- a/core/src/main/java/ru/tinkoff/acquiring/sdk/network/NetworkClient.kt
+++ b/core/src/main/java/ru/tinkoff/acquiring/sdk/network/NetworkClient.kt
@@ -189,6 +189,7 @@ internal class NetworkClient {
 
         fun createGson(): Gson {
             return GsonBuilder()
+                .disableHtmlEscaping()
                 .excludeFieldsWithModifiers(Modifier.TRANSIENT, Modifier.STATIC)
                 .setExclusionStrategies(SerializableExclusionStrategy())
                 .registerTypeAdapter(CardStatus::class.java, CardStatusSerializer())
diff --git a/core/src/main/java/ru/tinkoff/acquiring/sdk/requests/AcquiringRequest.kt b/core/src/main/java/ru/tinkoff/acquiring/sdk/requests/AcquiringRequest.kt
index f09c0774..902aeefc 100644
--- a/core/src/main/java/ru/tinkoff/acquiring/sdk/requests/AcquiringRequest.kt
+++ b/core/src/main/java/ru/tinkoff/acquiring/sdk/requests/AcquiringRequest.kt
@@ -17,6 +17,8 @@
 package ru.tinkoff.acquiring.sdk.requests
 
 import com.google.gson.Gson
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.Deferred
 import okhttp3.Response
 import ru.tinkoff.acquiring.sdk.AcquiringSdk
 import ru.tinkoff.acquiring.sdk.exceptions.NetworkException
@@ -34,7 +36,8 @@ import java.security.PublicKey
  *
  * @author Mariya Chernyadieva, Taras Nagorny
  */
-abstract class AcquiringRequest<R : AcquiringResponse>(internal val apiMethod: String) : Request<R> {
+abstract class AcquiringRequest<R : AcquiringResponse>(internal val apiMethod: String) :
+    Request<R> {
 
     protected val gson: Gson = NetworkClient.createGson()
 
@@ -43,6 +46,7 @@ abstract class AcquiringRequest<R : AcquiringResponse>(internal val apiMethod: S
 
     internal lateinit var terminalKey: String
     internal lateinit var publicKey: PublicKey
+
     @Volatile
     private var disposed = false
     private val ignoredFieldsSet: HashSet<String> = hashSetOf(DATA, RECEIPT, RECEIPTS, SHOPS)
@@ -51,7 +55,6 @@ abstract class AcquiringRequest<R : AcquiringResponse>(internal val apiMethod: S
     internal open val tokenIgnoreFields: HashSet<String>
         get() = ignoredFieldsSet
 
-
     protected abstract fun validate()
 
     override fun isDisposed(): Boolean {
@@ -81,6 +84,28 @@ abstract class AcquiringRequest<R : AcquiringResponse>(internal val apiMethod: S
         client.call(request, responseClass, onSuccess, onFailure)
     }
 
+    open fun performRequestAsync(responseClass: Class<R>): Deferred<Result<R>> {
+        this.validate()
+        val client = NetworkClient()
+        val deferred: CompletableDeferred<Result<R>> = CompletableDeferred()
+
+        client.call(this, responseClass,
+            onSuccess = {
+                deferred.complete(Result.success(it))
+            },
+            onFailure = {
+                deferred.complete(Result.failure(it))
+            })
+        return deferred
+    }
+
+    suspend fun performSuspendRequest(responseClass: Class<R>): Result<R> {
+        return performRequestAsync(responseClass).run {
+            start()
+            await()
+        }
+    }
+
     @kotlin.jvm.Throws(NetworkException::class)
     protected fun <R : AcquiringResponse> performRequestRaw(request: AcquiringRequest<R>): Response {
         request.validate()
@@ -188,7 +213,7 @@ abstract class AcquiringRequest<R : AcquiringResponse>(internal val apiMethod: S
         const val REQUEST_KEY = "RequestKey"
         const val SOURCE = "Source"
         const val PAYMENT_SOURCE = "PaymentSource"
-        const val ANDROID_PAY_TOKEN = "EncryptedPaymentData"
+        const val ENCRYPTED_PAYMENT_DATA = "EncryptedPaymentData"
         const val DATA_TYPE = "DataType"
         const val REDIRECT_DUE_DATE = "RedirectDueDate"
         const val NOTIFICATION_URL = "NotificationURL"
@@ -202,5 +227,10 @@ abstract class AcquiringRequest<R : AcquiringResponse>(internal val apiMethod: S
         const val THREE_DS_SERVER_TRANS_ID = "threeDSServerTransID"
         const val TRANS_STATUS = "transStatus"
         const val CRES = "cres"
+        const val PAYSOURCE = "Paysource"
     }
 }
+
+suspend inline fun <reified R : AcquiringResponse> AcquiringRequest<R>.performSuspendRequest(): Result<R> {
+    return performSuspendRequest(R::class.java)
+}
\ No newline at end of file
diff --git a/core/src/main/java/ru/tinkoff/acquiring/sdk/requests/FinishAuthorizeRequest.kt b/core/src/main/java/ru/tinkoff/acquiring/sdk/requests/FinishAuthorizeRequest.kt
index 095b72d7..91cacb83 100644
--- a/core/src/main/java/ru/tinkoff/acquiring/sdk/requests/FinishAuthorizeRequest.kt
+++ b/core/src/main/java/ru/tinkoff/acquiring/sdk/requests/FinishAuthorizeRequest.kt
@@ -16,12 +16,10 @@
 
 package ru.tinkoff.acquiring.sdk.requests
 
+import kotlinx.coroutines.Deferred
 import ru.tinkoff.acquiring.sdk.exceptions.AcquiringSdkException
 import ru.tinkoff.acquiring.sdk.models.PaymentSource
-import ru.tinkoff.acquiring.sdk.models.paysources.AttachedCard
-import ru.tinkoff.acquiring.sdk.models.paysources.CardData
-import ru.tinkoff.acquiring.sdk.models.paysources.CardSource
-import ru.tinkoff.acquiring.sdk.models.paysources.GooglePay
+import ru.tinkoff.acquiring.sdk.models.paysources.*
 import ru.tinkoff.acquiring.sdk.network.AcquiringApi.FINISH_AUTHORIZE_METHOD
 import ru.tinkoff.acquiring.sdk.responses.FinishAuthorizeResponse
 
@@ -71,7 +69,7 @@ class FinishAuthorizeRequest : AcquiringRequest<FinishAuthorizeResponse>(FINISH_
     private var cardId: String? = null
     private var cvv: String? = null
     private var source: String? = null
-    private var googlePayToken: String? = null
+    private var encryptedToken: String? = null
     private var encodedCardData: String? = null
 
     override val tokenIgnoreFields: HashSet<String>
@@ -93,7 +91,7 @@ class FinishAuthorizeRequest : AcquiringRequest<FinishAuthorizeResponse>(FINISH_
         map.putIfNotNull(CVV, cvv)
         map.putIfNotNull(EMAIL, email)
         map.putIfNotNull(SOURCE, source)
-        map.putIfNotNull(ANDROID_PAY_TOKEN, googlePayToken)
+        map.putIfNotNull(ENCRYPTED_PAYMENT_DATA, encryptedToken)
         map.putIfNotNull(IP, ip)
         if (data != null) map.putDataIfNonNull(data)
 
@@ -106,7 +104,7 @@ class FinishAuthorizeRequest : AcquiringRequest<FinishAuthorizeResponse>(FINISH_
 
         when (paymentSource) {
             is CardData, is AttachedCard -> encodedCardData.validate(CARD_DATA)
-            is GooglePay -> googlePayToken.validate(ANDROID_PAY_TOKEN)
+            is GooglePay, is YandexPay -> encryptedToken.validate(ENCRYPTED_PAYMENT_DATA)
         }
     }
 
@@ -118,6 +116,11 @@ class FinishAuthorizeRequest : AcquiringRequest<FinishAuthorizeResponse>(FINISH_
         super.performRequest(this, FinishAuthorizeResponse::class.java, onSuccess, onFailure)
     }
 
+    override fun performRequestAsync(responseClass: Class<FinishAuthorizeResponse>): Deferred<Result<FinishAuthorizeResponse>> {
+        fillPaymentData()
+        return super.performRequestAsync(responseClass)
+    }
+
     fun attachedCard(attachedCard: AttachedCard.() -> Unit): PaymentSource {
         return AttachedCard().apply(attachedCard)
     }
@@ -143,10 +146,14 @@ class FinishAuthorizeRequest : AcquiringRequest<FinishAuthorizeResponse>(FINISH_
             }
             is GooglePay -> {
                 data = paymentSource as GooglePay
-                this.googlePayToken = data.googlePayToken
+                this.encryptedToken = data.googlePayToken
                 this.source = GOOGLE_PAY
             }
-
+            is YandexPay ->{
+                data = paymentSource as YandexPay
+                this.encryptedToken = data.yandexPayToken
+                this.source = YANDEX_PAY
+            }
             else -> throw AcquiringSdkException(IllegalStateException("Unknown type in 'paymentSource'"))
         }
     }
@@ -160,5 +167,6 @@ class FinishAuthorizeRequest : AcquiringRequest<FinishAuthorizeResponse>(FINISH_
     companion object {
 
         private const val GOOGLE_PAY = "GooglePay"
+        private const val YANDEX_PAY = "YandexPay"
     }
 }
diff --git a/core/src/main/java/ru/tinkoff/acquiring/sdk/requests/GetTerminalPayMethodsRequest.kt b/core/src/main/java/ru/tinkoff/acquiring/sdk/requests/GetTerminalPayMethodsRequest.kt
new file mode 100644
index 00000000..1dea42f8
--- /dev/null
+++ b/core/src/main/java/ru/tinkoff/acquiring/sdk/requests/GetTerminalPayMethodsRequest.kt
@@ -0,0 +1,37 @@
+package ru.tinkoff.acquiring.sdk.requests
+
+import ru.tinkoff.acquiring.sdk.network.AcquiringApi
+import ru.tinkoff.acquiring.sdk.network.AcquiringApi.GET_TERMINAL_PAY_METHODS
+import ru.tinkoff.acquiring.sdk.responses.GetTerminalPayMethodsResponse
+
+/**
+ * Запрос в MAPI, проверяет доступности методов оплаты на терминале
+ *
+ * Created by Ivan Golovachev
+ */
+class GetTerminalPayMethodsRequest(
+    terminalKey: String,
+    paysource: Paysource = Paysource.SDK
+) :
+    AcquiringRequest<GetTerminalPayMethodsResponse>(
+        "$GET_TERMINAL_PAY_METHODS?TerminalKey=$terminalKey&PaySource=$paysource") {
+
+    override val httpRequestMethod: String = AcquiringApi.API_REQUEST_METHOD_GET
+
+    override fun validate() = Unit
+
+    override fun asMap(): MutableMap<String, Any> = mutableMapOf()
+
+    override fun getToken(): String? = null
+
+    override fun execute(
+        onSuccess: (GetTerminalPayMethodsResponse) -> Unit,
+        onFailure: (Exception) -> Unit
+    ) {
+        super.performRequest(this, GetTerminalPayMethodsResponse::class.java, onSuccess, onFailure)
+    }
+
+    enum class Paysource {
+        API, SDK
+    }
+}
\ No newline at end of file
diff --git a/core/src/main/java/ru/tinkoff/acquiring/sdk/responses/FinishAuthorizeResponse.kt b/core/src/main/java/ru/tinkoff/acquiring/sdk/responses/FinishAuthorizeResponse.kt
index 1121e6d4..585e2c0d 100644
--- a/core/src/main/java/ru/tinkoff/acquiring/sdk/responses/FinishAuthorizeResponse.kt
+++ b/core/src/main/java/ru/tinkoff/acquiring/sdk/responses/FinishAuthorizeResponse.kt
@@ -89,7 +89,7 @@ class FinishAuthorizeResponse(
                     ThreeDsData(paymentId, acsUrl).apply {
                         md = this@FinishAuthorizeResponse.md
                         paReq = this@FinishAuthorizeResponse.paReq
-                        version = threeDsVersion
+                        version = threeDsVersion ?: "1.0.0"
                     }
                 } else if (tdsServerTransId != null && acsTransId != null) {
                     ThreeDsData(paymentId, acsUrl).apply {
@@ -97,7 +97,7 @@ class FinishAuthorizeResponse(
                         acsTransId = this@FinishAuthorizeResponse.acsTransId
                         acsRefNumber = this@FinishAuthorizeResponse.acsRefNumber
                         acsSignedContent = this@FinishAuthorizeResponse.acsSignedContent
-                        version = threeDsVersion
+                        version = threeDsVersion ?: "2.1.0"
                     }
                 } else throw AcquiringSdkException(IllegalStateException("Invalid 3DS params"))
             }
diff --git a/core/src/main/java/ru/tinkoff/acquiring/sdk/responses/GetTerminalPayMethodsResponse.kt b/core/src/main/java/ru/tinkoff/acquiring/sdk/responses/GetTerminalPayMethodsResponse.kt
new file mode 100644
index 00000000..34da66fb
--- /dev/null
+++ b/core/src/main/java/ru/tinkoff/acquiring/sdk/responses/GetTerminalPayMethodsResponse.kt
@@ -0,0 +1,68 @@
+package ru.tinkoff.acquiring.sdk.responses
+
+import com.google.gson.annotations.SerializedName
+
+/**
+ * Ответ на запрос /v2/GetTerminalPayMethods
+ *
+ * @param terminalInfo -  Характеристики терминала
+ *
+ *
+ * Created by Ivan Golovachev
+ */
+class GetTerminalPayMethodsResponse(
+
+    @SerializedName("TerminalInfo")
+    val terminalInfo: TerminalInfo? = null
+
+) : AcquiringResponse()
+
+
+/**
+ *
+ * @param terminalInfo      - Характеристики терминала
+ * @param paymethods        - Перечень доступных методов оплаты
+ * @param addCardScheme     - Признак возможности сохранения карт
+ * @param tokenRequired     - Признак необходимости подписания токеном
+ * @param initTokenRequired - Признак необходимости подписания токеном запроса /init
+ *
+ *
+ * Created by Ivan Golovachev
+ */
+class TerminalInfo(
+
+    @SerializedName("Paymethods")
+    val paymethods: List<PaymethodData> = emptyList(),
+
+    @SerializedName("AddCardScheme")
+    val addCardScheme: Boolean = false,
+
+    @SerializedName("TokenRequired")
+    val tokenRequired: Boolean = true,
+
+    @SerializedName("InitTokenRequired")
+    val initTokenRequired: Boolean = false
+)
+
+/**
+ *  @param params - Перечень параметров подключения в формате ключ-значение
+ */
+class PaymethodData(
+
+    @SerializedName("PayMethod")
+    val paymethod: Paymethod? = null,
+
+    @SerializedName("Params")
+    val params: Map<String, String> = emptyMap()
+)
+
+enum class Paymethod {
+    @SerializedName("TinkoffPay")
+    TinkoffPay,
+
+    @SerializedName("YandexPay")
+    YandexPay,
+
+    @SerializedName("SBP")
+    SBP
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index aaad050c..71d1fc98 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,6 +12,8 @@ POM_LICENCE_URL=https://github.com/Tinkoff/AcquiringSdkAndroid/blob/master/LICEN
 POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=tcs
 POM_DEVELOPER_NAME=Tinkoff Credit Systems
+org.gradle.daemon=true
+org.gradle.jvmargs=-Xmx8096m -XX:+UseConcMarkSweepGC -Dfile.encoding=UTF-8
 
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
index 3ed8293e..30fc6657 100644
--- a/gradle/versions.gradle
+++ b/gradle/versions.gradle
@@ -4,8 +4,9 @@ ext {
 
     compileSdk = 31
     minSdk = 21
+    yandexPayMinSdk = 23
     targetSdk = 31
-    buildTools = '29.0.2'
+    buildTools = '30.0.3'
 
     kotlinVersion = '1.6.10'
     gradlePluginVersion = '7.1.2'
@@ -29,6 +30,9 @@ ext {
     blurryVersion = '4.0.0'
     bouncyCastleVersion = '1.65'
     rootBeerVersion = '0.1.0'
+    materialVersion = '1.5.0'
 
     mokitoKotlin = '4.0.0'
+
+    yandexPayVersion = '0.2.1'
 }
diff --git a/readme.md b/readme.md
index 3ae2f2d5..2c9dbddf 100644
--- a/readme.md
+++ b/readme.md
@@ -117,8 +117,6 @@ tinkoffAcquiring.openPaymentScreen(this@MainActivity, paymentOptions, PAYMENT_RE
 
 [2] _Безопасная клавиатура_ используется вместо системной и обеспечивает дополнительную безопасность ввода, т.к. сторонние клавиатуры на устройстве клиента могут перехватывать данные и отправлять их злоумышленнику.
 
-[3] _Безопасная клавиатура_ используется вместо системной и обеспечивает дополнительную безопасность ввода, т.к. сторонние клавиатуры на устройстве клиента могут перехватывать данные и отправлять их злоумышленнику.
-
 
 ### Экран привязки карт
 Для запуска экрана привязки карт необходимо запустить **TinkoffAcquiring**#_openAttachCardScreen_. В метод также необходимо передать некоторые параметры - тип привязки, данные покупателя и опционально параметры кастомизации (по-аналогии с экраном оплаты):
@@ -254,6 +252,35 @@ var paymentOptions = PaymentOptions().setOptions {
 предыдущем шаге); время и частота проверки статуса платежа зависит от нужд клиентского приложения и остается на ваше усмотрение (один из вариантов -
 проверять статус платежа при возвращении приложения из фона)
 
+### Yandex Pay
+AcquiringSdk имеет возможность использовать внутри себя Yandex Pay в качестве хранилища карт.
+Внимание, этот функционал поддерживается только с версии Android 6.0 Marshmallow и выше.
+
+Если вы хотите использовать Yandex Pay вместе с AcquiringSdk вам необходимо:
+1. Получить в личном кабинете [Yandex](https://pay.yandex.ru/ru/docs/psp/android-sdk) значение `YANDEX_CLIENT_ID`
+2. Укажите полученный `YANDEX_CLIENT_ID` в сборочном скрипте [_build.gradle_][build-config] в качестве значения в `manifestPlaceholders`:
+```groovy
+android {
+  defaultConfig {
+    manifestPlaceholders = [
+      // Подставьте ваш yandex_client_id
+      YANDEX_CLIENT_ID: "12345678901234567890",
+    ]
+  }
+}
+```
+3. Добавить в [_build.gradle_][build-config]
+```groovy
+implementation 'ru.tinkoff.acquiring:yandexpay:$latestVersion'
+```
+Крайне не рекомендуется использовать `ru.tinkoff.acquiring:yandexpay` вместе с `com.yandex.pay:core` в рамках вашего приложения, так как
+могут возникнуть непредвиденные ошибки.
+
+4. Включить прием платежей через Yandex Pay в Личном кабинете.
+5. Проверить Доступ функционала Yandex Pay проверяется через метод `TinkoffAcquiring#checkTerminalInfo`, который возвращает данные обо всех методах оплаты,извлечь данные касательно Yandex Pay  расширение `TerminalInfo#mapYandexPayData`.
+6. Кнопка Yandex Pay инкапсулирована во фрагменте `YandexButtonFragment`. Размеры фрагмента-кнопки можете создать самостоятельно, однако если рекомендации по минимальной ширине. Фрагмент можно создать с помощью метода `TinkoffAcquiring.createYandexPayButtonFragment`.
+После выбора карты процесс оплаты запуститься самостоятельно. Возможности кастомизации можно посмотреть в [pages](https://github.com/Tinkoff/AcquiringSdkAndroid/wiki/Yandex-pay-in-ASDK).
+
 ### Дополнительные возможности
 
 #### Настройка стилей
@@ -336,6 +363,7 @@ implementation 'ru.tinkoff.acquiring:core:$latestVersion'
 -keep class ru.tinkoff.acquiring.sdk.localization.** { *; }
 -keep class ru.tinkoff.acquiring.sdk.requests.** { *; }
 -keep class ru.tinkoff.acquiring.sdk.models.** { *; }
+-keep class ru.tinkoff.acquiring.sdk.yandexpay.models.** { *; } // если подключали яндекс
 -keep class ru.rtln.tds.sdk.** { *; }
 -keep class org.spongycastle.**
 -keep class org.bouncycastle.**
diff --git a/sample/build.gradle b/sample/build.gradle
index b1b45d67..fbec59c7 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -7,12 +7,24 @@ android {
     compileSdkVersion rootProject.compileSdk
     buildToolsVersion rootProject.buildTools
 
+    signingConfigs {
+        debug {
+            storeFile file("debug.keystore")
+            storePassword 'android'
+            keyAlias 'androidDebugKey'
+            keyPassword 'android'
+        }
+    }
+
     defaultConfig {
         applicationId "ru.tinkoff.acquiring.sample"
-        minSdkVersion rootProject.minSdk
+        minSdkVersion rootProject.yandexPayMinSdk
         targetSdkVersion rootProject.compileSdk
         versionCode Integer.parseInt(VERSION_CODE)
         versionName VERSION_NAME
+        manifestPlaceholders = [
+                YANDEX_CLIENT_ID: "9dc6814e39204c638222dede9561ea6f"
+        ]
     }
     buildTypes {
         release {
@@ -39,6 +51,7 @@ dependencies {
     implementation "androidx.preference:preference:$preferenceVersion"
     implementation "androidx.appcompat:appcompat:$appCompatVersion"
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
+    implementation "com.google.android.material:material:${materialVersion}"
     implementation "com.google.code.gson:gson:$gsonVersion"
 
     testImplementation 'junit:junit:4.13'
@@ -46,6 +59,7 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
     implementation project(':ui')
+    implementation project(':yandexpay')
     implementation project(':cardio')
     implementation project(':threeds-sdk')
     implementation project(':threeds-wrapper')
diff --git a/sample/debug.keystore b/sample/debug.keystore
new file mode 100644
index 00000000..d1e38090
Binary files /dev/null and b/sample/debug.keystore differ
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index d3dbe361..ca8db8c7 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright © 2020 Tinkoff Bank
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,8 +25,8 @@
         android:allowBackup="false"
         android:icon="@mipmap/appicon"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme"
         android:networkSecurityConfig="@xml/network_security_config"
+        android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
 
         <meta-data
diff --git a/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/CartActivity.kt b/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/CartActivity.kt
index 37a060e0..85a3e8bf 100644
--- a/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/CartActivity.kt
+++ b/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/CartActivity.kt
@@ -70,6 +70,8 @@ class CartActivity : PayableActivity(), CartListAdapter.DeleteCartItemListener {
         setupTinkoffPay()
 
         checkCartEmpty()
+
+        setupYandexPay(R.style.AcquiringTheme_Base_Yandex,savedInstanceState)
     }
 
     override fun onResume() {
diff --git a/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/DetailsActivity.kt b/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/DetailsActivity.kt
index 21f82d5e..fc26935d 100644
--- a/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/DetailsActivity.kt
+++ b/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/DetailsActivity.kt
@@ -22,6 +22,7 @@ import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
@@ -89,6 +90,8 @@ class DetailsActivity : PayableActivity() {
             setupGooglePay()
         }
 
+        setupYandexPay(savedInstanceState = savedInstanceState)
+
         fillViews()
     }
 
diff --git a/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/PayableActivity.kt b/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/PayableActivity.kt
index 5192a608..bb9094d5 100644
--- a/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/PayableActivity.kt
+++ b/sample/src/main/java/ru/tinkoff/acquiring/sample/ui/PayableActivity.kt
@@ -25,6 +25,8 @@ import android.view.MenuItem
 import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.isVisible
+import androidx.fragment.app.commit
 import ru.tinkoff.acquiring.sample.R
 import ru.tinkoff.acquiring.sample.SampleApplication
 import ru.tinkoff.acquiring.sample.utils.SessionParams
@@ -42,6 +44,12 @@ import ru.tinkoff.acquiring.sdk.payment.PaymentListenerAdapter
 import ru.tinkoff.acquiring.sdk.payment.PaymentState
 import ru.tinkoff.acquiring.sdk.utils.GooglePayHelper
 import ru.tinkoff.acquiring.sdk.utils.Money
+import ru.tinkoff.acquiring.yandexpay.YandexButtonFragment
+import ru.tinkoff.acquiring.yandexpay.addYandexResultListener
+import ru.tinkoff.acquiring.yandexpay.createYandexPayButtonFragment
+import ru.tinkoff.acquiring.yandexpay.models.YandexPayData
+import ru.tinkoff.acquiring.yandexpay.models.enableYandexPay
+import ru.tinkoff.acquiring.yandexpay.models.mapYandexPayData
 import java.util.*
 import kotlin.math.abs
 
@@ -61,9 +69,10 @@ open class PayableActivity : AppCompatActivity() {
     private val paymentListener = createPaymentListener()
     private var isProgressShowing = false
     private var isErrorShowing = false
-    private var tinkoffAcquiring = SampleApplication.tinkoffAcquiring
+    protected var tinkoffAcquiring = SampleApplication.tinkoffAcquiring
     private val orderId: String
         get() = abs(Random().nextInt()).toString()
+    private var acqFragment: YandexButtonFragment? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -97,6 +106,7 @@ open class PayableActivity : AppCompatActivity() {
         when (requestCode) {
             PAYMENT_REQUEST_CODE, DYNAMIC_QR_PAYMENT_REQUEST_CODE -> handlePaymentResult(resultCode, data)
             GOOGLE_PAY_REQUEST_CODE -> handleGooglePayResult(resultCode, data)
+            YANDEX_PAY_REQUEST_CODE -> handleYandexPayResult(resultCode, data)
             else -> super.onActivityResult(requestCode, resultCode, data)
         }
     }
@@ -108,6 +118,9 @@ open class PayableActivity : AppCompatActivity() {
             putBoolean(STATE_LOADING_SHOW, isProgressShowing)
             putBoolean(STATE_ERROR_SHOW, isErrorShowing)
         }
+        acqFragment?.let {
+            supportFragmentManager.putFragment(outState, YANDEX_PAY_FRAGMENT_KEY, it)
+        }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -154,6 +167,36 @@ open class PayableActivity : AppCompatActivity() {
         })
     }
 
+    protected fun setupYandexPay(theme: Int? = null, savedInstanceState: Bundle?) {
+        if (!settings.yandexPayEnabled) return
+
+        val yandexPayButtonContainer = findViewById<View>(R.id.btn_yandex_container)
+
+        tinkoffAcquiring.checkTerminalInfo({ terminalInfo ->
+            val yandexPayData = terminalInfo?.mapYandexPayData() ?: return@checkTerminalInfo
+
+            yandexPayButtonContainer.isVisible = terminalInfo.enableYandexPay()
+            val paymentOptions = createPaymentOptions().apply {
+                val session = TerminalsManager.init(this@PayableActivity).selectedTerminal
+                this.setTerminalParams(
+                     terminalKey = session.terminalKey, publicKey = session.publicKey
+                )
+            }
+
+            val yaFragment = createYandexButtonFragment(savedInstanceState, paymentOptions, yandexPayData, theme)
+
+            if (supportFragmentManager.isDestroyed.not()) {
+                supportFragmentManager.commit { replace(yandexPayButtonContainer.id, yaFragment) }
+            }
+
+            acqFragment = yaFragment
+
+        }, {
+            yandexPayButtonContainer.visibility = View.GONE
+            showErrorDialog()
+        })
+    }
+
     protected fun setupGooglePay() {
         val googlePayButton = findViewById<View>(R.id.btn_google_pay)
 
@@ -254,7 +297,21 @@ open class PayableActivity : AppCompatActivity() {
         }
     }
 
+    private fun handleYandexPayResult(resultCode: Int, data: Intent?) {
+        when (resultCode) {
+            RESULT_OK -> {
+                acqFragment?.options = createPaymentOptions()
+            }
+            RESULT_CANCELED -> Toast.makeText(this, R.string.payment_cancelled, Toast.LENGTH_SHORT).show()
+            RESULT_ERROR -> {
+                Toast.makeText(this, R.string.payment_failed, Toast.LENGTH_SHORT).show()
+                (data?.getSerializableExtra(TinkoffAcquiring.EXTRA_ERROR) as? Throwable)?.printStackTrace()
+            }
+        }
+    }
+
     private fun handleGooglePayResult(resultCode: Int, data: Intent?) {
+        val a = createPaymentOptions()
         if (data != null && resultCode == Activity.RESULT_OK) {
             val token = GooglePayHelper.getGooglePayToken(data)
             if (token == null) {
@@ -296,12 +353,45 @@ open class PayableActivity : AppCompatActivity() {
         }
     }
 
-    private fun showProgressDialog() {
+    private fun createYandexButtonFragment(savedInstanceState: Bundle?,
+                                           paymentOptions: PaymentOptions,
+                                           yandexPayData: YandexPayData,
+                                           theme: Int?) : YandexButtonFragment {
+        return savedInstanceState?.let {
+            try {
+                (supportFragmentManager.getFragment(savedInstanceState, YANDEX_PAY_FRAGMENT_KEY) as? YandexButtonFragment)?.also {
+                    tinkoffAcquiring.addYandexResultListener(
+                        fragment = it,
+                        activity = this,
+                        yandexPayRequestCode = YANDEX_PAY_REQUEST_CODE,
+                        onYandexErrorCallback = { showErrorDialog() },
+                        onYandexCancelCallback = {
+                            Toast.makeText(this, R.string.payment_cancelled, Toast.LENGTH_SHORT).show()
+                        }
+                    )
+                }
+            } catch (i: IllegalStateException) {
+                null
+            }
+        } ?: tinkoffAcquiring.createYandexPayButtonFragment(
+            activity = this,
+            yandexPayData = yandexPayData,
+            options = paymentOptions,
+            yandexPayRequestCode = YANDEX_PAY_REQUEST_CODE,
+            themeId = theme,
+            onYandexErrorCallback = { showErrorDialog() },
+            onYandexCancelCallback = {
+                Toast.makeText(this, R.string.payment_cancelled, Toast.LENGTH_SHORT).show()
+            }
+        )
+    }
+
+    protected fun showProgressDialog() {
         progressDialog.show()
         isProgressShowing = true
     }
 
-    private fun hideProgressDialog() {
+    protected fun hideProgressDialog() {
         progressDialog.dismiss()
         isProgressShowing = false
     }
@@ -311,9 +401,12 @@ open class PayableActivity : AppCompatActivity() {
         const val PAYMENT_REQUEST_CODE = 1
         const val DYNAMIC_QR_PAYMENT_REQUEST_CODE = 2
         const val GOOGLE_PAY_REQUEST_CODE = 5
+        const val YANDEX_PAY_REQUEST_CODE = 6
 
         private const val STATE_PAYMENT_AMOUNT = "payment_amount"
         private const val STATE_LOADING_SHOW = "loading_show"
         private const val STATE_ERROR_SHOW = "error_show"
+
+        private const val YANDEX_PAY_FRAGMENT_KEY = "yandex_fragment_key"
     }
 }
diff --git a/sample/src/main/java/ru/tinkoff/acquiring/sample/utils/SettingsSdkManager.kt b/sample/src/main/java/ru/tinkoff/acquiring/sample/utils/SettingsSdkManager.kt
index f07e25d3..31b2980e 100644
--- a/sample/src/main/java/ru/tinkoff/acquiring/sample/utils/SettingsSdkManager.kt
+++ b/sample/src/main/java/ru/tinkoff/acquiring/sample/utils/SettingsSdkManager.kt
@@ -53,6 +53,9 @@ class SettingsSdkManager(private val context: Context) {
     val isTinkoffPayEnabled: Boolean
         get() = preferences.getBoolean(context.getString(R.string.acq_sp_tinkoff_pay), true)
 
+    val yandexPayEnabled: Boolean
+        get() = preferences.getBoolean(context.getString(R.string.acq_sp_yandex_pay), true)
+
     val checkType: String
         get() {
             val defaultCheckType = context.getString(R.string.acq_sp_check_type_no)
diff --git a/sample/src/main/res/layout/activity_cart.xml b/sample/src/main/res/layout/activity_cart.xml
index e2c05bed..478ccdee 100644
--- a/sample/src/main/res/layout/activity_cart.xml
+++ b/sample/src/main/res/layout/activity_cart.xml
@@ -118,6 +118,15 @@
                 android:textSize="@dimen/acq_medium_text_size"
                 tools:visibility="visible" />
 
+            <FrameLayout
+                android:id="@+id/btn_yandex_container"
+                android:paddingBottom="12dp"
+                android:layout_margin="4dp"
+                android:visibility="gone"
+                android:layout_width="match_parent"
+                android:layout_height="72dp">
+            </FrameLayout>
+
         </LinearLayout>
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/sample/src/main/res/layout/activity_details.xml b/sample/src/main/res/layout/activity_details.xml
index 2dce07dd..9d2939a8 100644
--- a/sample/src/main/res/layout/activity_details.xml
+++ b/sample/src/main/res/layout/activity_details.xml
@@ -156,6 +156,17 @@
             android:layout_width="wrap_content"
             android:text="@string/buy_now" />
 
+        <FrameLayout
+            android:id="@+id/btn_yandex_container"
+            android:background="@color/colorPrimary"
+            android:layout_weight="1"
+            android:visibility="gone"
+            android:layout_width="wrap_content"
+            android:minWidth="120dp"
+            android:layout_height="40dp"
+            android:layout_margin="8dp">
+        </FrameLayout>
+
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/sample/src/main/res/values-ru/strings.xml b/sample/src/main/res/values-ru/strings.xml
index 655d21d8..54502fd1 100644
--- a/sample/src/main/res/values-ru/strings.xml
+++ b/sample/src/main/res/values-ru/strings.xml
@@ -69,6 +69,7 @@
     <string name="settings_title_google_pay">GooglePay</string>
     <string name="settings_title_fps">Система быстрых платежей</string>
     <string name="settings_title_tinkoff_pay">Tinkoff Pay</string>
+    <string name="settings_title_yandex_pay">Yandex Pay</string>
     <string name="settings_title_style_id">Стиль</string>
     <string name="settings_title_dark_mode_id">Темная тема</string>
     <string name="settings_title_check_type_id">CheckType</string>
diff --git a/sample/src/main/res/values/preferences_keys.xml b/sample/src/main/res/values/preferences_keys.xml
index 29b5e6d7..7e2ec691 100644
--- a/sample/src/main/res/values/preferences_keys.xml
+++ b/sample/src/main/res/values/preferences_keys.xml
@@ -21,6 +21,7 @@
     <string name="acq_sp_validate_expiry_date" translatable="false">acq_sp_validate_expiry_date</string>
     <string name="acq_sp_recurrent_payment" translatable="false">acq_sp_recurrent_payment</string>
     <string name="acq_sp_android_pay" translatable="false">acq_sp_android_pay</string>
+    <string name="acq_sp_yandex_pay" translatable="false">acq_sp_yandex_pay</string>
     <string name="acq_sp_fps" translatable="false">acq_sp_fps</string>
     <string name="acq_sp_tinkoff_pay" translatable="false">acq_sp_tinkoff_pay</string>
     <string name="acq_sp_handle_cards_error" translatable="false">acq_sp_handle_cards_error</string>
diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml
index ebb2997e..f22c2ef0 100644
--- a/sample/src/main/res/values/strings.xml
+++ b/sample/src/main/res/values/strings.xml
@@ -68,6 +68,7 @@
     <string name="settings_title_google_pay">GooglePay</string>
     <string name="settings_title_fps">Fast payment system</string>
     <string name="settings_title_tinkoff_pay">Tinkoff Pay</string>
+    <string name="settings_title_yandex_pay">Yandex Pay</string>
     <string name="settings_title_style_id">Style</string>
     <string name="settings_title_dark_mode_id">Dark Mode</string>
     <string name="settings_title_check_type_id">CheckType</string>
diff --git a/sample/src/main/res/values/styles.xml b/sample/src/main/res/values/styles.xml
index 60f6b16a..176e4ceb 100644
--- a/sample/src/main/res/values/styles.xml
+++ b/sample/src/main/res/values/styles.xml
@@ -22,6 +22,7 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="actionBarStyle">@style/AppTheme.ActionBarStyle</item>
+        <item name="acqYandexPayButtonCornerRadius">5dp</item>
     </style>
 
     <style name="AppTheme.ActionBarStyle" parent="@style/Widget.AppCompat.Light.ActionBar.Solid">
diff --git a/sample/src/main/res/xml/settings.xml b/sample/src/main/res/xml/settings.xml
index f0155921..bc6f177a 100644
--- a/sample/src/main/res/xml/settings.xml
+++ b/sample/src/main/res/xml/settings.xml
@@ -57,6 +57,12 @@
         android:title="@string/settings_title_tinkoff_pay"
         app:iconSpaceReserved="false" />
 
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="@string/acq_sp_yandex_pay"
+        android:title="@string/settings_title_yandex_pay"
+        app:iconSpaceReserved="false" />
+
     <ListPreference
         android:defaultValue="@string/acq_sp_default_style_id"
         android:entries="@array/acq_sp_styles_keys"
diff --git a/settings.gradle b/settings.gradle
index 4d82b5db..afdd6adb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -3,4 +3,5 @@ include ':sample',
         ':cardio',
         ':ui',
         ':threeds-sdk',
-        ':threeds-wrapper'
+        ':threeds-wrapper',
+        ':yandexpay'
diff --git a/ui/build.gradle b/ui/build.gradle
index dd533422..17bf3b4a 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -52,6 +52,7 @@ dependencies {
     implementation project(':threeds-wrapper')
     implementation "io.reactivex.rxjava2:rxjava:$rxJavaVersion"
     implementation "com.squareup.okhttp3:okhttp:${okHttpVersion}"
+    implementation "com.squareup.okhttp3:logging-interceptor:${okHttpVersion}"
     implementation "androidx.security:security-crypto:${cryptoVersion}"
 
     // threeds dependencies
@@ -62,10 +63,11 @@ dependencies {
     implementation "org.bouncycastle:bcprov-jdk15on:${bouncyCastleVersion}"
     implementation "jp.wasabeef:blurry:${blurryVersion}"
     implementation "com.scottyab:rootbeer-lib:${rootBeerVersion}"
+    implementation "com.google.android.material:material:${materialVersion}"
 
     testImplementation 'junit:junit:4.13'
     testImplementation "org.mockito.kotlin:mockito-kotlin:${mokitoKotlin}"
     testImplementation 'org.mockito:mockito-inline:2.13.0'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-}
+}
\ No newline at end of file
diff --git a/ui/src/main/AndroidManifest.xml b/ui/src/main/AndroidManifest.xml
index e2e38bd6..83e36f5f 100644
--- a/ui/src/main/AndroidManifest.xml
+++ b/ui/src/main/AndroidManifest.xml
@@ -15,6 +15,7 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="ru.tinkoff.acquiring.sdk">
 
     <queries>
@@ -42,6 +43,12 @@
             android:theme="@style/AcquiringTheme"
             android:windowSoftInputMode="adjustNothing" />
 
+        <activity
+            android:name=".ui.activities.YandexPaymentActivity"
+            android:screenOrientation="unspecified"
+            android:theme="@style/AcquiringTheme"
+            android:windowSoftInputMode="adjustNothing" />
+
         <activity
             android:name=".ui.activities.AttachCardActivity"
             android:screenOrientation="unspecified"
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/TinkoffAcquiring.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/TinkoffAcquiring.kt
index 922fadcc..8e8452f4 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/TinkoffAcquiring.kt
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/TinkoffAcquiring.kt
@@ -25,29 +25,24 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import ru.tinkoff.acquiring.sdk.localization.LocalizationSource
-import ru.tinkoff.acquiring.sdk.models.AsdkState
-import ru.tinkoff.acquiring.sdk.models.DefaultState
-import ru.tinkoff.acquiring.sdk.models.FpsState
-import ru.tinkoff.acquiring.sdk.models.GooglePayParams
-import ru.tinkoff.acquiring.sdk.models.PaymentSource
+import ru.tinkoff.acquiring.sdk.models.*
 import ru.tinkoff.acquiring.sdk.models.options.FeaturesOptions
-import ru.tinkoff.acquiring.sdk.models.options.screen.AttachCardOptions
-import ru.tinkoff.acquiring.sdk.models.options.screen.BaseAcquiringOptions
-import ru.tinkoff.acquiring.sdk.models.options.screen.PaymentOptions
-import ru.tinkoff.acquiring.sdk.models.options.screen.SavedCardsOptions
+import ru.tinkoff.acquiring.sdk.models.options.screen.*
 import ru.tinkoff.acquiring.sdk.models.paysources.AttachedCard
 import ru.tinkoff.acquiring.sdk.models.paysources.CardData
 import ru.tinkoff.acquiring.sdk.models.paysources.GooglePay
 import ru.tinkoff.acquiring.sdk.payment.PaymentProcess
+import ru.tinkoff.acquiring.sdk.requests.performSuspendRequest
+import ru.tinkoff.acquiring.sdk.responses.TerminalInfo
 import ru.tinkoff.acquiring.sdk.responses.TinkoffPayStatusResponse
 import ru.tinkoff.acquiring.sdk.threeds.ThreeDsHelper
+import ru.tinkoff.acquiring.sdk.ui.activities.*
 import ru.tinkoff.acquiring.sdk.ui.activities.AttachCardActivity
 import ru.tinkoff.acquiring.sdk.ui.activities.BaseAcquiringActivity
 import ru.tinkoff.acquiring.sdk.ui.activities.NotificationPaymentActivity
 import ru.tinkoff.acquiring.sdk.ui.activities.PaymentActivity
 import ru.tinkoff.acquiring.sdk.ui.activities.QrCodeActivity
 import ru.tinkoff.acquiring.sdk.ui.activities.SavedCardsActivity
-import ru.tinkoff.acquiring.sdk.ui.activities.ThreeDsActivity
 
 /**
  * Точка входа для взаимодействия с Acquiring SDK
@@ -141,6 +136,23 @@ class TinkoffAcquiring(
         activity.startActivityForResult(intent, requestCode)
     }
 
+    /**
+     * Запуск экрана Acquiring SDK для проведения оплаты
+     *
+     * @param activity        контекст для запуска экрана из Activity
+     * @param options         настройки платежной сессии и визуального отображения экрана
+     * @param requestCode     код для получения результата, по завершению работы экрана Acquiring SDK
+     * @param yandexPayToken  параметр платежной сессии от яндекса
+     */
+    fun openYandexPaymentScreen(activity: Activity,
+                          options: PaymentOptions,
+                          requestCode: Int,
+                          yandexPayToken: String) {
+        options.asdkState = YandexPayState(yandexPayToken)
+        val intent = prepareIntent(activity, options, YandexPaymentActivity::class.java)
+        activity.startActivityForResult(intent, requestCode)
+    }
+
     /**
      * Запуск экрана Acquiring SDK для проведения оплаты
      *
@@ -205,6 +217,26 @@ class TinkoffAcquiring(
         }
     }
 
+    /**
+     * Проверка доступных спосбов оплаты
+     */
+    fun checkTerminalInfo(onSuccess: (TerminalInfo?) -> Unit,
+                          onFailure: ((Throwable) -> Unit)? = null) {
+
+        val onFailureOrThrow = onFailure ?: { throw it }
+
+        CoroutineScope(Dispatchers.IO).launch {
+
+            val result = sdk.getTerminalPayMethods()
+                .performSuspendRequest()
+                .map { it.terminalInfo }
+
+            launch(Dispatchers.Main) {
+                result.fold(onSuccess, onFailureOrThrow)
+            }
+        }
+    }
+
     /**
      * Запуск SDK для оплаты через Tinkoff Pay. У возвращенгого объекта следует указать
      * слушатель событий с помощью метода [PaymentProcess.subscribe] и вызвать метод
@@ -217,6 +249,7 @@ class TinkoffAcquiring(
         return PaymentProcess(sdk, applicationContext).createTinkoffPayPaymentProcess(options, version)
     }
 
+
     /**
      * Запуск экрана Acquiring SDK для привязки новой карты
      *
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/models/AsdkState.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/models/AsdkState.kt
index 2453e93d..287115fb 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/models/AsdkState.kt
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/models/AsdkState.kt
@@ -70,4 +70,12 @@ class BrowseFpsBankState(val paymentId: Long, val deepLink: String, val banks: S
  * [AcquiringSdk.getState]
  * @param deepLink диплинк ведущий на форму оплаты, используется для открытия приложения банка
  */
-class OpenTinkoffPayBankState(val paymentId: Long, val deepLink: String) : AsdkState()
\ No newline at end of file
+class OpenTinkoffPayBankState(val paymentId: Long, val deepLink: String) : AsdkState()
+
+
+/**
+ * Состояние открытия приложения, при котором пользователь совершает платеж с помощью яндекс токена
+ *
+ * @param yandexToken плажетные данные полученные из яндекса
+ */
+class YandexPayState(val yandexToken: String) : AsdkState()
\ No newline at end of file
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/models/ViewState.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/models/ViewState.kt
index b419171a..f16ab7c6 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/models/ViewState.kt
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/models/ViewState.kt
@@ -16,7 +16,6 @@
 
 package ru.tinkoff.acquiring.sdk.models
 
-import ru.tinkoff.acquiring.sdk.responses.Check3dsVersionResponse
 import ru.tinkoff.acquiring.sdk.threeds.ThreeDsAppBasedTransaction
 
 /**
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/models/options/FeaturesOptions.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/models/options/FeaturesOptions.kt
index 77c82e29..84c0e1da 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/models/options/FeaturesOptions.kt
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/models/options/FeaturesOptions.kt
@@ -73,6 +73,11 @@ class FeaturesOptions() : Options(), Parcelable {
      */
     var tinkoffPayEnabled: Boolean = true
 
+    /**
+     * Включение приема платежа через Yandex Pay
+     */
+    var yandexPayEnabled: Boolean = false
+
     /**
      * Идентификатор карты в системе банка.
      * Если передан на экран оплаты - в списке карт на экране отобразится первой карта с этим cardId.
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/models/options/screen/AttachCardOptions.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/models/options/screen/AttachCardOptions.kt
index 92dc7eb7..9de88fc4 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/models/options/screen/AttachCardOptions.kt
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/models/options/screen/AttachCardOptions.kt
@@ -51,4 +51,5 @@ class AttachCardOptions : BaseCardsOptions<AttachCardOptions>, Parcelable {
             return arrayOfNulls(size)
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/models/options/screen/BaseAcquiringOptions.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/models/options/screen/BaseAcquiringOptions.kt
index 0ef30d9f..51f6e2df 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/models/options/screen/BaseAcquiringOptions.kt
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/models/options/screen/BaseAcquiringOptions.kt
@@ -27,7 +27,7 @@ import ru.tinkoff.acquiring.sdk.models.options.Options
  *
  * @author Mariya Chernyadieva
  */
-open class BaseAcquiringOptions() : Options(), Parcelable  {
+open class BaseAcquiringOptions() : Options(), Parcelable {
 
     lateinit var terminalKey: String
         private set
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/payment/PaymentProcess.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/payment/PaymentProcess.kt
index 6b5122d3..4c48bd7c 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/payment/PaymentProcess.kt
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/payment/PaymentProcess.kt
@@ -34,6 +34,7 @@ import ru.tinkoff.acquiring.sdk.models.options.screen.PaymentOptions
 import ru.tinkoff.acquiring.sdk.models.paysources.AttachedCard
 import ru.tinkoff.acquiring.sdk.models.paysources.CardSource
 import ru.tinkoff.acquiring.sdk.models.paysources.GooglePay
+import ru.tinkoff.acquiring.sdk.models.paysources.YandexPay
 import ru.tinkoff.acquiring.sdk.models.result.PaymentResult
 import ru.tinkoff.acquiring.sdk.network.AcquiringApi
 import ru.tinkoff.acquiring.sdk.network.AcquiringApi.FAIL_MAPI_SESSION_ID
@@ -172,6 +173,22 @@ internal constructor(
         return this
     }
 
+    /**
+     * Создает объект процесса для проведения оплаты через yandex Pay
+     * @return сконфигурированный объект для проведения оплаты
+     */
+    fun createYandexPayPaymentProcess(paymentOptions: PaymentOptions, yandexPayToken: String): PaymentProcess {
+
+        this.initRequest = sdk.init {
+            configure(paymentOptions)
+        }
+        this.paymentType = YandexPaymentType
+        this.paymentSource = YandexPay(yandexPayToken)
+
+        sendToListener(PaymentState.CREATED)
+        return this
+    }
+
     /**
      * Позволяет подписаться на события процесса
      * @return сконфигурированный объект для проведения оплаты
@@ -195,7 +212,7 @@ internal constructor(
      */
     fun start(): PaymentProcess {
         when (paymentType) {
-            SbpPaymentType, CardPaymentType, TinkoffPayPaymentType -> callInitRequest(initRequest!!)
+            SbpPaymentType, CardPaymentType, TinkoffPayPaymentType, YandexPaymentType -> callInitRequest(initRequest!!)
             FinishPaymentType -> finishPayment(paymentId!!, paymentSource)
             InitializedSbpPaymentType -> callGetQr(paymentId!!)
         }
@@ -228,6 +245,9 @@ internal constructor(
             paymentSource is AttachedCard && paymentSource.rebillId != null -> {
                 callChargeRequest(paymentId, paymentSource)
             }
+            paymentSource is YandexPay -> {
+                callFinishAuthorizeRequest(paymentId, paymentSource, email, data = ThreeDsHelper.CollectData.invoke(context, null))
+            }
             paymentSource is GooglePay || state == PaymentState.THREE_DS_V2_REJECTED -> {
                 callFinishAuthorizeRequest(paymentId, paymentSource, email)
             }
@@ -248,7 +268,7 @@ internal constructor(
             onSuccess = {
                 paymentId = it.paymentId
                 when (paymentType) {
-                    CardPaymentType -> finishPayment(it.paymentId!!, paymentSource, email)
+                    CardPaymentType, YandexPaymentType -> finishPayment(it.paymentId!!, paymentSource, email)
                     SbpPaymentType -> callGetQr(it.paymentId!!)
                     TinkoffPayPaymentType -> callTinkoffPayLinkRequest(it.paymentId!!, tinkoffPayVersion!!)
                     else -> Unit
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/payment/PaymentState.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/payment/PaymentState.kt
index d7947911..f21ca6f2 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/payment/PaymentState.kt
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/payment/PaymentState.kt
@@ -16,6 +16,9 @@
 
 package ru.tinkoff.acquiring.sdk.payment
 
+import ru.tinkoff.acquiring.sdk.models.AsdkState
+import ru.tinkoff.acquiring.sdk.models.ThreeDsState
+
 /**
  * Состояние процесса оплаты
  *
@@ -32,4 +35,22 @@ enum class PaymentState {
     CHARGE_REJECTED,
     SUCCESS,
     ERROR
+}
+
+
+/**
+ * Состояние процесса оплаты для яндекса
+ *
+ */
+sealed interface YandexPaymentState {
+    object Created : YandexPaymentState
+    object Started : YandexPaymentState
+    class Registred(val paymentId: Long): YandexPaymentState
+
+    object ThreeDsRejected : YandexPaymentState
+    class ThreeDsUiNeeded(val asdkState: ThreeDsState) : YandexPaymentState
+
+    class Error(val paymentId: Long?, val throwable: Throwable) : YandexPaymentState
+    class Success(val paymentId: Long,val cardId: String?, val rebillId: String?) : YandexPaymentState
+    object Stopped : YandexPaymentState
 }
\ No newline at end of file
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/payment/PaymentType.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/payment/PaymentType.kt
index 6a5c923a..b9d6d0a1 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/payment/PaymentType.kt
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/payment/PaymentType.kt
@@ -24,5 +24,6 @@ internal sealed class PaymentType
 internal object SbpPaymentType: PaymentType()
 internal object InitializedSbpPaymentType: PaymentType()
 internal object TinkoffPayPaymentType: PaymentType()
+internal object YandexPaymentType:  PaymentType()
 internal object CardPaymentType : PaymentType()
 internal object FinishPaymentType : PaymentType()
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/payment/YandexPaymentProcess.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/payment/YandexPaymentProcess.kt
new file mode 100644
index 00000000..0c814eb1
--- /dev/null
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/payment/YandexPaymentProcess.kt
@@ -0,0 +1,159 @@
+package ru.tinkoff.acquiring.sdk.payment
+
+import android.content.Context
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import ru.tinkoff.acquiring.sdk.AcquiringSdk
+import ru.tinkoff.acquiring.sdk.exceptions.AcquiringApiException
+import ru.tinkoff.acquiring.sdk.models.AsdkState
+import ru.tinkoff.acquiring.sdk.models.PaymentSource
+import ru.tinkoff.acquiring.sdk.models.RejectedState
+import ru.tinkoff.acquiring.sdk.models.ThreeDsState
+import ru.tinkoff.acquiring.sdk.models.options.screen.PaymentOptions
+import ru.tinkoff.acquiring.sdk.models.paysources.YandexPay
+import ru.tinkoff.acquiring.sdk.models.result.PaymentResult
+import ru.tinkoff.acquiring.sdk.network.AcquiringApi
+import ru.tinkoff.acquiring.sdk.payment.PaymentProcess.Companion.configure
+import ru.tinkoff.acquiring.sdk.requests.InitRequest
+import ru.tinkoff.acquiring.sdk.requests.performSuspendRequest
+import ru.tinkoff.acquiring.sdk.threeds.ThreeDsAppBasedTransaction
+import ru.tinkoff.acquiring.sdk.threeds.ThreeDsDataCollector
+import ru.tinkoff.acquiring.sdk.utils.getIpAddress
+
+/**
+ * Created by i.golovachev
+ */
+class YandexPaymentProcess(
+    private val sdk: AcquiringSdk,
+    private val context: Context,
+    private val threeDsDataCollector: ThreeDsDataCollector,
+    private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO
+) {
+
+    /**
+     * Возвращает текущее состояние процесса оплаты
+     */
+    private val _state = MutableStateFlow<YandexPaymentState?>(null)
+    val state = _state.asStateFlow()
+
+    private val scope = CoroutineScope(
+        ioDispatcher + CoroutineExceptionHandler { _, throwable -> handleException(throwable) }
+    )
+
+    private lateinit var paymentSource: YandexPay
+    private var initRequest: InitRequest? = null
+    private var email: String? = null
+
+    private var paymentResult: PaymentResult? = null
+    private var sdkState: AsdkState? = null
+    private var error: Throwable? = null
+
+    private var isChargeWasRejected = false
+    private var rejectedPaymentId: Long? = null
+
+    fun create(paymentOptions: PaymentOptions, yandexPayToken: String) {
+        this.initRequest = sdk.init {
+            configure(paymentOptions)
+        }
+        this.paymentSource = YandexPay(yandexPayToken)
+    }
+
+    /**
+     * Запускает полный или подтверждающий процесс оплаты в зависимости от созданного процесса
+     * @return сконфигурированный объект для проведения оплаты
+     */
+    suspend fun start() = scope.launch {
+        sendToListener(YandexPaymentState.Started)
+        callInitRequest(initRequest!!)
+    }
+
+    /**
+     * Останавливает процесс оплаты
+     */
+    fun stop() {
+        scope.cancel()
+        sendToListener(YandexPaymentState.Stopped)
+    }
+
+    private  fun sendToListener(state: YandexPaymentState?) {
+        this._state.update { state }
+    }
+
+    private fun handleException(throwable: Throwable) {
+        if (throwable is AcquiringApiException && throwable.response != null &&
+            throwable.response!!.errorCode == AcquiringApi.API_ERROR_CODE_3DSV2_NOT_SUPPORTED
+        ) {
+            sendToListener(YandexPaymentState.ThreeDsRejected)
+        } else {
+            error = throwable
+            val paymentId = (_state.value as? YandexPaymentState.Registred)?.paymentId
+            sendToListener(YandexPaymentState.Error(paymentId, throwable))
+        }
+    }
+
+    private suspend fun callInitRequest(request: InitRequest) {
+        if (isChargeWasRejected && rejectedPaymentId != null || sdkState is RejectedState) {
+            request.data = modifyRejectedData(request)
+        }
+
+        val initResult = request.performSuspendRequest().getOrThrow()
+        callFinishAuthorizeRequest(
+            initResult.paymentId!!, paymentSource, email,
+            data = threeDsDataCollector.invoke(context,null)
+        )
+    }
+
+
+    private fun modifyRejectedData(request: InitRequest): Map<String, String> {
+        val map = HashMap<String, String>()
+        map[AcquiringApi.RECURRING_TYPE_KEY] = AcquiringApi.RECURRING_TYPE_VALUE
+        map[AcquiringApi.FAIL_MAPI_SESSION_ID] = rejectedPaymentId?.toString()
+            ?: (sdkState as? RejectedState)?.rejectedPaymentId.toString()
+
+        val data = request.data?.toMutableMap() ?: mutableMapOf()
+        data.putAll(map)
+
+        return data.toMap()
+    }
+
+    private suspend fun callFinishAuthorizeRequest(
+        paymentId: Long,
+        paymentSource: PaymentSource,
+        email: String? = null,
+        data: Map<String, String>? = null,
+        threeDsVersion: String? = null,
+        threeDsTransaction: ThreeDsAppBasedTransaction? = null
+    ) {
+        val ipAddress = if (data != null) getIpAddress() else null
+
+        val finishRequest = sdk.finishAuthorize {
+            this.paymentId = paymentId
+            this.email = email
+            this.paymentSource = paymentSource
+            this.data = data
+            ip = ipAddress
+            sendEmail = email != null
+        }
+
+        val response = finishRequest.performSuspendRequest().getOrThrow()
+        val threeDsData = response.getThreeDsData(threeDsVersion)
+
+        if (threeDsData.isThreeDsNeed) {
+            ThreeDsState(threeDsData, threeDsTransaction).also {
+                sdkState = it
+                sendToListener(YandexPaymentState.ThreeDsUiNeeded(it))
+            }
+        } else {
+            paymentResult = PaymentResult(response.paymentId, null, response.rebillId)
+            sendToListener(
+                YandexPaymentState.Success(
+                    response.paymentId!!,
+                    null,
+                    response.rebillId
+                )
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/redesign/dialog/DialogActivityExt.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/redesign/dialog/DialogActivityExt.kt
new file mode 100644
index 00000000..8e3e6c1a
--- /dev/null
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/redesign/dialog/DialogActivityExt.kt
@@ -0,0 +1,23 @@
+package ru.tinkoff.acquiring.sdk.redesign.dialog
+
+import androidx.fragment.app.FragmentActivity
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+
+/**
+ * Created by i.golovachev
+ */
+
+internal fun FragmentActivity.dismissDialog(tag: String = DIALOG_ACTIVITY_EXT) {
+    val f = supportFragmentManager.findFragmentByTag(tag)
+    if (f == null) {
+        return
+    } else {
+        (f as BottomSheetDialogFragment).dismissAllowingStateLoss()
+    }
+}
+
+internal fun FragmentActivity.showDialog(dialogFragment: BottomSheetDialogFragment) {
+    dialogFragment.show(supportFragmentManager, DIALOG_ACTIVITY_EXT)
+}
+
+private const val DIALOG_ACTIVITY_EXT = "DIALOG_ACTIVITY_EXT"
\ No newline at end of file
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/redesign/dialog/PaymentFailureDialogFragment.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/redesign/dialog/PaymentFailureDialogFragment.kt
new file mode 100644
index 00000000..7bc9a942
--- /dev/null
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/redesign/dialog/PaymentFailureDialogFragment.kt
@@ -0,0 +1,36 @@
+package ru.tinkoff.acquiring.sdk.redesign.dialog
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import ru.tinkoff.acquiring.sdk.R
+import ru.tinkoff.acquiring.sdk.ui.customview.LoaderButton
+import ru.tinkoff.acquiring.sdk.utils.lazyView
+
+internal class PaymentFailureDialogFragment : BottomSheetDialogFragment() {
+
+    private val buttonChooseAnotherMethod: LoaderButton
+            by lazyView(R.id.acq_button_choose_another_method)
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(STYLE_NO_FRAME, theme)
+    }
+
+    var onChooseAnotherMethod: OnChooseAnotherMethod? = null
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? =
+        inflater.inflate(R.layout.acq_fragment_payment_failure, container, false)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        buttonChooseAnotherMethod.setOnClickListener { onChooseAnotherMethod?.invoke(this) }
+    }
+
+    fun interface OnChooseAnotherMethod {
+        operator fun invoke(fragment: PaymentFailureDialogFragment)
+    }
+}
\ No newline at end of file
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/redesign/dialog/PaymentLCEDialogFragment.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/redesign/dialog/PaymentLCEDialogFragment.kt
new file mode 100644
index 00000000..b5a3d049
--- /dev/null
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/redesign/dialog/PaymentLCEDialogFragment.kt
@@ -0,0 +1,90 @@
+package ru.tinkoff.acquiring.sdk.redesign.dialog
+
+import android.content.DialogInterface
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ViewFlipper
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import ru.tinkoff.acquiring.sdk.R
+import ru.tinkoff.acquiring.sdk.ui.customview.LoaderButton
+import ru.tinkoff.acquiring.sdk.utils.lazyUnsafe
+import ru.tinkoff.acquiring.sdk.utils.lazyView
+
+internal class PaymentLCEDialogFragment : BottomSheetDialogFragment() {
+
+    private val isCancelableInternal: Boolean by lazyUnsafe {
+        arguments?.getBoolean(PaymentLCEDialogFragment::isCancelableInternal.name) ?: false
+    }
+    private val viewFlipper: ViewFlipper
+            by lazyView(R.id.acq_fragment_payment_lce)
+    private val buttonChooseAnotherMethod: LoaderButton
+            by lazyView(R.id.acq_button_choose_another_method)
+    private val buttonOk: LoaderButton by lazyView(R.id.acq_button_ok)
+
+    private var onDismissInternal: (() -> Unit)? = null
+
+    var onViewCreated: OnViewCreated? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(STYLE_NO_FRAME, theme)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? =
+        inflater.inflate(R.layout.acq_fragment_payment_lce, container, false)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        dialog?.window?.attributes?.windowAnimations = R.style.AcqBottomSheetAnim
+        isCancelable = isCancelableInternal
+        onViewCreated?.invoke(this)
+    }
+
+    override fun onDismiss(dialog: DialogInterface) {
+        super.onDismiss(dialog)
+        onDismissInternal?.invoke()
+    }
+
+    fun loading() {
+        viewFlipper.displayedChild = 0
+        isCancelable = isCancelableInternal
+    }
+
+    fun failure(onChooseAnother: () -> Unit) {
+        viewFlipper.displayedChild = 1
+        buttonChooseAnotherMethod.setOnClickListener {
+            onChooseAnother()
+        }
+        isCancelable = true
+        onDismissInternal = onChooseAnother
+    }
+
+    fun success(onOkClick: () -> Unit) {
+        viewFlipper.displayedChild = 2
+        buttonOk.setOnClickListener { onOkClick() }
+        isCancelable = true
+        onDismissInternal = onOkClick
+    }
+
+    companion object {
+
+        fun create(isCancelable: Boolean): PaymentLCEDialogFragment {
+            val f = PaymentLCEDialogFragment()
+            val arg = Bundle().apply {
+                putBoolean(PaymentLCEDialogFragment::isCancelableInternal.name, isCancelable)
+            }
+            f.arguments = arg
+            return f
+        }
+    }
+
+    fun interface OnViewCreated {
+        operator fun invoke(f: PaymentLCEDialogFragment)
+    }
+}
\ No newline at end of file
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/redesign/dialog/PaymentProgressDialogFragment.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/redesign/dialog/PaymentProgressDialogFragment.kt
new file mode 100644
index 00000000..423b7931
--- /dev/null
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/redesign/dialog/PaymentProgressDialogFragment.kt
@@ -0,0 +1,22 @@
+package ru.tinkoff.acquiring.sdk.redesign.dialog
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import ru.tinkoff.acquiring.sdk.R
+
+internal class PaymentProgressDialogFragment : BottomSheetDialogFragment() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(STYLE_NO_FRAME, theme)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? =
+        inflater.inflate(R.layout.acq_fragment_payment_progress, container, false)
+
+}
+
+
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/redesign/dialog/PaymentSuccessDialogFragment.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/redesign/dialog/PaymentSuccessDialogFragment.kt
new file mode 100644
index 00000000..69477562
--- /dev/null
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/redesign/dialog/PaymentSuccessDialogFragment.kt
@@ -0,0 +1,37 @@
+package ru.tinkoff.acquiring.sdk.redesign.dialog
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import ru.tinkoff.acquiring.sdk.R
+import ru.tinkoff.acquiring.sdk.models.result.AsdkResult
+import ru.tinkoff.acquiring.sdk.ui.customview.LoaderButton
+import ru.tinkoff.acquiring.sdk.utils.lazyView
+
+internal class PaymentSuccessDialogFragment : BottomSheetDialogFragment() {
+
+    private val buttonOk: LoaderButton by lazyView(R.id.acq_button_ok)
+
+    var paymentSuccessClick: OnPaymentSuccessClick? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(STYLE_NO_FRAME, theme)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? =
+        inflater.inflate(R.layout.acq_fragment_payment_success, container, false)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        buttonOk.setOnClickListener { paymentSuccessClick?.invoke(this) }
+    }
+
+
+    fun interface OnPaymentSuccessClick {
+        operator fun invoke(fragment: PaymentSuccessDialogFragment)
+    }
+}
\ No newline at end of file
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/threeds/ThreeDsHelper.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/threeds/ThreeDsHelper.kt
index c86f89dd..0df6c16a 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/threeds/ThreeDsHelper.kt
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/threeds/ThreeDsHelper.kt
@@ -153,7 +153,7 @@ object ThreeDsHelper {
         else -> CERTS_CONFIG_URL_PROD
     }
 
-    object CollectData {
+    object CollectData : ThreeDsDataCollector {
 
         private const val THREE_DS_CALLED_FLAG = "Y"
         private const val THREE_DS_NOT_CALLED_FLAG = "N"
@@ -161,9 +161,9 @@ object ThreeDsHelper {
         private val NOTIFICATION_URL = "${AcquiringApi.getUrl(COMPLETE_3DS_METHOD_V2)}/$COMPLETE_3DS_METHOD_V2"
         private val TERM_URL_V2 = ThreeDsActivity.TERM_URL_V2
 
-        operator fun invoke(context: Context, response: Check3dsVersionResponse): MutableMap<String, String> {
+        override operator fun invoke(context: Context, response: Check3dsVersionResponse?): MutableMap<String, String> {
             var threeDSCompInd = THREE_DS_NOT_CALLED_FLAG
-            if (response.threeDsMethodUrl != null) {
+            if (response?.threeDsMethodUrl != null) {
                 val hiddenWebView = WebView(context)
 
                 val threeDsMethodData = JSONObject().apply {
@@ -407,4 +407,9 @@ object ThreeDsHelper {
 class ThreeDsAppBasedTransaction(
     val wrapper: ThreeDSWrapper,
     val transaction: Transaction
-)
\ No newline at end of file
+)
+
+interface ThreeDsDataCollector {
+
+    operator fun invoke(context: Context, response: Check3dsVersionResponse?): MutableMap<String, String>
+}
\ No newline at end of file
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/ui/activities/ThreeDsActivity.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/ui/activities/ThreeDsActivity.kt
index a588604a..b2e5d264 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/ui/activities/ThreeDsActivity.kt
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/ui/activities/ThreeDsActivity.kt
@@ -159,13 +159,6 @@ internal class ThreeDsActivity : BaseAcquiringActivity() {
 
         private var canceled = false
 
-        override fun shouldInterceptRequest(
-            view: WebView?,
-            request: WebResourceRequest?
-        ): WebResourceResponse? {
-            return provideThreeDsSubmitV2Delegate().shouldInterceptRequest(request, data)
-        }
-
         override fun onPageFinished(view: WebView, url: String) {
             super.onPageFinished(view, url)
 
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/ui/activities/YandexPaymentActivity.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/ui/activities/YandexPaymentActivity.kt
new file mode 100644
index 00000000..e85d6738
--- /dev/null
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/ui/activities/YandexPaymentActivity.kt
@@ -0,0 +1,155 @@
+/*
+ * Copyright © 2020 Tinkoff Bank
+ *
+ * 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.
+ */
+
+package ru.tinkoff.acquiring.sdk.ui.activities
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import androidx.core.view.isVisible
+import androidx.lifecycle.Observer
+import ru.tinkoff.acquiring.sdk.models.*
+import ru.tinkoff.acquiring.sdk.models.options.screen.PaymentOptions
+import ru.tinkoff.acquiring.sdk.models.result.AsdkResult
+import ru.tinkoff.acquiring.sdk.redesign.dialog.*
+import ru.tinkoff.acquiring.sdk.threeds.ThreeDsHelper
+import ru.tinkoff.acquiring.sdk.viewmodel.YandexPaymentViewModel
+
+/**
+ * @author Ivan Golovachev
+ */
+internal class YandexPaymentActivity : TransparentActivity() {
+
+    private lateinit var paymentViewModel: YandexPaymentViewModel
+    private lateinit var paymentOptions: PaymentOptions
+    private var asdkState: AsdkState = DefaultState
+    private var paymentLCEDialogFragment: PaymentLCEDialogFragment =
+        PaymentLCEDialogFragment.create(false)
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        paymentOptions = options as PaymentOptions
+        asdkState = paymentOptions.asdkState
+
+        initViews()
+        bottomContainer.isVisible = false
+
+        paymentViewModel =
+            provideViewModel(YandexPaymentViewModel::class.java) as YandexPaymentViewModel
+        observeLiveData()
+
+        if (savedInstanceState == null) {
+            (asdkState as? YandexPayState)?.let {
+                paymentViewModel.startYandexPayPayment(paymentOptions, it.yandexToken)
+            }
+        }
+
+        paymentViewModel.checkoutAsdkState(asdkState)
+    }
+
+    override fun handleLoadState(loadState: LoadState) {
+        super.handleLoadState(loadState)
+        when (loadState) {
+            is LoadingState -> {
+                getStateDialog { it.loading() }
+            }
+        }
+    }
+
+    private fun observeLiveData() {
+        with(paymentViewModel) {
+            loadStateLiveData.observe(this@YandexPaymentActivity, Observer { handleLoadState(it) })
+            screenStateLiveData.observe(this@YandexPaymentActivity, Observer { handleScreenState(it) })
+            screenChangeEventLiveData.observe(this@YandexPaymentActivity, Observer { handleScreenChangeEvent(it) })
+            paymentResultLiveData.observe(this@YandexPaymentActivity, Observer {
+                    getStateDialog { f ->
+                        f.success { finishWithSuccess(it) }
+                    }
+                }
+            )
+        }
+    }
+
+    private fun handleScreenChangeEvent(screenChangeEvent: SingleEvent<Screen>) {
+        screenChangeEvent.getValueIfNotHandled()?.let { screen ->
+            when (screen) {
+                is ThreeDsScreenState -> try {
+                    ThreeDsHelper.Launch.launchBrowserBased(
+                        this@YandexPaymentActivity,
+                        THREE_DS_REQUEST_CODE,
+                        options,
+                        screen.data,
+                    )
+                } catch (e: Throwable) {
+                    getStateDialog { it.failure { finishWithError(e) } }
+                }
+                else -> Unit
+            }
+        }
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        paymentViewModel.onDismissDialog()
+        if (requestCode == THREE_DS_REQUEST_CODE) {
+            if (resultCode == Activity.RESULT_OK && data != null) {
+                getStateDialog {
+                    it.success {
+                        finishWithSuccess(data.getSerializableExtra(ThreeDsHelper.Launch.RESULT_DATA) as AsdkResult)
+                    }
+                }
+            } else if (resultCode == ThreeDsHelper.Launch.RESULT_ERROR) {
+                getStateDialog {
+                    it.failure {
+                        finishWithError(data?.getSerializableExtra(ThreeDsHelper.Launch.ERROR_DATA) as Throwable)
+                    }
+                }
+            } else {
+                setResult(Activity.RESULT_CANCELED)
+                finish()
+            }
+        } else {
+            super.onActivityResult(requestCode, resultCode, data)
+        }
+    }
+
+    private fun handleScreenState(screenState: ScreenState) {
+        when (screenState) {
+            is FinishWithErrorScreenState -> getStateDialog {
+                it.failure {
+                    paymentViewModel.onDismissDialog()
+                    finishWithError(screenState.error)
+                }
+            }
+            is ErrorScreenState -> getStateDialog {
+                it.failure {
+                    paymentViewModel.onDismissDialog()
+                    finishWithError(IllegalStateException(screenState.message))
+                }
+            }
+            else -> Unit
+        }
+    }
+
+    private fun getStateDialog(block: PaymentLCEDialogFragment.OnViewCreated? = null) {
+        if (paymentLCEDialogFragment.isAdded.not()) {
+            paymentLCEDialogFragment.onViewCreated = block
+            showDialog(paymentLCEDialogFragment)
+        } else {
+            block?.invoke(paymentLCEDialogFragment)
+        }
+    }
+}
\ No newline at end of file
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/ui/customview/LoaderButton.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/ui/customview/LoaderButton.kt
new file mode 100644
index 00000000..32c4d523
--- /dev/null
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/ui/customview/LoaderButton.kt
@@ -0,0 +1,79 @@
+package ru.tinkoff.acquiring.sdk.ui.customview
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.util.AttributeSet
+import android.view.Gravity
+import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
+import android.widget.FrameLayout
+import android.widget.ProgressBar
+import android.widget.TextView
+import androidx.core.content.res.ResourcesCompat
+import androidx.core.content.withStyledAttributes
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
+import ru.tinkoff.acquiring.sdk.R
+import ru.tinkoff.acquiring.sdk.utils.dpToPx
+
+internal class LoaderButton
+@JvmOverloads
+constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0,
+    defStyleRes: Int = R.style.AcqLoaderButton
+) : FrameLayout(context, attrs, defStyleAttr, defStyleRes) {
+
+    var text: CharSequence
+        get() = textView.text
+        set(value) {
+            textView.text = value
+        }
+
+    var isLoading = false
+        set(value) {
+            field = value
+            textView.isGone = field
+            progressBar.isVisible = field
+        }
+
+    val textView = TextView(context).apply {
+        textSize = 16f
+        setTextColor(ResourcesCompat.getColorStateList(
+            context.resources, R.color.acq_button_text_selector, context.theme))
+    }
+    var textColor: ColorStateList?
+        get() = textView.textColors
+        set(value) {
+            textView.setTextColor(value)
+        }
+
+    val progressBar = ProgressBar(context).apply {
+        isIndeterminate = true
+        indeterminateTintList = ColorStateList.valueOf(ResourcesCompat.getColor(
+            context.resources, R.color.acq_colorButtonText, context.theme))
+        isGone = true
+    }
+    var progressColor: ColorStateList?
+        get() = progressBar.indeterminateTintList
+        set(value) {
+            progressBar.indeterminateTintList = value
+        }
+
+    init {
+        addView(textView, LayoutParams(WRAP_CONTENT, WRAP_CONTENT).apply {
+            gravity = Gravity.CENTER
+        })
+        addView(progressBar, LayoutParams(context.dpToPx(24), context.dpToPx(24)).apply {
+            gravity = Gravity.CENTER
+        })
+
+        context.withStyledAttributes(attrs, R.styleable.LoaderButton, defStyleAttr, defStyleRes) {
+            text = getString(R.styleable.LoaderButton_acq_text).orEmpty()
+            textColor = getColorStateList(R.styleable.LoaderButton_acq_text_color)
+            getDrawable(R.styleable.LoaderButton_acq_background)?.let { background = it }
+                ?: setBackgroundResource(R.drawable.acq_button_yellow_bg)
+            progressColor = getColorStateList(R.styleable.LoaderButton_acq_progress_color)
+        }
+    }
+}
\ No newline at end of file
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/ui/fragments/YandexPaymentStubFragment.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/ui/fragments/YandexPaymentStubFragment.kt
new file mode 100644
index 00000000..68b1a0dd
--- /dev/null
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/ui/fragments/YandexPaymentStubFragment.kt
@@ -0,0 +1,19 @@
+package ru.tinkoff.acquiring.sdk.ui.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import ru.tinkoff.acquiring.sdk.R
+
+/**
+ * Created by i.golovachev
+ */
+internal class YandexPaymentStubFragment : BaseAcquiringFragment() {
+
+    override fun onCreateView(inflater: LayoutInflater,
+                              container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.acq_fragment_yandex_stub, container, false)
+    }
+}
\ No newline at end of file
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/utils/Money.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/utils/Money.kt
index f0d7b930..4aa9dff7 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/utils/Money.kt
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/utils/Money.kt
@@ -99,7 +99,7 @@ class Money private constructor(val coins: Long) : Serializable, Comparable<Mone
 
     companion object {
 
-        private const val COINS_IN_RUBLE: Byte = 100
+        const val COINS_IN_RUBLE: Byte = 100
         private const val PRECISION: Byte = 2
         const val DEFAULT_INT_DIVIDER = " "
         const val DEFAULT_INT_FRACT_DIVIDER = ","
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/utils/ViewExtUtil.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/utils/ViewExtUtil.kt
new file mode 100644
index 00000000..623e0014
--- /dev/null
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/utils/ViewExtUtil.kt
@@ -0,0 +1,135 @@
+package ru.tinkoff.acquiring.sdk.utils
+
+import android.app.Activity
+import android.content.Context
+import android.graphics.Matrix
+import android.graphics.Rect
+import android.graphics.RectF
+import android.util.TypedValue
+import android.view.View
+import android.view.ViewGroup
+import android.view.ViewParent
+import androidx.annotation.IdRes
+import androidx.fragment.app.Fragment
+import kotlin.math.roundToInt
+import kotlin.math.roundToLong
+
+internal object ViewUtil {
+
+    private const val ERROR_SHAKE_AMPLITUDE = 3f // dp
+    private const val ERROR_SHAKE_DURATION = 500L
+    private const val ERROR_SHAKE_CYCLES = 3
+
+    // Methods using these buffer objects are meant to be used in single (UI) thread
+    private val tMatrix = Matrix()
+    private val tRectF = RectF()
+
+    fun getDescendantRect(parent: ViewGroup, descendant: View, rect: Rect) {
+        rect.set(0, 0, descendant.width, descendant.height)
+        offsetDescendantRect(parent, descendant, rect)
+    }
+
+    fun offsetDescendantRect(parent: ViewGroup, descendant: View, rect: Rect) {
+        tMatrix.reset()
+        offsetDescendantMatrix(parent, descendant, tMatrix)
+        tRectF.set(rect)
+        tMatrix.mapRect(tRectF)
+        rect.set((tRectF.left + 0.5f).toInt(), (tRectF.top + 0.5f).toInt(), (tRectF.right + 0.5f).toInt(), (tRectF.bottom + 0.5f).toInt())
+    }
+
+    private fun offsetDescendantMatrix(target: ViewParent, view: View, matrix: Matrix) {
+        val parent = view.parent
+        if (parent is View && parent !== target) {
+            offsetDescendantMatrix(target, parent, matrix)
+            matrix.preTranslate((-parent.scrollX).toFloat(), (-parent.scrollY).toFloat())
+        }
+
+        matrix.preTranslate(view.left.toFloat(), view.top.toFloat())
+        if (!view.matrix.isIdentity) {
+            matrix.preConcat(view.matrix)
+        }
+    }
+}
+
+internal fun Context.dpToPx(dp: Float): Float =
+    TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, resources.displayMetrics)
+
+internal fun Context.dpToPx(dp: Int): Int =
+    TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp.toFloat(), resources.displayMetrics).toInt()
+
+internal fun Context.spToPx(sp: Float): Float =
+    TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, sp, resources.displayMetrics)
+
+internal fun Context.spToPx(sp: Int): Int =
+    TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, sp.toFloat(), resources.displayMetrics).toInt()
+
+internal fun View.horizontalPadding(): Int {
+    return paddingLeft + paddingRight
+}
+
+internal fun View.setHorizontalPadding(padding: Int) {
+    setPadding(padding, paddingTop, padding, paddingBottom)
+}
+
+internal fun View.verticalPadding(): Int {
+    return paddingTop + paddingBottom
+}
+
+internal fun View.setVerticalPadding(padding: Int) {
+    setPadding(paddingLeft, padding, paddingRight, padding)
+}
+
+internal fun ViewGroup.LayoutParams.horizontalMargin(): Int {
+    return (this as ViewGroup.MarginLayoutParams).leftMargin + rightMargin
+}
+
+internal fun ViewGroup.LayoutParams.verticalMargin(): Int {
+    return (this as ViewGroup.MarginLayoutParams).topMargin + bottomMargin
+}
+
+internal fun ViewGroup.LayoutParams.setHorizontalMargin(margin: Int) =
+    with(this as ViewGroup.MarginLayoutParams) {
+        leftMargin = margin
+        rightMargin = margin
+    }
+
+internal fun ViewGroup.LayoutParams.setVerticalMargin(margin: Int) =
+    with(this as ViewGroup.MarginLayoutParams) {
+        topMargin = margin
+        bottomMargin = margin
+    }
+
+internal fun View.measuredFullWidth(): Int {
+    return measuredWidth + layoutParams.horizontalMargin()
+}
+
+internal fun View.measuredFullHeight(): Int {
+    return measuredHeight + layoutParams.verticalMargin()
+}
+
+internal fun ViewGroup.forEachChild(action: (child: View) -> Unit) {
+    for (i in 0 until childCount) {
+        action(getChildAt(i))
+    }
+}
+
+internal fun lerp(start: Int, end: Int, fraction: Float): Int {
+    return (start + (end - start) * fraction).roundToInt()
+}
+
+internal fun lerp(start: Long, end: Long, fraction: Float): Long {
+    return (start + (end - start) * fraction).roundToLong()
+}
+
+internal fun lerp(start: Float, end: Float, fraction: Float): Float {
+    return (start + (end - start) * fraction)
+}
+
+internal fun <T> lazyUnsafe(initializer: () -> T): Lazy<T> =
+    lazy(LazyThreadSafetyMode.NONE, initializer)
+
+internal fun <T> Fragment.lazyView(@IdRes id: Int): Lazy<T> =
+    lazyUnsafe { requireView().findViewById(id) }
+
+internal fun <T> Activity.lazyView(@IdRes id: Int): Lazy<T> =
+    lazyUnsafe { findViewById(id) }
\ No newline at end of file
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/viewmodel/AttachCardViewModel.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/viewmodel/AttachCardViewModel.kt
index af5db6fc..4fbfcf47 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/viewmodel/AttachCardViewModel.kt
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/viewmodel/AttachCardViewModel.kt
@@ -36,6 +36,7 @@ import ru.tinkoff.acquiring.sdk.network.AcquiringApi
 import ru.tinkoff.acquiring.sdk.responses.AttachCardResponse
 import ru.tinkoff.acquiring.sdk.responses.Check3dsVersionResponse
 import ru.tinkoff.acquiring.sdk.threeds.ThreeDsHelper
+import kotlin.properties.ReadWriteProperty
 
 /**
  * @author Mariya Chernyadieva
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/viewmodel/PaymentViewModel.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/viewmodel/PaymentViewModel.kt
index d018b0aa..f5b16d76 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/viewmodel/PaymentViewModel.kt
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/viewmodel/PaymentViewModel.kt
@@ -167,6 +167,11 @@ internal class PaymentViewModel(
         paymentProcess.createTinkoffPayPaymentProcess(paymentOptions, tinkoffPayVersion).subscribe(paymentListener).start()
     }
 
+    fun startYandexPayPayment(paymentOptions: PaymentOptions, yandexPayToken: String) {
+        changeScreenState(LoadingState)
+        paymentProcess.createYandexPayPaymentProcess(paymentOptions, yandexPayToken).subscribe(paymentListener).start()
+    }
+
     fun finishPayment(paymentId: Long, paymentSource: PaymentSource, email: String? = null) {
         changeScreenState(LoadingState)
         paymentProcess.createFinishProcess(paymentId, paymentSource, email).subscribe(paymentListener).start()
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/viewmodel/ViewModelProviderFactory.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/viewmodel/ViewModelProviderFactory.kt
index 1e6292d2..c3ad2863 100644
--- a/ui/src/main/java/ru/tinkoff/acquiring/sdk/viewmodel/ViewModelProviderFactory.kt
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/viewmodel/ViewModelProviderFactory.kt
@@ -35,10 +35,12 @@ internal class ViewModelProviderFactory(
         QrViewModel::class.java to QrViewModel(application, handleErrorsInSdk, sdk),
         ThreeDsViewModel::class.java to ThreeDsViewModel(application, handleErrorsInSdk, sdk),
         SavedCardsViewModel::class.java to SavedCardsViewModel(application, handleErrorsInSdk, sdk),
-        NotificationPaymentViewModel::class.java to NotificationPaymentViewModel(application, handleErrorsInSdk, sdk))
+        NotificationPaymentViewModel::class.java to NotificationPaymentViewModel(application, handleErrorsInSdk, sdk),
+        YandexPaymentViewModel::class.java to YandexPaymentViewModel(application, handleErrorsInSdk, sdk)
+    )
 
     @Suppress("UNCHECKED_CAST")
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        return viewModelCollection[modelClass] as T
+        return (viewModelCollection)[modelClass] as T
     }
 }
\ No newline at end of file
diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/viewmodel/YandexPaymentViewModel.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/viewmodel/YandexPaymentViewModel.kt
new file mode 100644
index 00000000..6d0fb373
--- /dev/null
+++ b/ui/src/main/java/ru/tinkoff/acquiring/sdk/viewmodel/YandexPaymentViewModel.kt
@@ -0,0 +1,89 @@
+package ru.tinkoff.acquiring.sdk.viewmodel
+
+import android.app.Application
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.buffer
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import ru.tinkoff.acquiring.sdk.AcquiringSdk
+import ru.tinkoff.acquiring.sdk.models.*
+import ru.tinkoff.acquiring.sdk.models.LoadingState
+import ru.tinkoff.acquiring.sdk.models.PaymentScreenState
+import ru.tinkoff.acquiring.sdk.models.ThreeDsScreenState
+import ru.tinkoff.acquiring.sdk.models.options.screen.PaymentOptions
+import ru.tinkoff.acquiring.sdk.models.result.PaymentResult
+import ru.tinkoff.acquiring.sdk.payment.*
+import ru.tinkoff.acquiring.sdk.threeds.ThreeDsHelper
+
+/**
+ * Created by i.golovachev
+ */
+internal class YandexPaymentViewModel(
+    application: Application,
+    handleErrorsInSdk: Boolean,
+    sdk: AcquiringSdk
+) : BaseAcquiringViewModel(application, handleErrorsInSdk, sdk) {
+
+    private val paymentProcess: YandexPaymentProcess = YandexPaymentProcess(sdk, context, ThreeDsHelper.CollectData)
+    private val paymentResult: MutableLiveData<PaymentResult> = MutableLiveData()
+    val paymentResultLiveData: LiveData<PaymentResult> = paymentResult
+
+    fun startYandexPayPayment(paymentOptions: PaymentOptions, yandexPayToken: String) {
+        changeScreenState(LoadingState)
+
+        viewModelScope.launch {
+            paymentProcess.create(paymentOptions, yandexPayToken)
+            paymentProcess.start()
+        }
+
+        viewModelScope.launch {
+            paymentProcess.state.launchAndCollect()
+        }
+    }
+
+    fun checkoutAsdkState(state: AsdkState) {
+        when (state) {
+            is ThreeDsState -> changeScreenState(ThreeDsScreenState(state.data, state.transaction))
+            else -> changeScreenState(PaymentScreenState)
+        }
+    }
+
+    fun onDismissDialog() {
+        paymentProcess.stop()
+    }
+
+    private fun StateFlow<YandexPaymentState?>.launchAndCollect() {
+        viewModelScope.launch {
+            buffer(0, BufferOverflow.DROP_OLDEST)
+                .collectLatest {
+                    when (it) {
+                        is YandexPaymentState.ThreeDsUiNeeded -> {
+                            changeScreenState(
+                                ThreeDsScreenState(
+                                    it.asdkState.data,
+                                    it.asdkState.transaction
+                                )
+                            )
+                            coroutine.runWithDelay(500) {
+                                changeScreenState(LoadedState)
+                            }
+                        }
+                        is YandexPaymentState.Success -> {
+                            changeScreenState(LoadedState)
+                            paymentResult.value =
+                                PaymentResult(it.paymentId, it.cardId, it.rebillId)
+                        }
+                        is YandexPaymentState.Error -> {
+                            changeScreenState(LoadedState)
+                            handleException(it.throwable)
+                        }
+                        else -> Unit
+                    }
+                }
+        }
+    }
+}
\ No newline at end of file
diff --git a/ui/src/main/res/anim/acq_slide_down.xml b/ui/src/main/res/anim/acq_slide_down.xml
new file mode 100644
index 00000000..c600e92e
--- /dev/null
+++ b/ui/src/main/res/anim/acq_slide_down.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <translate
+        android:duration="@android:integer/config_mediumAnimTime"
+        android:fromYDelta="0%p"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:toYDelta="100%p" />
+
+</set>
\ No newline at end of file
diff --git a/ui/src/main/res/anim/acq_slide_up.xml b/ui/src/main/res/anim/acq_slide_up.xml
new file mode 100644
index 00000000..7f1deff6
--- /dev/null
+++ b/ui/src/main/res/anim/acq_slide_up.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="@android:integer/config_longAnimTime"
+        android:fromYDelta="100%"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:toXDelta="0" />
+</set>
\ No newline at end of file
diff --git a/ui/src/main/res/color/acq_button_text_selector.xml b/ui/src/main/res/color/acq_button_text_selector.xml
new file mode 100644
index 00000000..88aa77ed
--- /dev/null
+++ b/ui/src/main/res/color/acq_button_text_selector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_enabled="false" android:color="@color/acq_colorButtonTextDisabled"/>
+    <item android:color="@color/acq_colorButtonText"/>
+
+</selector>
\ No newline at end of file
diff --git a/ui/src/main/res/color/acq_secondary_button_text_selector.xml b/ui/src/main/res/color/acq_secondary_button_text_selector.xml
new file mode 100644
index 00000000..17a6c88c
--- /dev/null
+++ b/ui/src/main/res/color/acq_secondary_button_text_selector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:color="@color/acq_colorButtonTextDisabled" android:state_enabled="false" />
+    <item android:color="@color/acq_colorAccent" />
+
+</selector>
\ No newline at end of file
diff --git a/ui/src/main/res/drawable/acq_bottom_sheet_bg.xml b/ui/src/main/res/drawable/acq_bottom_sheet_bg.xml
new file mode 100644
index 00000000..8626ac8d
--- /dev/null
+++ b/ui/src/main/res/drawable/acq_bottom_sheet_bg.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/acq_colorMain" />
+            <corners
+                android:topLeftRadius="16dp"
+                android:topRightRadius="16dp" />
+        </shape>
+    </item>
+
+    <item
+        android:gravity="center_horizontal|top"
+        android:top="10dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/acq_colorButtonDisable" />
+            <size
+                android:width="32dp"
+                android:height="4dp" />
+            <corners android:radius="2dp" />
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/ui/src/main/res/drawable/acq_button_flat_bg.xml b/ui/src/main/res/drawable/acq_button_flat_bg.xml
new file mode 100644
index 00000000..4a7587a7
--- /dev/null
+++ b/ui/src/main/res/drawable/acq_button_flat_bg.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright © 2020 Tinkoff Bank
+  ~
+  ~ 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.
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_enabled="false">
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/transparent" />
+            <corners android:radius="16dp" />
+        </shape>
+    </item>
+
+    <item android:state_enabled="true">
+        <ripple android:color="@color/acq_colorButtonSecondary">
+            <item android:id="@android:id/mask">
+                <shape android:shape="rectangle">
+                    <solid android:color="@android:color/white" />
+                    <corners android:radius="16dp" />
+                </shape>
+            </item>
+
+            <item>
+                <shape android:shape="rectangle">
+                    <solid android:color="@android:color/transparent" />
+                </shape>
+            </item>
+        </ripple>
+    </item>
+
+</selector>
\ No newline at end of file
diff --git a/ui/src/main/res/drawable/acq_button_secondary_bg.xml b/ui/src/main/res/drawable/acq_button_secondary_bg.xml
new file mode 100644
index 00000000..c2137943
--- /dev/null
+++ b/ui/src/main/res/drawable/acq_button_secondary_bg.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright © 2020 Tinkoff Bank
+  ~
+  ~ 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.
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_enabled="false">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/acq_colorButtonDisable" />
+            <corners android:radius="16dp" />
+        </shape>
+    </item>
+
+    <item android:state_enabled="true">
+        <ripple android:color="@color/acq_colorButtonSecondaryPressed">
+            <item>
+                <shape android:shape="rectangle">
+                    <solid android:color="@color/acq_colorButtonSecondary" />
+                    <corners android:radius="16dp" />
+                </shape>
+            </item>
+        </ripple>
+    </item>
+
+</selector>
\ No newline at end of file
diff --git a/ui/src/main/res/drawable/acq_button_yellow_bg.xml b/ui/src/main/res/drawable/acq_button_yellow_bg.xml
new file mode 100644
index 00000000..65f17bc6
--- /dev/null
+++ b/ui/src/main/res/drawable/acq_button_yellow_bg.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright © 2020 Tinkoff Bank
+  ~
+  ~ 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.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/acq_colorButtonPressed">
+
+    <item android:state_enabled="false">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/acq_colorButtonDisable" />
+            <corners android:radius="16dp" />
+        </shape>
+    </item>
+
+    <item>
+        <ripple
+            android:color="@color/acq_colorButtonPressed">
+            <item>
+                <shape android:shape="rectangle">
+                    <solid android:color="@color/acq_colorButton" />
+                    <corners android:radius="16dp" />
+                </shape>
+            </item>
+        </ripple>
+    </item>
+
+</selector>
\ No newline at end of file
diff --git a/ui/src/main/res/drawable/acq_ic_check_circle_positive.xml b/ui/src/main/res/drawable/acq_ic_check_circle_positive.xml
new file mode 100644
index 00000000..eac6b95a
--- /dev/null
+++ b/ui/src/main/res/drawable/acq_ic_check_circle_positive.xml
@@ -0,0 +1,26 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="72dp"
+    android:height="72dp"
+    android:viewportWidth="72"
+    android:viewportHeight="72">
+  <path
+      android:pathData="M36,69C54.225,69 69,54.225 69,36C69,17.775 54.225,3 36,3C17.775,3 3,17.775 3,36C3,54.225 17.775,69 36,69Z"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="15"
+          android:startY="15"
+          android:endX="57"
+          android:endY="57"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF0CBC37"/>
+        <item android:offset="1" android:color="#A50CBC37"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M32.812,49.653L54.026,28.439L52.904,27.318C50.243,24.657 45.929,24.657 43.268,27.318L32.812,37.773L29.357,34.318C26.696,31.657 22.382,31.657 19.721,34.318L18.6,35.44L32.812,49.653Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/ui/src/main/res/drawable/acq_ic_cross_circle.xml b/ui/src/main/res/drawable/acq_ic_cross_circle.xml
new file mode 100644
index 00000000..2eb64a89
--- /dev/null
+++ b/ui/src/main/res/drawable/acq_ic_cross_circle.xml
@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="72dp"
+    android:height="72dp"
+    android:viewportWidth="72"
+    android:viewportHeight="72">
+  <path
+      android:pathData="M59.334,59.334C72.222,46.447 72.222,25.553 59.334,12.665C46.447,-0.222 25.553,-0.222 12.665,12.665C-0.222,25.553 -0.222,46.447 12.665,59.334C25.553,72.222 46.447,72.222 59.334,59.334ZM27.091,21.575L36,30.485L44.91,21.575L50.425,27.09L41.515,36L50.425,44.909L44.91,50.425L36,41.515L27.09,50.425L21.575,44.91L30.485,36L21.575,27.09L27.091,21.575Z"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="5.5"
+          android:startY="18.5"
+          android:endX="52.5"
+          android:endY="40"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFF52222"/>
+        <item android:offset="0" android:color="#FFF52222"/>
+        <item android:offset="0.942" android:color="#8CF52222"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
diff --git a/ui/src/main/res/layout/acq_fragment_payment_failure.xml b/ui/src/main/res/layout/acq_fragment_payment_failure.xml
new file mode 100644
index 00000000..5ae36f09
--- /dev/null
+++ b/ui/src/main/res/layout/acq_fragment_payment_failure.xml
@@ -0,0 +1,46 @@
+<?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/acq_bottom_sheet_bg"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/acq_commonsheet_title_img"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="48dp"
+        android:layout_marginBottom="16dp"
+        android:src="@drawable/acq_ic_cross_circle" />
+
+    <TextView
+        android:id="@+id/acq_commonsheet_title_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="@string/acq_commonsheet_failed_title"
+        android:textColor="@color/acq_colorText"
+        android:textSize="20sp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/acq_commonsheet_subtitle_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:gravity="center"
+        android:text="@string/acq_commonsheet_changemethod_primarybutton"
+        android:textColor="@color/acq_colorTextSecondary"
+        android:textSize="17sp" />
+
+    <ru.tinkoff.acquiring.sdk.ui.customview.LoaderButton
+        android:id="@+id/acq_button_choose_another_method"
+        style="@style/AcqLoaderButton.Primary"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginVertical="24dp"
+        app:acq_text="@string/acq_commonsheet_clear_primarybutton" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/ui/src/main/res/layout/acq_fragment_payment_lce.xml b/ui/src/main/res/layout/acq_fragment_payment_lce.xml
new file mode 100644
index 00000000..20f319db
--- /dev/null
+++ b/ui/src/main/res/layout/acq_fragment_payment_lce.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ViewFlipper xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:gravity="center_horizontal"
+    android:inAnimation="@android:anim/fade_in"
+    android:outAnimation="@android:anim/fade_out"
+    android:background="@drawable/acq_bottom_sheet_bg"
+    android:id="@+id/acq_fragment_payment_lce"
+    android:measureAllChildren="false"
+    android:layout_height="wrap_content">
+
+    <include
+        android:id="@+id/acq_fragment_payment_progress"
+        layout="@layout/acq_fragment_payment_progress" />
+
+    <include
+        android:id="@+id/acq_fragment_payment_failure"
+        layout="@layout/acq_fragment_payment_failure" />
+
+    <include
+        android:id="@+id/acq_fragment_payment_success"
+        layout="@layout/acq_fragment_payment_success" />
+
+</ViewFlipper>
\ No newline at end of file
diff --git a/ui/src/main/res/layout/acq_fragment_payment_progress.xml b/ui/src/main/res/layout/acq_fragment_payment_progress.xml
new file mode 100644
index 00000000..0c97975f
--- /dev/null
+++ b/ui/src/main/res/layout/acq_fragment_payment_progress.xml
@@ -0,0 +1,40 @@
+<?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/acq_bottom_sheet_bg"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <com.google.android.material.progressindicator.CircularProgressIndicator
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="48dp"
+        android:layout_marginBottom="16dp"
+        android:indeterminate="true"
+        app:indicatorColor="@color/acq_progress_bar_color"
+        app:indicatorSize="72dp" />
+
+    <TextView
+        android:id="@+id/acq_commonsheet_processing_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="@string/acq_commonsheet_processing_title"
+        android:textColor="@color/acq_colorText"
+        android:textSize="20sp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/acq_commonsheet_processing_subtitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:gravity="center"
+        android:text="@string/acq_commonsheet_processing_description"
+        android:textColor="@color/acq_colorTextSecondary"
+        android:textSize="16sp"
+        android:layout_marginBottom="24dp"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/ui/src/main/res/layout/acq_fragment_payment_success.xml b/ui/src/main/res/layout/acq_fragment_payment_success.xml
new file mode 100644
index 00000000..5bb389d7
--- /dev/null
+++ b/ui/src/main/res/layout/acq_fragment_payment_success.xml
@@ -0,0 +1,36 @@
+<?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/acq_bottom_sheet_bg"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/acq_commonsheet_title_img"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="48dp"
+        android:layout_marginBottom="16dp"
+        android:src="@drawable/acq_ic_check_circle_positive" />
+
+    <TextView
+        android:id="@+id/acq_commonsheet_title_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="@string/acq_commonsheet_paid_title"
+        android:textColor="@color/acq_colorText"
+        android:textSize="20sp"
+        android:textStyle="bold" />
+
+    <ru.tinkoff.acquiring.sdk.ui.customview.LoaderButton
+        android:id="@+id/acq_button_ok"
+        style="@style/AcqLoaderButton.Primary"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginVertical="24dp"
+        app:acq_text="@string/acq_commonsheet_clear_primarybutton" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/ui/src/main/res/layout/acq_fragment_yandex_stub.xml b/ui/src/main/res/layout/acq_fragment_yandex_stub.xml
new file mode 100644
index 00000000..3e647a8d
--- /dev/null
+++ b/ui/src/main/res/layout/acq_fragment_yandex_stub.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright © 2020 Tinkoff Bank
+  ~
+  ~ 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.
+  -->
+
+<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="300dp"
+    android:fillViewport="true">
+
+    <ProgressBar
+        android:id="@+id/acq_progressbar"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_gravity="center"
+        android:layout_marginLeft="?acqViewHorizontalOffset"
+        android:layout_marginRight="?acqViewHorizontalOffset"
+       />
+</FrameLayout>
\ No newline at end of file
diff --git a/ui/src/main/res/values-night/colors.xml b/ui/src/main/res/values-night/colors.xml
index 1fbfbb43..cb81b589 100644
--- a/ui/src/main/res/values-night/colors.xml
+++ b/ui/src/main/res/values-night/colors.xml
@@ -18,6 +18,7 @@
 <resources>
     <color name="acq_colorMain">#1C1C1E</color>
     <color name="acq_colorMainDark">#333333</color>
+    <color name="acq_colorButtonDisable">#0FFFFFFF</color>
     <color name="acq_colorShadow">@android:color/transparent</color>
     <color name="acq_colorCardBackground">@color/acq_colorMainDark</color>
     <color name="acq_colorFpsBackground">#FFFFFF</color>
@@ -25,8 +26,14 @@
 
     <color name="acq_colorTitle">#F6F7F8</color>
     <color name="acq_colorText">@color/acq_colorTitle</color>
-    <color name="acq_colorTextInvalid">#CF6679</color>
+    <color name="acq_colorTextTertiary">#4dffffff</color>
 
     <color name="acq_colorHint">#727272</color>
     <color name="acq_colorTextButton">@color/acq_colorMain</color>
+    <color name="acq_colorButtonTextDisabled">#4DFFFFFF</color>
+
+    <color name="acq_sf_text_field_bg">#1affffff</color>
+    <color name="acq_sf_text_field_bg_pressed">#26ffffff</color>
+
+    <color name="acq_colorShimmer">#333335</color>
 </resources>
\ No newline at end of file
diff --git a/ui/src/main/res/values-ru/strings.xml b/ui/src/main/res/values-ru/strings.xml
index ea027a84..040267f1 100644
--- a/ui/src/main/res/values-ru/strings.xml
+++ b/ui/src/main/res/values-ru/strings.xml
@@ -24,4 +24,11 @@
 
     <string name="acq_fps_chooser_title">Выберите приложение</string>
 
+    <string name="acq_commonsheet_processing_title">Обрабатываем платеж</string>
+    <string name="acq_commonsheet_processing_description">Это займет некоторое время</string>
+    <string name="acq_commonsheet_paid_title">Оплачено</string>
+    <string name="acq_commonsheet_failed_title">Не получилось оплатить</string>
+    <string name="acq_commonsheet_clear_primarybutton">Понятно</string>
+    <string name="acq_commonsheet_changemethod_primarybutton">Воспользуйтесь другим\nспособом оплаты</string>
+
 </resources>
\ No newline at end of file
diff --git a/ui/src/main/res/values/attrs.xml b/ui/src/main/res/values/attrs.xml
index a38aa96a..ab6a301c 100644
--- a/ui/src/main/res/values/attrs.xml
+++ b/ui/src/main/res/values/attrs.xml
@@ -60,4 +60,11 @@
         <attr name="spi_lastPlus" format="reference" />
     </declare-styleable>
 
+    <declare-styleable name="LoaderButton">
+        <attr name="acq_text" />
+        <attr name="acq_text_color" format="color" />
+        <attr name="acq_background" format="reference" />
+        <attr name="acq_progress_color" format="color" />
+    </declare-styleable>
+
 </resources>
\ No newline at end of file
diff --git a/ui/src/main/res/values/colors.xml b/ui/src/main/res/values/colors.xml
index 68240d0f..a1471ab5 100644
--- a/ui/src/main/res/values/colors.xml
+++ b/ui/src/main/res/values/colors.xml
@@ -21,10 +21,14 @@
     <color name="acq_colorAccent">#428BF9</color>
     <color name="acq_colorBrandGray">#3e4757</color>
     <color name="acq_colorButton">#FFDD2D</color>
-    <color name="acq_colorButtonPressed">#55ffdd2d</color>
-    <color name="acq_colorButtonDisable">#F6F7F8</color>
+    <color name="acq_colorButtonPressed">#FFCD33</color>
+    <color name="acq_colorButtonDisable">#08001024</color>
+    <color name="acq_colorButtonSecondary">@color/acq_colorButtonDisable</color>
+    <color name="acq_colorButtonSecondaryPressed">#08001024</color>
     <color name="acq_colorTitle">#000000</color>
     <color name="acq_colorText">#333333</color>
+    <color name="acq_colorTextSecondary">#ff9299a2</color>
+    <color name="acq_colorTextTertiary">#38001024</color>
     <color name="acq_colorHint">#C7C9CC</color>
     <color name="acq_colorCoins">#9E9E9E</color>
     <color name="acq_colorBackgroundTransparentGray">#4D000000</color>
@@ -46,4 +50,15 @@
     <color name="acq_colorKeyText">#FFFFFF</color>
     <color name="acq_colorKeyCircle">#2CFFFFFF</color>
     <color name="acq_colorKeyboardBackground">@color/acq_colorBrandGray</color>
+
+    <color name="acq_colorShimmer">#f7f7f7</color>
+
+    <color name="acq_sf_text_field_bg">#08001024</color>
+    <color name="acq_sf_text_field_bg_pressed">#0f001024</color>
+
+    <color name="acq_snackbar_bg">#333333</color>
+    <color name="acq_colorButtonText">#333333</color>
+    <color name="acq_colorButtonTextDisabled">#38001024</color>
+    <color name="acq_progress_bar_color">#FFDD2D</color>
+
 </resources>
diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml
index e09d5127..1e0f1bf1 100644
--- a/ui/src/main/res/values/strings.xml
+++ b/ui/src/main/res/values/strings.xml
@@ -26,4 +26,11 @@
     <string name="acq_fps" translatable="false">fps</string>
     <string name="acq_tinkoff" translatable="false">Tinkoff</string>
 
+    <string name="acq_commonsheet_processing_title">Processing the payment</string>
+    <string name="acq_commonsheet_processing_description">it will take some time</string>
+    <string name="acq_commonsheet_paid_title">Paid</string>
+    <string name="acq_commonsheet_failed_title">Payment error</string>
+    <string name="acq_commonsheet_clear_primarybutton">OK</string>
+    <string name="acq_commonsheet_changemethod_primarybutton">Use a different payment method</string>
+
 </resources>
diff --git a/ui/src/main/res/values/styles.xml b/ui/src/main/res/values/styles.xml
index 627f8d40..27ce66b9 100644
--- a/ui/src/main/res/values/styles.xml
+++ b/ui/src/main/res/values/styles.xml
@@ -216,4 +216,33 @@
         <item name="android:textColor">?colorAccent</item>
     </style>
 
+    <style name="AcqLoaderButton">
+        <item name="android:minHeight">56dp</item>
+        <item name="android:layout_marginStart">16dp</item>
+        <item name="android:layout_marginEnd">16dp</item>
+    </style>
+
+    <style name="AcqLoaderButton.Primary" parent="AcqLoaderButton">
+        <item name="acq_text_color">@color/acq_button_text_selector</item>
+        <item name="acq_progress_color">@color/acq_colorButtonText</item>
+        <item name="acq_background">@drawable/acq_button_yellow_bg</item>
+    </style>
+
+    <style name="AcqLoaderButton.Secondary" parent="AcqLoaderButton">
+        <item name="acq_text_color">@color/acq_secondary_button_text_selector</item>
+        <item name="acq_progress_color">@color/acq_colorAccent</item>
+        <item name="acq_background">@drawable/acq_button_secondary_bg</item>
+    </style>
+
+    <style name="AcqLoaderButton.Flat" parent="AcqLoaderButton">
+        <item name="acq_text_color">@color/acq_secondary_button_text_selector</item>
+        <item name="acq_progress_color">@color/acq_colorAccent</item>
+        <item name="acq_background">@drawable/acq_button_flat_bg</item>
+    </style>
+
+    <style name="AcqBottomSheetAnim">
+        <item name="android:windowEnterAnimation">@anim/acq_slide_up</item>
+        <item name="android:windowExitAnimation">@anim/acq_slide_down</item>
+    </style>
+
 </resources>
diff --git a/ui/src/test/java/yandex/YandexPaymentProcessEnv.kt b/ui/src/test/java/yandex/YandexPaymentProcessEnv.kt
new file mode 100644
index 00000000..45544fa4
--- /dev/null
+++ b/ui/src/test/java/yandex/YandexPaymentProcessEnv.kt
@@ -0,0 +1,103 @@
+package yandex
+
+import android.content.Context
+import kotlinx.coroutines.*
+import org.mockito.kotlin.*
+import ru.tinkoff.acquiring.sdk.AcquiringSdk
+import ru.tinkoff.acquiring.sdk.payment.YandexPaymentProcess
+import ru.tinkoff.acquiring.sdk.requests.FinishAuthorizeRequest
+import ru.tinkoff.acquiring.sdk.requests.InitRequest
+import ru.tinkoff.acquiring.sdk.requests.performSuspendRequest
+import ru.tinkoff.acquiring.sdk.responses.FinishAuthorizeResponse
+import ru.tinkoff.acquiring.sdk.responses.InitResponse
+import ru.tinkoff.acquiring.sdk.threeds.ThreeDsDataCollector
+import ru.tinkoff.acquiring.sdk.ui.activities.ThreeDsActivity
+
+private val yandexPay3dsDataMap = mapOf(
+    "threeDSCompInd" to "Y",
+    "language" to "ru-RU",
+    "timezone" to "",
+    "screen_height" to "120",
+    "screen_width" to "120",
+    "cresCallbackUrl" to ThreeDsActivity.TERM_URL_V2
+).toMutableMap()
+
+class YandexPaymentProcessEnv(
+    // const
+    val yandexToken: String? = "yandexToken",
+    val paymentId: Long = 1,
+    val paReq: String = "paReq",
+    val md: String = "md",
+    val tdsServerTransId: String = "tdsServerTransId",
+    val acsTransId : String= "acsTransId",
+
+    // env
+    val ioDispatcher: CoroutineDispatcher = Dispatchers.Unconfined,
+
+    // mocks
+    val initRequestMock: InitRequest = mock(),
+    val faRequestMock: FinishAuthorizeRequest = mock(),
+    val sdk: AcquiringSdk = mock(),
+    val context: Context = mock(),
+    val threeDsDataCollector: ThreeDsDataCollector = mock { on { invoke(any(), any()) } doReturn  yandexPay3dsDataMap },
+    val process: YandexPaymentProcess = YandexPaymentProcess(sdk, context, threeDsDataCollector, ioDispatcher)
+) {
+
+    init {
+        whenever(sdk.init(any())).doReturn(initRequestMock)
+        whenever(sdk.finishAuthorize(any())).doReturn(faRequestMock)
+    }
+
+    fun shutdownMock() {
+        reset(initRequestMock)
+        reset(context)
+    }
+
+    suspend fun setInitResult(response: InitResponse) {
+        val result = Result.success(response)
+
+        whenever(initRequestMock.performSuspendRequest())
+            .doReturn(result)
+    }
+
+    suspend fun setInitResult(throwable: Throwable) {
+        val result = Result.failure<InitResponse>(throwable)
+
+        whenever(initRequestMock.performSuspendRequest())
+            .doReturn(result)
+    }
+
+    suspend fun setInitResult(definePaymentId: Long? = null) {
+        val response = InitResponse(paymentId = definePaymentId ?: paymentId)
+        val result = Result.success(response)
+
+        whenever(initRequestMock.performSuspendRequest())
+            .doReturn(result)
+    }
+
+    suspend fun setFAResult(response : FinishAuthorizeResponse = FinishAuthorizeResponse()) {
+        val result = Result.success(response)
+
+        whenever(faRequestMock.performSuspendRequest())
+            .doReturn(result)
+    }
+
+    suspend fun setFAResult(throwable: Throwable) {
+        val result = Result.failure<FinishAuthorizeResponse>(throwable)
+
+        whenever(faRequestMock.performSuspendRequest())
+            .doReturn(result)
+    }
+}
+
+internal fun YandexPaymentProcessEnv.runWithEnv(
+    given: suspend YandexPaymentProcessEnv.() -> Unit,
+    `when`: suspend YandexPaymentProcessEnv.() -> Unit,
+    then: suspend YandexPaymentProcessEnv.() -> Unit
+) {
+    runBlocking {
+        launch { given.invoke(this@runWithEnv) }.join()
+        launch { `when`.invoke(this@runWithEnv) }.join()
+        launch { then.invoke(this@runWithEnv) }.join()
+    }
+}
\ No newline at end of file
diff --git a/ui/src/test/java/yandex/YandexProcessPaymentTest.kt b/ui/src/test/java/yandex/YandexProcessPaymentTest.kt
new file mode 100644
index 00000000..60a66a10
--- /dev/null
+++ b/ui/src/test/java/yandex/YandexProcessPaymentTest.kt
@@ -0,0 +1,175 @@
+package yandex
+
+import org.junit.Assert
+import org.junit.Test
+import org.mockito.Mockito.times
+import org.mockito.kotlin.verify
+import ru.tinkoff.acquiring.sdk.models.enums.ResponseStatus
+import ru.tinkoff.acquiring.sdk.models.options.screen.PaymentOptions
+import ru.tinkoff.acquiring.sdk.payment.YandexPaymentState
+import ru.tinkoff.acquiring.sdk.requests.performSuspendRequest
+import ru.tinkoff.acquiring.sdk.responses.FinishAuthorizeResponse
+
+/**
+ * Created by i.golovachev
+ */
+class YandexProcessPaymentTest {
+
+    private val processEnv = YandexPaymentProcessEnv()
+
+    @Test
+    //#2354687
+    fun `When Init complete Then FA called`() = processEnv.runWithEnv(
+        given = {
+            setInitResult()
+            setFAResult()
+        },
+        `when` = {
+            process.create(PaymentOptions(), yandexToken!!)
+            process.start().join()
+        },
+        then = {
+            verify(processEnv.faRequestMock, times(1)).performSuspendRequest()
+        }
+    )
+
+    @Test
+    //#2354729
+    fun `When FA complete and return paReq Then 3dsv1 redirected`() = processEnv.runWithEnv(
+        given = {
+            setInitResult()
+            setFAResult(
+                FinishAuthorizeResponse(
+                    paReq = paReq,
+                    md = md,
+                    paymentId = paymentId,
+                    status = ResponseStatus.THREE_DS_CHECKING
+                )
+            )
+        },
+        `when` = {
+            process.create(PaymentOptions(), yandexToken!!)
+            process.start().join()
+        },
+        then = {
+            val value = process.state.value
+            val asdkState = (value as YandexPaymentState.ThreeDsUiNeeded).asdkState
+            Assert.assertFalse(
+                asdkState.data.is3DsVersion2
+            )
+        }
+    )
+
+    @Test
+    //#2354750
+    fun `When FA complete and return TdsServerTransId Then 3dsv2 redirected`() =
+        processEnv.runWithEnv(
+            given = {
+                setInitResult(1L)
+                setFAResult(
+                    FinishAuthorizeResponse(
+                        tdsServerTransId = tdsServerTransId,
+                        acsTransId = acsTransId,
+                        paymentId = paymentId,
+                        status = ResponseStatus.THREE_DS_CHECKING
+                    )
+                )
+            },
+            `when` = {
+                process.create(PaymentOptions(), yandexToken!!)
+                process.start().join()
+            },
+            then = {
+                val value = process.state.value
+                val asdkState = (value as YandexPaymentState.ThreeDsUiNeeded).asdkState
+                Assert.assertTrue(
+                    asdkState.data.is3DsVersion2
+                )
+            }
+        )
+
+    @Test
+    //#2354714
+    fun `When FA throw error Then give error state`() = processEnv.runWithEnv(
+        given = {
+            setInitResult()
+            setFAResult(IllegalStateException())
+        },
+        `when` = {
+            process.create(PaymentOptions(), yandexToken!!)
+            process.start().join()
+        },
+        then = {
+            val value = process.state.value
+            Assert.assertTrue(
+                value is YandexPaymentState.Error
+            )
+        }
+    )
+
+    @Test
+    //#2354688
+    fun `When Init throw error Then give error state`() = processEnv.runWithEnv(
+        given = {
+            setInitResult(IllegalStateException())
+        },
+        `when` = {
+            process.create(PaymentOptions(), yandexToken!!)
+            process.start().join()
+        },
+        then = {
+            val value = process.state.value
+            Assert.assertTrue(
+                value is YandexPaymentState.Error
+            )
+        }
+    )
+
+    @Test
+    //#2354715
+    fun `When FA return CONFIRMED Then give success state`() = processEnv.runWithEnv(
+        given = {
+            setInitResult()
+            setFAResult(
+                FinishAuthorizeResponse(
+                    paymentId = paymentId,
+                    status = ResponseStatus.CONFIRMED
+                )
+            )
+        },
+        `when` = {
+            process.create(PaymentOptions(), yandexToken!!)
+            process.start().join()
+        },
+        then = {
+            val value = process.state.value
+            Assert.assertTrue(
+                value is YandexPaymentState.Success
+            )
+        }
+    )
+
+    @Test
+    //#2354715
+    fun `When FA return AUTHORIZED Then give success state`() = processEnv.runWithEnv(
+        given = {
+            setInitResult()
+            setFAResult(
+                FinishAuthorizeResponse(
+                    paymentId = paymentId,
+                    status = ResponseStatus.AUTHORIZED
+                )
+            )
+        },
+        `when` = {
+            process.create(PaymentOptions(), yandexToken!!)
+            process.start().join()
+        },
+        then = {
+            val value = process.state.value
+            Assert.assertTrue(
+                value is YandexPaymentState.Success
+            )
+        }
+    )
+}
\ No newline at end of file
diff --git a/yandexpay/.gitignore b/yandexpay/.gitignore
new file mode 100644
index 00000000..42afabfd
--- /dev/null
+++ b/yandexpay/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/yandexpay/build.gradle b/yandexpay/build.gradle
new file mode 100644
index 00000000..fefcd703
--- /dev/null
+++ b/yandexpay/build.gradle
@@ -0,0 +1,53 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply from: '../gradle/dokka.gradle'
+apply from: rootProject.file('gradle/versions.gradle')
+apply from: '../gradle/publish.gradle'
+
+android {
+    compileSdkVersion rootProject.compileSdk
+    buildToolsVersion rootProject.buildTools
+
+    defaultConfig {
+        minSdkVersion rootProject.yandexPayMinSdk
+        targetSdkVersion rootProject.targetSdk
+        versionCode Integer.parseInt(VERSION_CODE)
+        versionName VERSION_NAME
+        buildConfigField("String", "ASDK_VERSION_NAME", "\"$VERSION_NAME\"")
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    tasks.whenTaskAdded { task ->
+        if (task.name.contains("AndroidTest")) {
+            task.enabled = false
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "androidx.appcompat:appcompat:$appCompatVersion"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleExtensionsVersion"
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
+    
+    api project(':core')
+    implementation project(':ui')
+
+    implementation "androidx.appcompat:appcompat:${appCompatVersion}"
+    implementation("com.yandex.pay:core:${yandexPayVersion}")
+
+
+    testImplementation 'junit:junit:4.13'
+    testImplementation "org.mockito.kotlin:mockito-kotlin:${mokitoKotlin}"
+    testImplementation 'org.mockito:mockito-inline:2.13.0'
+}
diff --git a/yandexpay/gradle.properties b/yandexpay/gradle.properties
new file mode 100644
index 00000000..6338cf13
--- /dev/null
+++ b/yandexpay/gradle.properties
@@ -0,0 +1,3 @@
+POM_NAME=yandexpay
+POM_ARTIFACT_ID=yandexpay
+POM_PACKAGING=aar
\ No newline at end of file
diff --git a/yandexpay/src/main/AndroidManifest.xml b/yandexpay/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..f4e448d7
--- /dev/null
+++ b/yandexpay/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    package="ru.tinkoff.acquiring.yandexpay">
+
+</manifest>
\ No newline at end of file
diff --git a/yandexpay/src/main/java/ru/tinkoff/acquiring/yandexpay/TinkoffAcquiringYandexExt.kt b/yandexpay/src/main/java/ru/tinkoff/acquiring/yandexpay/TinkoffAcquiringYandexExt.kt
new file mode 100644
index 00000000..57dcb30a
--- /dev/null
+++ b/yandexpay/src/main/java/ru/tinkoff/acquiring/yandexpay/TinkoffAcquiringYandexExt.kt
@@ -0,0 +1,78 @@
+package ru.tinkoff.acquiring.yandexpay
+
+import androidx.fragment.app.FragmentActivity
+import com.yandex.pay.core.OpenYandexPayContract
+import com.yandex.pay.core.YandexPayResult
+import ru.tinkoff.acquiring.sdk.TinkoffAcquiring
+import ru.tinkoff.acquiring.sdk.models.options.screen.PaymentOptions
+import ru.tinkoff.acquiring.yandexpay.models.YandexPayData
+
+/**
+ * Created by i.golovachev
+ */
+internal typealias AcqYandexPayCallback = (AcqYandexPayResult) -> Unit
+typealias AcqYandexPayErrorCallback = (Throwable) -> Unit
+typealias AcqYandexPayCancelCallback = () -> Unit
+
+
+/**
+ * Создает обертку для элемента yandex-pay-button для выбора средства оплаты
+ *
+ * @param activity               контекст для дальнешей навигации платежного флоу из Activity
+ * @param yandexPayData          параметры, для настройки yandex-pay библиотеки, полученные от бэка
+ * @param options                настройки платежной сессии
+ * @param yandexPayRequestCode   код для получения результата, по завершению работы экрана Acquiring SDK
+ * @param isProd                 выбор окружения для яндекса YandexPayEnvironment.Prod или YandexPayEnvironment.Sandbox
+ * @param enableLogging          включение логгирования событий YandexPay
+ * @param themeId                идентификатор темы приложения, параметры которого будет использованы для
+ *                               отображение yandex-pay-button
+ * @param onYandexErrorCallback  дополнительный метод для возможности обработки ошибки от яндекса на
+ *                               стороне клиентского приложения
+ * @param onYandexCancelCallback дополнительный метод для возможности обработки отмены
+ */
+fun TinkoffAcquiring.createYandexPayButtonFragment(
+    activity: FragmentActivity,
+    yandexPayData: YandexPayData,
+    options: PaymentOptions,
+    yandexPayRequestCode: Int,
+    isProd: Boolean = false,
+    enableLogging: Boolean = false,
+    themeId: Int? = null,
+    onYandexErrorCallback: AcqYandexPayErrorCallback? = null,
+    onYandexCancelCallback: AcqYandexPayCancelCallback? = null
+): YandexButtonFragment {
+    val fragment = YandexButtonFragment.newInstance(yandexPayData, options,  isProd, enableLogging, themeId)
+    addYandexResultListener(fragment, activity, yandexPayRequestCode, onYandexErrorCallback, onYandexCancelCallback)
+    return fragment
+}
+
+/**
+ * Создает слушатель, который обрабатывает результат флоу yandex-pay
+ *
+ * @param activity                контекст для дальнешей навигации платежного флоу из Activity
+ * @param fragment                экземляр фрагмента - обертки над яндексом
+ * @param yandexPayRequestCode    код для получения результата, по завершению работы экрана Acquiring SDK
+ * @param onYandexErrorCallback   дополнительный метод для возможности обработки ошибки от яндекса на
+ *                                стороне клиентского приложения
+ * @param onYandexCancelCallback  дополнительный метод для возможности обработки отмены
+ */
+fun TinkoffAcquiring.addYandexResultListener(
+    fragment: YandexButtonFragment,
+    activity: FragmentActivity,
+    yandexPayRequestCode: Int,
+    onYandexErrorCallback: AcqYandexPayErrorCallback? = null,
+    onYandexCancelCallback: AcqYandexPayCancelCallback? = null
+) {
+    fragment.listener = {
+        when (it) {
+            is AcqYandexPayResult.Success -> openYandexPaymentScreen(
+                activity,
+                it.paymentOptions,
+                yandexPayRequestCode,
+                it.token
+            )
+            is AcqYandexPayResult.Error -> onYandexErrorCallback?.invoke(it.throwable)
+            else -> onYandexCancelCallback?.invoke()
+        }
+    }
+}
\ No newline at end of file
diff --git a/yandexpay/src/main/java/ru/tinkoff/acquiring/yandexpay/YandexButtonFragment.kt b/yandexpay/src/main/java/ru/tinkoff/acquiring/yandexpay/YandexButtonFragment.kt
new file mode 100644
index 00000000..0ef82215
--- /dev/null
+++ b/yandexpay/src/main/java/ru/tinkoff/acquiring/yandexpay/YandexButtonFragment.kt
@@ -0,0 +1,141 @@
+package ru.tinkoff.acquiring.yandexpay
+
+import android.os.Bundle
+import android.view.ContextThemeWrapper
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.StyleRes
+import androidx.core.os.bundleOf
+import androidx.fragment.app.Fragment
+import com.yandex.pay.core.*
+import com.yandex.pay.core.data.*
+import com.yandex.pay.core.ui.YandexPayButton
+import ru.tinkoff.acquiring.sdk.AcquiringSdk
+import ru.tinkoff.acquiring.sdk.models.options.screen.PaymentOptions
+import ru.tinkoff.acquiring.yandexpay.models.YandexPayData
+import ru.tinkoff.acquiring.yandexpay.models.mapYandexOrder
+
+/**
+ * Created by i.golovachev
+ */
+class YandexButtonFragment : Fragment() {
+
+    companion object {
+
+        fun newInstance(
+            data: YandexPayData,
+            options: PaymentOptions? = null,
+            isProd: Boolean = false,
+            enableLogging: Boolean = false,
+            @StyleRes themeForYandexButton: Int? = null
+        ): YandexButtonFragment {
+            return YandexButtonFragment().apply {
+                arguments = bundleOf(
+                    YandexButtonFragment::data.name to data,
+                    YandexButtonFragment::options.name to options,
+                    YandexButtonFragment::isProd.name to isProd,
+                    YandexButtonFragment::enableLogging.name to enableLogging,
+                    YandexButtonFragment::theme.name to themeForYandexButton,
+                )
+            }
+        }
+    }
+
+    internal var listener: AcqYandexPayCallback? = null
+
+    private val data: YandexPayData by lazy {
+        arguments?.getSerializable(YandexButtonFragment::data.name) as YandexPayData
+    }
+
+    lateinit var options: PaymentOptions
+
+    private val theme: Int? by lazy {
+        arguments?.getInt(YandexButtonFragment::theme.name)
+    }
+
+    private val enableLogging: Boolean by lazy {
+        arguments?.getBoolean(YandexButtonFragment::enableLogging.name) ?: false
+    }
+
+    private val isProd: Boolean by lazy {
+        arguments?.getBoolean(YandexButtonFragment::isProd.name) ?: false
+    }
+
+    private val yandexPayLauncher = registerForActivityResult(OpenYandexPayContract()) { result ->
+        val acqResult = when (result) {
+            is YandexPayResult.Success ->
+                AcqYandexPayResult.Success(result.paymentToken.value, options)
+            is YandexPayResult.Failure -> when (result) {
+                is YandexPayResult.Failure.Validation -> AcqYandexPayResult.Error(result.details.name)
+                is YandexPayResult.Failure.Internal -> AcqYandexPayResult.Error(result.message)
+            }
+            is YandexPayResult.Cancelled -> AcqYandexPayResult.Cancelled
+        }
+        listener?.invoke(acqResult)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val options = arguments?.getParcelable<PaymentOptions>(YandexButtonFragment::options.name)
+        if (options != null) {
+            this.options = options
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        initYandexPay(
+            yadata = data,
+            yandexPayEnvironment = if (isProd) YandexPayEnvironment.PROD else YandexPayEnvironment.SANDBOX,
+            logging = enableLogging
+        )
+
+        val inf = theme?.let {
+            inflater.cloneInContext(ContextThemeWrapper(requireContext(), it))
+        } ?: inflater
+
+        val button = inf.inflate(
+            R.layout.acq_view_yandex_pay_button, container, false
+        ) as YandexPayButton
+
+        button.setOnClickListener { ->
+            val orderDetails = OrderDetails(
+                paymentMethods = data.toYandexPayMethods,
+                order = options.mapYandexOrder()
+            )
+            // запустите сервис с помощью лаунчера, передав сформированные orderDetails
+            yandexPayLauncher.launch(orderDetails)
+        }
+
+        return button
+    }
+
+    private fun initYandexPay(
+        yadata: YandexPayData,
+        yandexPayEnvironment: YandexPayEnvironment = YandexPayEnvironment.SANDBOX,
+        logging: Boolean = true
+    ) {
+        val merch = Merchant(
+            id = MerchantId.from(yadata.merchantId),
+            name = yadata.merchantName,
+            url = yadata.merchantUrl
+        )
+        if (YandexPayLib.isSupported) {
+            YandexPayLib.initialize(
+                context = requireContext(),
+                config = YandexPayLibConfig(
+                    merchantDetails = merch,
+                    environment = yandexPayEnvironment,
+                    logging = logging,
+                    locale = YandexPayLocale.SYSTEM,
+                )
+            )
+        } else {
+            throw IllegalAccessException()
+        }
+    }
+}
\ No newline at end of file
diff --git a/yandexpay/src/main/java/ru/tinkoff/acquiring/yandexpay/YandexPayError.kt b/yandexpay/src/main/java/ru/tinkoff/acquiring/yandexpay/YandexPayError.kt
new file mode 100644
index 00000000..aa103f24
--- /dev/null
+++ b/yandexpay/src/main/java/ru/tinkoff/acquiring/yandexpay/YandexPayError.kt
@@ -0,0 +1,6 @@
+package ru.tinkoff.acquiring.yandexpay
+
+/**
+ * Created by i.golovachev
+ */
+class YandexPayError(message: String) : Throwable(message), java.io.Serializable
\ No newline at end of file
diff --git a/yandexpay/src/main/java/ru/tinkoff/acquiring/yandexpay/YandexPayResult.kt b/yandexpay/src/main/java/ru/tinkoff/acquiring/yandexpay/YandexPayResult.kt
new file mode 100644
index 00000000..7f824398
--- /dev/null
+++ b/yandexpay/src/main/java/ru/tinkoff/acquiring/yandexpay/YandexPayResult.kt
@@ -0,0 +1,16 @@
+package ru.tinkoff.acquiring.yandexpay
+
+import ru.tinkoff.acquiring.sdk.models.options.screen.PaymentOptions
+
+/**
+ * Created by i.golovachev
+ */
+sealed class AcqYandexPayResult {
+    class Success(val token: String, val paymentOptions: PaymentOptions) : AcqYandexPayResult()
+    class Error(val throwable: Throwable) : AcqYandexPayResult() {
+
+        constructor(message: String) : this(YandexPayError(message))
+    }
+
+    object Cancelled : AcqYandexPayResult()
+}
\ No newline at end of file
diff --git a/yandexpay/src/main/java/ru/tinkoff/acquiring/yandexpay/models/YandexPayCoreExt.kt b/yandexpay/src/main/java/ru/tinkoff/acquiring/yandexpay/models/YandexPayCoreExt.kt
new file mode 100644
index 00000000..8fb4dc70
--- /dev/null
+++ b/yandexpay/src/main/java/ru/tinkoff/acquiring/yandexpay/models/YandexPayCoreExt.kt
@@ -0,0 +1,52 @@
+package ru.tinkoff.acquiring.yandexpay.models
+
+import com.yandex.pay.core.data.Amount
+import com.yandex.pay.core.data.Order
+import com.yandex.pay.core.data.OrderID
+import ru.tinkoff.acquiring.sdk.models.options.screen.PaymentOptions
+import ru.tinkoff.acquiring.sdk.responses.Paymethod
+import ru.tinkoff.acquiring.sdk.responses.TerminalInfo
+import ru.tinkoff.acquiring.sdk.utils.Money
+import ru.tinkoff.acquiring.sdk.utils.Money.Companion.COINS_IN_RUBLE
+
+/**
+ * Created by i.golovachev
+ */
+fun TerminalInfo.mapYandexPayData(): YandexPayData? {
+    return paymethods.firstOrNull { it.paymethod == Paymethod.YandexPay }
+        ?.params
+        ?.run {
+            YandexPayData(
+                merchantId = getValue("ShowcaseId"),
+                merchantName = getValue("MerchantName"),
+                merchantUrl = getValue("MerchantOrigin"),
+                gatewayMerchantId = getValue("MerchantId")
+            )
+        }
+        ?: return null
+}
+
+fun TerminalInfo.enableYandexPay() = paymethods.any { it.paymethod == Paymethod.YandexPay }
+
+fun PaymentOptions.mapYandexOrder(): Order {
+    return Order(
+
+        OrderID.from(this.order.orderId),
+
+        Amount.from(this.order.amount.toYandexString()),
+
+        this.order.description
+    )
+}
+
+fun Money.toYandexString(): String {
+    val fractional = coins.rem(COINS_IN_RUBLE)
+    val rub =  coins.div(COINS_IN_RUBLE)
+    return String.format("%s%s%02d",
+        rub,
+        YANDEX_INT_FRACT_DIVIDER,
+        fractional
+    )
+}
+
+private const val YANDEX_INT_FRACT_DIVIDER = "."
\ No newline at end of file
diff --git a/yandexpay/src/main/java/ru/tinkoff/acquiring/yandexpay/models/YandexPayData.kt b/yandexpay/src/main/java/ru/tinkoff/acquiring/yandexpay/models/YandexPayData.kt
new file mode 100644
index 00000000..2d85fdc2
--- /dev/null
+++ b/yandexpay/src/main/java/ru/tinkoff/acquiring/yandexpay/models/YandexPayData.kt
@@ -0,0 +1,47 @@
+package ru.tinkoff.acquiring.yandexpay.models
+
+import com.yandex.pay.core.data.*
+import java.io.Serializable
+
+/**
+ * Created by i.golovachev
+ */
+data class YandexPayData internal constructor(
+    val merchantId: String,
+    val merchantName: String,
+    val merchantUrl: String,
+    val gatewayMerchantId: String,
+    val gatewayAcqId: GatewayAcqId = GatewayAcqId.tinkoff
+) : Serializable {
+
+    internal val allowedAuthMethods = listOf(AuthMethod.PanOnly)
+    internal val type =  PaymentMethodType.Card
+    internal val gateway = Gateway.from(gatewayAcqId.name)
+    internal val allowedCardNetworks = listOf(
+        CardNetwork.Visa,
+        CardNetwork.MasterCard,
+        CardNetwork.MIR
+    )
+    internal val gatewayMerchantIdYandex = GatewayMerchantID.from(gatewayMerchantId)
+
+    internal val toYandexPayMethods
+        get() = listOf(
+            PaymentMethod(
+                // Что будет содержаться в платежном токене: зашифрованные данные банковской карты
+                // или токенизированная карта
+                allowedAuthMethods,
+                // Метод оплаты
+                type,
+                // ID поставщика платежных услуг
+                gateway,
+                // Список поддерживаемых платежных систем
+                allowedCardNetworks,
+                // ID продавца в системе поставщика платежных услуг
+                gatewayMerchantIdYandex,
+            ),
+        )
+}
+
+enum class GatewayAcqId {
+    tinkoff
+}
\ No newline at end of file
diff --git a/yandexpay/src/main/res/layout/acq_view_yandex_pay_button.xml b/yandexpay/src/main/res/layout/acq_view_yandex_pay_button.xml
new file mode 100644
index 00000000..52275ca7
--- /dev/null
+++ b/yandexpay/src/main/res/layout/acq_view_yandex_pay_button.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright © 2020 Tinkoff Bank
+  ~
+  ~ 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.
+  -->
+
+<com.yandex.pay.core.ui.YandexPayButton xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/acq_yandex_button"
+    android:layout_width="match_parent"
+    android:layout_gravity="center"
+    android:layout_height="match_parent"
+    app:yandexpay_color_scheme="by_theme"
+    app:yandexpay_corner_radius="?acqYandexPayButtonCornerRadius" />
\ No newline at end of file
diff --git a/yandexpay/src/main/res/values/styles.xml b/yandexpay/src/main/res/values/styles.xml
new file mode 100644
index 00000000..abf0b17e
--- /dev/null
+++ b/yandexpay/src/main/res/values/styles.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright © 2020 Tinkoff Bank
+  ~
+  ~ 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.
+  -->
+
+<resources>
+
+    <style name="AcquiringTheme.Base.Yandex">
+        <item name="acqYandexPayButtonCornerRadius">8dp</item>
+    </style>
+
+    <attr name="acqYandexPayButtonCornerRadius" format="dimension">
+    </attr>
+
+</resources>
\ No newline at end of file
diff --git a/yandexpay/src/test/java/ru/tinkoff/acquiring/yandexpay/GetTerminalPayMethodsTest.kt b/yandexpay/src/test/java/ru/tinkoff/acquiring/yandexpay/GetTerminalPayMethodsTest.kt
new file mode 100644
index 00000000..ab7884d2
--- /dev/null
+++ b/yandexpay/src/test/java/ru/tinkoff/acquiring/yandexpay/GetTerminalPayMethodsTest.kt
@@ -0,0 +1,173 @@
+package ru.tinkoff.acquiring.yandexpay
+
+import com.yandex.pay.core.data.*
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert
+import org.junit.Test
+import org.mockito.kotlin.any
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import ru.tinkoff.acquiring.sdk.models.options.screen.PaymentOptions
+import ru.tinkoff.acquiring.sdk.requests.GetTerminalPayMethodsRequest
+import ru.tinkoff.acquiring.sdk.responses.GetTerminalPayMethodsResponse
+import ru.tinkoff.acquiring.sdk.responses.Paymethod
+import ru.tinkoff.acquiring.sdk.responses.PaymethodData
+import ru.tinkoff.acquiring.sdk.responses.TerminalInfo
+import ru.tinkoff.acquiring.sdk.utils.Money
+import ru.tinkoff.acquiring.yandexpay.models.GatewayAcqId
+import ru.tinkoff.acquiring.yandexpay.models.mapYandexPayData
+
+/**
+ * Created by i.golovachev
+ */
+class GetTerminalPayMethodsTest {
+
+    @Test
+    // #2347844
+    fun `get terminal without yandex pay`() = runBlocking {
+        val response = GetTerminalPayMethodsResponse(TerminalInfo())
+        val requests = mock<GetTerminalPayMethodsRequest> {
+            on { performRequestAsync(any()) } doReturn CompletableDeferred(
+                Result.success(response)
+            )
+        }
+        val getTerminalPayMethodsResponse =
+            requests.performRequestAsync(GetTerminalPayMethodsResponse::class.java)
+
+        Assert.assertNull(
+            getTerminalPayMethodsResponse.await().getOrThrow().terminalInfo?.mapYandexPayData()
+        )
+    }
+
+    @Test
+    // 2347847
+    fun `get terminal pay with yandex pay`() = runBlocking {
+        val response = GetTerminalPayMethodsResponse(
+            TerminalInfo(
+                paymethods = listOf(
+                    PaymethodData(
+                        paymethod = Paymethod.YandexPay,
+                        params = mapOf(
+                            "ShowcaseId" to "ShowcaseId",
+                            "MerchantName" to "MerchantName",
+                            "MerchantOrigin" to "MerchantOrigin",
+                            "MerchantId" to "MerchantId",
+                        )
+                    )
+                )
+            )
+        )
+        val requests = mock<GetTerminalPayMethodsRequest> {
+            on { performRequestAsync(any()) } doReturn CompletableDeferred(
+                Result.success(response)
+            )
+        }
+        val getTerminalPayMethodsResponse =
+            requests.performRequestAsync(GetTerminalPayMethodsResponse::class.java)
+
+        Assert.assertNotNull(
+            getTerminalPayMethodsResponse.await().getOrNull()?.terminalInfo?.mapYandexPayData()
+        )
+    }
+
+    @Test
+    //#2355347
+    fun `get terminal pay with error`() = runBlocking {
+        val requests = mock<GetTerminalPayMethodsRequest> {
+            on { performRequestAsync(any()) } doReturn CompletableDeferred(
+                Result.failure(InternalError())
+            )
+        }
+        val getTerminalPayMethodsResponse =
+            requests.performRequestAsync(GetTerminalPayMethodsResponse::class.java)
+
+        Assert.assertNotNull(getTerminalPayMethodsResponse.await().exceptionOrNull())
+    }
+
+    @Test
+    //#2355347
+    fun `get terminal pay return data with yandex and more others`() = runBlocking {
+        val response = GetTerminalPayMethodsResponse(
+            TerminalInfo(
+                paymethods = listOf(
+                    PaymethodData(
+                        paymethod = Paymethod.YandexPay,
+                        params = mapOf(
+                            "ShowcaseId" to "ShowcaseId",
+                            "MerchantName" to "MerchantName",
+                            "MerchantOrigin" to "MerchantOrigin",
+                            "MerchantId" to "MerchantId",
+                        )
+                    ),
+                    PaymethodData(
+                        paymethod = Paymethod.TinkoffPay,
+                        params = mapOf(
+                            "version" to "2.0",
+                        )
+                    ),
+                    PaymethodData(
+                        paymethod = Paymethod.SBP,
+                    )
+                )
+            )
+        )
+        val requests = mock<GetTerminalPayMethodsRequest> {
+            on { performRequestAsync(any()) } doReturn CompletableDeferred(Result.success(response))
+        }
+        val getTerminalPayMethodsResponse =
+            requests.performRequestAsync(GetTerminalPayMethodsResponse::class.java)
+
+        Assert.assertNotNull(
+            getTerminalPayMethodsResponse.await().getOrNull()?.terminalInfo?.mapYandexPayData()
+        )
+    }
+
+    @Test
+    //#2348017
+    fun `When get terminal pay Then pass is in yandex data`() = runBlocking {
+        val response = GetTerminalPayMethodsResponse(
+            TerminalInfo(
+                paymethods = listOf(
+                    PaymethodData(
+                        paymethod = Paymethod.YandexPay,
+                        params = mapOf(
+                            "ShowcaseId" to "15a919d7-c990-412c-b5eb-8d1ffe60e68a",
+                            "MerchantName" to "Horns and hooves",
+                            "MerchantOrigin" to "https://horns-and-hooves.ru",
+                            "MerchantId" to "123456",
+                        )
+                    )
+                )
+            )
+        )
+        val requests = mock<GetTerminalPayMethodsRequest> {
+            on { performRequestAsync(any()) } doReturn CompletableDeferred(Result.success(response))
+        }
+        val getTerminalPayMethodsResponse =
+            requests.performRequestAsync(GetTerminalPayMethodsResponse::class.java)
+        val data = checkNotNull(
+            getTerminalPayMethodsResponse.await().getOrNull()?.terminalInfo?.mapYandexPayData()
+        )
+        val paymentOptions = PaymentOptions()
+
+        paymentOptions.orderOptions {
+            orderId = "orderId"
+            amount = Money.ofCoins(1000)
+            description = "test"
+        }
+
+
+        Assert.assertEquals(data.allowedAuthMethods, listOf(AuthMethod.PanOnly))
+        Assert.assertEquals(data.type, PaymentMethodType.Card)
+        Assert.assertEquals(data.gateway, Gateway.from(GatewayAcqId.tinkoff.name))
+        Assert.assertEquals(
+            data.allowedCardNetworks, listOf(
+                CardNetwork.Visa,
+                CardNetwork.MasterCard,
+                CardNetwork.MIR
+            )
+        )
+        Assert.assertEquals(data.gatewayMerchantIdYandex, GatewayMerchantID.from("123456"))
+    }
+}
\ No newline at end of file
diff --git a/yandexpay/src/test/java/ru/tinkoff/acquiring/yandexpay/MoneyUtilsTest.kt b/yandexpay/src/test/java/ru/tinkoff/acquiring/yandexpay/MoneyUtilsTest.kt
new file mode 100644
index 00000000..d1df06e9
--- /dev/null
+++ b/yandexpay/src/test/java/ru/tinkoff/acquiring/yandexpay/MoneyUtilsTest.kt
@@ -0,0 +1,44 @@
+package ru.tinkoff.acquiring.yandexpay
+
+import org.junit.Assert
+import org.junit.Test
+import ru.tinkoff.acquiring.sdk.utils.Money
+import ru.tinkoff.acquiring.yandexpay.models.toYandexString
+
+/**
+ * Created by i.golovachev
+ */
+class MoneyUtilsTest {
+
+    @Test
+    fun `when amount with coins`() {
+        Assert.assertEquals(
+            Money.ofCoins(1950).toYandexString(),
+            "19.50"
+        )
+    }
+
+    @Test
+    fun `when amount without coins`() {
+        Assert.assertEquals(
+            Money.ofCoins(1900).toYandexString(),
+            "19.00"
+        )
+    }
+
+    @Test
+    fun `when amount without one coin`() {
+        Assert.assertEquals(
+            Money.ofCoins(100901).toYandexString(),
+            "1009.01"
+        )
+    }
+
+    @Test
+    fun `when amount its only coin`() {
+        Assert.assertEquals(
+            Money.ofCoins(25).toYandexString(),
+            "0.25"
+        )
+    }
+}
\ No newline at end of file