diff --git a/app/src/main/java/com/tangem/tap/TangemApplication.kt b/app/src/main/java/com/tangem/tap/TangemApplication.kt
index abbd2d80de..52be79032f 100644
--- a/app/src/main/java/com/tangem/tap/TangemApplication.kt
+++ b/app/src/main/java/com/tangem/tap/TangemApplication.kt
@@ -356,7 +356,7 @@ open class TangemApplication : Application(), ImageLoaderFactory, Configuration.
 
     private fun createReduxStore(): Store<AppState> {
         return Store(
-            reducer = { action, state -> appReducer(action, state) },
+            reducer = { action, state -> appReducer(action, requireNotNull(state)) },
             middleware = AppState.getMiddleware(),
             state = AppState(
                 daggerGraphState = DaggerGraphState(
diff --git a/app/src/main/java/com/tangem/tap/common/redux/AppReducer.kt b/app/src/main/java/com/tangem/tap/common/redux/AppReducer.kt
index 71fcd29497..65315fc4cd 100644
--- a/app/src/main/java/com/tangem/tap/common/redux/AppReducer.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/AppReducer.kt
@@ -6,9 +6,7 @@ import com.tangem.tap.features.welcome.redux.WelcomeReducer
 import com.tangem.tap.proxy.redux.DaggerGraphReducer
 import org.rekotlin.Action
 
-@Suppress("CanBeNonNullable")
-fun appReducer(action: Action, state: AppState?): AppState {
-    requireNotNull(state)
+fun appReducer(action: Action, state: AppState): AppState {
     if (action is AppAction.RestoreState) return action.state
 
     return AppState(
diff --git a/common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationsFactory.kt b/common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationsFactory.kt
index 668943b4c7..01eea336aa 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationsFactory.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationsFactory.kt
@@ -21,7 +21,7 @@ import com.tangem.utils.extensions.isZero
 import com.tangem.utils.extensions.orZero
 import java.math.BigDecimal
 
-@Suppress("LargeClass")
+@Suppress("LargeClass", "CanBeNonNullable")
 object NotificationsFactory {
 
     fun MutableList<NotificationUM>.addFeeUnreachableNotification(
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/message/MessageBottomSheetV2.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/message/MessageBottomSheetV2.kt
index ab89d9ede7..75ed9271df 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/message/MessageBottomSheetV2.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/message/MessageBottomSheetV2.kt
@@ -125,7 +125,6 @@ private fun ContentContainer(state: MessageBottomSheetUMV2.InfoBlock, modifier:
     }
 }
 
-@Suppress("CanBeNonNullable")
 @Composable
 private fun BottomSheetIconContainer(
     icon: MessageBottomSheetUMV2.Icon?,
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/transactions/TransactionList.kt b/core/ui/src/main/java/com/tangem/core/ui/components/transactions/TransactionList.kt
index 5ff2f3c7bc..b5c5335aba 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/transactions/TransactionList.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/transactions/TransactionList.kt
@@ -29,6 +29,7 @@ import kotlinx.collections.immutable.ImmutableList
  * @param txHistoryItems transactions
  * @param modifier       modifier
  */
+@Suppress("CanBeNonNullable")
 fun LazyListScope.txHistoryItems(
     state: TxHistoryState,
     txHistoryItems: LazyPagingItems<TxHistoryState.TxHistoryItemState>?,
diff --git a/features/feed/impl/src/main/kotlin/com/tangem/features/feed/ui/feed/FeedList.kt b/features/feed/impl/src/main/kotlin/com/tangem/features/feed/ui/feed/FeedList.kt
index 92313b9261..88ebc8dc1f 100644
--- a/features/feed/impl/src/main/kotlin/com/tangem/features/feed/ui/feed/FeedList.kt
+++ b/features/feed/impl/src/main/kotlin/com/tangem/features/feed/ui/feed/FeedList.kt
@@ -266,7 +266,6 @@ private fun MarketPulseBlock(marketChartConfig: MarketChartConfig, feedListCallb
     }
 }
 
-@Suppress("CanBeNonNullable")
 @Composable
 private fun NewsBlock(feedListCallbacks: FeedListCallbacks, news: NewsUM, trendingArticle: ArticleConfigUM?) {
     AnimatedContent(news.newsUMState) { newsUMState ->
diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/components/TokenMarketDetailsBody.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/components/TokenMarketDetailsBody.kt
index c94c78f605..13124c707d 100644
--- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/components/TokenMarketDetailsBody.kt
+++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/components/TokenMarketDetailsBody.kt
@@ -16,6 +16,7 @@ import com.tangem.core.ui.res.TangemTheme
 import com.tangem.features.markets.details.impl.ui.state.MarketsTokenDetailsUM
 import com.tangem.features.markets.impl.R
 
+@Suppress("CanBeNonNullable")
 internal fun LazyListScope.tokenMarketDetailsBody(
     state: MarketsTokenDetailsUM.Body,
     isAccountEnabled: Boolean,
diff --git a/tangem-android-tools b/tangem-android-tools
index fa10299aec..7c69a53ea8 160000
--- a/tangem-android-tools
+++ b/tangem-android-tools
@@ -1 +1 @@
-Subproject commit fa10299aec0b3a06fda9bf6d050e0aa79609d33b
+Subproject commit 7c69a53ea8f5c7d94fa83c33d40f495fa24dbe02