diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/util/TangemPayStateCreator.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/util/TangemPayStateCreator.kt
index a28ff09b12..51b584d38f 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/util/TangemPayStateCreator.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/util/TangemPayStateCreator.kt
@@ -9,7 +9,7 @@ internal object TangemPayStateCreator {
 
     fun createKycInProgressState(onClickKyc: () -> Unit): TangemPayState = Progress(
         title = TextReference.Res(R.string.tangempay_payment_account),
-        description = TextReference.Res(R.string.tangempay_kyc_in_progress_notification_title),
+        description = TextReference.Res(R.string.tangempay_kyc_in_progress),
         buttonText = TextReference.Res(R.string.tangempay_kyc_in_progress_notification_button),
         iconRes = R.drawable.ic_promo_kyc_36,
         onButtonClick = onClickKyc,
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/visa/TangemPayFailedIssueState.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/visa/TangemPayFailedIssueState.kt
index f8e2f29da6..76ca0dc5be 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/visa/TangemPayFailedIssueState.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/visa/TangemPayFailedIssueState.kt
@@ -13,18 +13,18 @@ import com.tangem.core.ui.res.TangemTheme
 import com.tangem.feature.wallet.presentation.wallet.state.model.TangemPayState
 
 @Composable
-internal fun TangemPayFailedIssueState(state: TangemPayState.FailedIssue) {
+internal fun TangemPayFailedIssueState(state: TangemPayState.FailedIssue, modifier: Modifier = Modifier) {
     BlockCard(
-        modifier = Modifier
+        modifier = modifier
             .clip(RoundedCornerShape(size = TangemTheme.dimens.radius14))
-            .background(TangemTheme.colors.background.primary),
+            .background(TangemTheme.colors.background.primary)
+            .clickable(onClick = state.onButtonClick),
     ) {
         InputRowImageBase(
             modifier = Modifier
                 .padding(
                     all = TangemTheme.dimens.spacing12,
-                )
-                .clickable(onClick = { state.onButtonClick }),
+                ),
             subtitle = state.title,
             caption = state.description,
             subtitleColor = TangemTheme.colors.text.primary1,
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/visa/TangemPayMainScreenBlock.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/visa/TangemPayMainScreenBlock.kt
index 4b4a9bce09..d2750a8903 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/visa/TangemPayMainScreenBlock.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/visa/TangemPayMainScreenBlock.kt
@@ -17,12 +17,12 @@ import com.tangem.feature.wallet.presentation.wallet.ui.components.singlecurrenc
 @Composable
 internal fun TangemPayMainScreenBlock(state: TangemPayState, isBalanceHidden: Boolean, modifier: Modifier = Modifier) {
     when (state) {
-        is Progress -> TangemPayProgressState(state)
+        is Progress -> TangemPayProgressState(state, modifier)
         is TangemPayState.Card -> TangemPayCardMainBlock(state, isBalanceHidden, modifier)
         is TangemPayState.Empty -> Unit
         is TangemPayState.RefreshNeeded -> TangemPayRefreshBlock(state, modifier)
         is TangemPayState.TemporaryUnavailable -> TangemPayUnavailableBlock(state, modifier)
-        is TangemPayState.FailedIssue -> TangemPayFailedIssueState(state)
+        is TangemPayState.FailedIssue -> TangemPayFailedIssueState(state, modifier)
     }
 }
 
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/visa/TangemPayProgressState.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/visa/TangemPayProgressState.kt
index 1dabba345f..ba3fade519 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/visa/TangemPayProgressState.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/visa/TangemPayProgressState.kt
@@ -14,18 +14,18 @@ import com.tangem.core.ui.res.TangemTheme
 import com.tangem.feature.wallet.presentation.wallet.state.model.TangemPayState
 
 @Composable
-internal fun TangemPayProgressState(state: TangemPayState.Progress) {
+internal fun TangemPayProgressState(state: TangemPayState.Progress, modifier: Modifier = Modifier) {
     BlockCard(
-        modifier = Modifier
+        modifier = modifier
             .clip(RoundedCornerShape(size = TangemTheme.dimens.radius14))
-            .background(TangemTheme.colors.background.primary),
+            .background(TangemTheme.colors.background.primary)
+            .clickable(onClick = state.onButtonClick),
     ) {
         InputRowImageBase(
             modifier = Modifier
                 .padding(
                     all = TangemTheme.dimens.spacing12,
-                )
-                .clickable(onClick = { state.onButtonClick }),
+                ),
             subtitle = state.title,
             caption = state.description,
             subtitleColor = TangemTheme.colors.text.primary1,