diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayCardPageScreen.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayCardPageScreen.kt
index 5217c1be53..8ea4e2139d 100644
--- a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayCardPageScreen.kt
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayCardPageScreen.kt
@@ -76,23 +76,25 @@ internal fun TangemPayCardPageScreen(
                     state = cardDetailsState,
                 )
             }
-            if (state.addToWalletBlockState != null) {
-                cardPageItem(key = "GooglePay") {
-                    TangemPayAddToWalletBlock(state = state.addToWalletBlockState)
-                }
-            }
-            cardPageItem(key = "Limit") {
-                TangemPayDailyLimitBlock(state = state.dailyLimitState)
-            }
-            if (state.dailyLimitState == TangemPayDailyLimitBlockState.Error) {
-                cardPageItem(key = "LimitError") {
-                    TangemPayDailyLimitErrorBlock()
-                }
-            }
-            cardPageItem(key = "Settings") {
-                if (state.isReissueInProgress) {
+            if (state.isReissueInProgress) {
+                cardPageItem(key = "Reissue") {
                     TangemPayReplacingCardBlock()
-                } else {
+                }
+            } else {
+                if (state.addToWalletBlockState != null) {
+                    cardPageItem(key = "GooglePay") {
+                        TangemPayAddToWalletBlock(state = state.addToWalletBlockState)
+                    }
+                }
+                cardPageItem(key = "Limit") {
+                    TangemPayDailyLimitBlock(state = state.dailyLimitState)
+                }
+                if (state.dailyLimitState == TangemPayDailyLimitBlockState.Error) {
+                    cardPageItem(key = "LimitError") {
+                        TangemPayDailyLimitErrorBlock()
+                    }
+                }
+                cardPageItem(key = "Settings") {
                     TangemPayCardPageSettingsBlock(settings = state.settings)
                 }
             }