diff --git a/app/src/main/assets/tangem-app-config b/app/src/main/assets/tangem-app-config index 64ae04d208..7f058ec409 160000 --- a/app/src/main/assets/tangem-app-config +++ b/app/src/main/assets/tangem-app-config @@ -1 +1 @@ -Subproject commit 64ae04d2086e5a605dd4da3cba4af32a60d46c79 +Subproject commit 7f058ec409b4eaaf8688ecd4bf944ef8d58d3564 diff --git a/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensAction.kt b/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensAction.kt index 72d7919766..7e1e4bee95 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensAction.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensAction.kt @@ -21,6 +21,9 @@ sealed class TokensAction : Action { object Failure : TokensAction() } + data class LoadMore(val scanResponse: ScanResponse? = null + ) : TokensAction() + data class SetAddedCurrencies( val wallets: List, val derivationStyle: DerivationStyle? ) : TokensAction() diff --git a/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensMiddleware.kt b/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensMiddleware.kt index 48f848e65a..aab99a3d58 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensMiddleware.kt @@ -53,7 +53,13 @@ class TokensMiddleware { action.searchInput ) } - + is TokensAction.LoadMore -> { + if (store.state.tokensState.needToLoadMore + && store.state.tokensState.currencies.isNotEmpty() + ) { + handleLoadCurrencies(action.scanResponse) + } + } } next(action) } diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/AddTokensFragment.kt b/app/src/main/java/com/tangem/tap/features/tokens/ui/AddTokensFragment.kt index deeabe4c9e..8abbc33a2b 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/ui/AddTokensFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/ui/AddTokensFragment.kt @@ -84,13 +84,11 @@ class AddTokensFragment : Fragment(R.layout.fragment_add_tokens), } val onLoadMore = { - if (store.state.tokensState.needToLoadMore) { store.dispatch( - TokensAction.LoadCurrencies( + TokensAction.LoadMore( scanResponse = store.state.globalState.scanResponse ) ) - } } cvCurrencies.setContent {