Merge branch 'develop' into feature/AND-9476_setup_ci_on_aws

tangem · Dec 14, 2024 · 091756e · 091756e
2 parents eb357c2 + 9fd7925
commit 091756e
Show file tree

Hide file tree

Showing 30 changed files with 35 additions and 465 deletions.
diff --git a/app/src/main/java/com/tangem/tap/ApplicationEntryPoint.kt b/app/src/main/java/com/tangem/tap/ApplicationEntryPoint.kt
@@ -35,7 +35,6 @@ import com.tangem.features.onboarding.v2.OnboardingV2FeatureToggles
 import com.tangem.features.onramp.OnrampFeatureToggles
 import com.tangem.tap.common.log.TangemAppLoggerInitializer
 import com.tangem.tap.domain.scanCard.CardScanningFeatureToggles
-import com.tangem.tap.features.home.featuretoggles.HomeFeatureToggles
 import com.tangem.tap.proxy.AppStateHolder
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.hilt.EntryPoint
@@ -112,8 +111,6 @@ interface ApplicationEntryPoint {
 
     fun getTransactionSignerFactory(): TransactionSignerFactory
 
-    fun getHomeFeatureToggles(): HomeFeatureToggles
-
     fun getGetUserCountryCodeUseCase(): GetUserCountryUseCase
 
     fun getOnrampFeatureToggles(): OnrampFeatureToggles

diff --git a/app/src/main/java/com/tangem/tap/TangemApplication.kt b/app/src/main/java/com/tangem/tap/TangemApplication.kt
@@ -57,7 +57,6 @@ import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.appReducer
 import com.tangem.tap.domain.scanCard.CardScanningFeatureToggles
 import com.tangem.tap.domain.tasks.product.DerivationsFinder
-import com.tangem.tap.features.home.featuretoggles.HomeFeatureToggles
 import com.tangem.tap.proxy.AppStateHolder
 import com.tangem.tap.proxy.redux.DaggerGraphState
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
@@ -177,9 +176,6 @@ abstract class TangemApplication : Application(), ImageLoaderFactory {
     private val transactionSignerFactory: TransactionSignerFactory
         get() = entryPoint.getTransactionSignerFactory()
 
-    private val homeFeatureToggles: HomeFeatureToggles
-        get() = entryPoint.getHomeFeatureToggles()
-
     private val getUserCountryUseCase: GetUserCountryUseCase
         get() = entryPoint.getGetUserCountryCodeUseCase()
 
@@ -272,7 +268,6 @@ abstract class TangemApplication : Application(), ImageLoaderFactory {
                     shareManager = shareManager,
                     appRouter = appRouter,
                     transactionSignerFactory = transactionSignerFactory,
-                    homeFeatureToggles = homeFeatureToggles,
                     getUserCountryUseCase = getUserCountryUseCase,
                     onrampFeatureToggles = onrampFeatureToggles,
                     environmentConfigStorage = environmentConfigStorage,

diff --git a/app/src/main/java/com/tangem/tap/common/redux/AppState.kt b/app/src/main/java/com/tangem/tap/common/redux/AppState.kt
@@ -1,8 +1,5 @@
 package com.tangem.tap.common.redux
 
-import com.tangem.domain.redux.DomainState
-import com.tangem.domain.redux.domainStore
-import com.tangem.domain.redux.global.NetworkServices
 import com.tangem.tap.common.redux.global.GlobalMiddleware
 import com.tangem.tap.common.redux.global.GlobalState
 import com.tangem.tap.common.redux.legacy.LegacyMiddleware
@@ -28,7 +25,6 @@ import com.tangem.tap.features.welcome.redux.WelcomeMiddleware
 import com.tangem.tap.features.welcome.redux.WelcomeState
 import com.tangem.tap.proxy.redux.DaggerGraphMiddleware
 import com.tangem.tap.proxy.redux.DaggerGraphState
-import com.tangem.utils.coroutines.AppCoroutineDispatcherProvider
 import org.rekotlin.Middleware
 import org.rekotlin.StateType
 
@@ -46,18 +42,6 @@ data class AppState(
     val daggerGraphState: DaggerGraphState = DaggerGraphState(),
 ) : StateType {
 
-    private val domainState: DomainState
-        get() = domainStore.state
-
-    private val domainNetworks: NetworkServices
-        get() = domainState.globalState.networkServices
-
-    val featureRepositoryProvider: FeatureRepositoryProvider
-        get() = FeatureRepositoryProvider(
-            tangemTechApi = domainNetworks.tangemTechService.api,
-            dispatchers = AppCoroutineDispatcherProvider(),
-        )
-
     companion object {
         fun getMiddleware(): List<Middleware<AppState>> {
             return listOf(

diff --git a/app/src/main/java/com/tangem/tap/common/redux/FeatureRepositoryProvider.kt b/app/src/main/java/com/tangem/tap/common/redux/FeatureRepositoryProvider.kt
diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalAction.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalAction.kt
@@ -82,8 +82,4 @@ sealed class GlobalAction : Action {
 
         object Update : GlobalAction()
     }
-
-    object FetchUserCountry : GlobalAction() {
-        data class Success(val countryCode: String) : GlobalAction()
-    }
 }
diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMiddleware.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMiddleware.kt
@@ -25,7 +25,6 @@ import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
 import org.rekotlin.Action
 import org.rekotlin.Middleware
-import java.util.Locale
 
 object GlobalMiddleware {
     val handler = globalMiddlewareHandler
@@ -87,27 +86,6 @@ private fun handleAction(action: Action, appState: () -> AppState?) {
             }
             scope.launch { exchangeManager.update() }
         }
-        is GlobalAction.FetchUserCountry -> {
-            val homeFeatureToggles = store.inject(DaggerGraphState::homeFeatureToggles)
-
-            if (!homeFeatureToggles.isMigrateUserCountryCodeEnabled) {
-                scope.launch {
-                    runCatching { store.state.featureRepositoryProvider.homeRepository.getUserCountryCode() }
-                        .onSuccess {
-                            store.dispatchOnMain(
-                                GlobalAction.FetchUserCountry.Success(countryCode = it.code.lowercase()),
-                            )
-                        }
-                        .onFailure {
-                            store.dispatchOnMain(
-                                GlobalAction.FetchUserCountry.Success(
-                                    countryCode = Locale.getDefault().country.lowercase(),
-                                ),
-                            )
-                        }
-                }
-            }
-        }
     }
 }
 

diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt
@@ -1,7 +1,5 @@
 package com.tangem.tap.common.redux.global
 
-import com.tangem.domain.redux.domainStore
-import com.tangem.domain.redux.global.DomainGlobalAction
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.features.onboarding.OnboardingManager
 import com.tangem.tap.proxy.AppStateHolder
@@ -38,7 +36,6 @@ fun globalReducer(action: Action, state: AppState, appStateHolder: AppStateHolde
         }
         is GlobalAction.SaveScanResponse -> {
             appStateHolder.scanResponse = action.scanResponse
-            domainStore.dispatch(DomainGlobalAction.SaveScanNoteResponse(action.scanResponse))
             globalState.copy(scanResponse = action.scanResponse)
         }
         is GlobalAction.ChangeAppCurrency -> {
@@ -77,9 +74,6 @@ fun globalReducer(action: Action, state: AppState, appStateHolder: AppStateHolde
         }
         is GlobalAction.SetIfCardVerifiedOnline ->
             globalState.copy(cardVerifiedOnline = action.verified)
-        is GlobalAction.FetchUserCountry.Success -> {
-            globalState.copy(userCountryCode = action.countryCode)
-        }
         else -> globalState
     }
 }
diff --git a/app/src/main/java/com/tangem/tap/features/home/data/HomeRepositoryImpl.kt b/app/src/main/java/com/tangem/tap/features/home/data/HomeRepositoryImpl.kt
diff --git a/app/src/main/java/com/tangem/tap/features/home/domain/HomeRepository.kt b/app/src/main/java/com/tangem/tap/features/home/domain/HomeRepository.kt
diff --git a/app/src/main/java/com/tangem/tap/features/home/featuretoggles/HomeFeatureToggles.kt b/app/src/main/java/com/tangem/tap/features/home/featuretoggles/HomeFeatureToggles.kt
diff --git a/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt b/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt
@@ -53,7 +53,6 @@ private fun handleHomeAction(action: Action) {
 
             store.dispatch(GlobalAction.RestoreAppCurrency)
             store.dispatch(GlobalAction.ExchangeManager.Init)
-            store.dispatch(GlobalAction.FetchUserCountry)
         }
         is HomeAction.ReadCard -> {
             action.scope.launch {

diff --git a/app/src/main/java/com/tangem/tap/features/main/MainViewModel.kt b/app/src/main/java/com/tangem/tap/features/main/MainViewModel.kt
@@ -18,7 +18,6 @@ import com.tangem.domain.settings.usercountry.FetchUserCountryUseCase
 import com.tangem.domain.staking.FetchStakingTokensUseCase
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.tap.common.extensions.setContext
-import com.tangem.tap.features.home.featuretoggles.HomeFeatureToggles
 import com.tangem.tap.features.main.model.MainScreenState
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -41,7 +40,6 @@ internal class MainViewModel @Inject constructor(
     private val dispatchers: CoroutineDispatcherProvider,
     private val fetchStakingTokensUseCase: FetchStakingTokensUseCase,
     private val apiConfigsManager: ApiConfigsManager,
-    homeFeatureToggles: HomeFeatureToggles,
     private val fetchUserCountryUseCase: FetchUserCountryUseCase,
     getBalanceHidingSettingsUseCase: GetBalanceHidingSettingsUseCase,
 ) : ViewModel(), MainIntents {
@@ -63,11 +61,9 @@ internal class MainViewModel @Inject constructor(
 
         viewModelScope.launch(dispatchers.main) { incrementAppLaunchCounterUseCase() }
 
-        if (homeFeatureToggles.isMigrateUserCountryCodeEnabled) {
-            viewModelScope.launch {
-                fetchUserCountryUseCase().onLeft {
-                    Timber.e("Unable to fetch the user country code $it")
-                }
+        viewModelScope.launch {
+            fetchUserCountryUseCase().onLeft {
+                Timber.e("Unable to fetch the user country code $it")
             }
         }
 

diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt
@@ -22,11 +22,9 @@ import com.tangem.tap.common.analytics.events.AnalyticsParam
 import com.tangem.tap.common.analytics.events.Onboarding
 import com.tangem.tap.common.extensions.*
 import com.tangem.tap.common.redux.AppDialog
-import com.tangem.tap.common.redux.global.GlobalState
 import com.tangem.tap.features.demo.DemoHelper
-import com.tangem.tap.features.home.RUSSIA_COUNTRY_CODE
-import com.tangem.tap.features.onboarding.products.wallet.redux.OnboardingWalletAction
 import com.tangem.tap.features.onboarding.products.wallet.redux.BackupStartedSource
+import com.tangem.tap.features.onboarding.products.wallet.redux.OnboardingWalletAction
 import com.tangem.tap.features.saveWallet.redux.SaveWalletAction
 import com.tangem.tap.mainScope
 import com.tangem.tap.proxy.redux.DaggerGraphState
@@ -50,7 +48,7 @@ object OnboardingHelper {
                 if (!response.twinsIsTwinned()) {
                     true
                 } else {
-                    onboardingManager.isActivationInProgress(cardId) ?: false
+                    onboardingManager.isActivationInProgress(cardId)
                 }
             }
 
@@ -62,7 +60,7 @@ object OnboardingHelper {
                 emptyWallets || activationInProgress || isNoBackup
             }
 
-            response.card.wallets.isNotEmpty() -> onboardingManager.isActivationInProgress(cardId) ?: false
+            response.card.wallets.isNotEmpty() -> onboardingManager.isActivationInProgress(cardId)
             else -> true
         }
     }
@@ -222,7 +220,7 @@ object OnboardingHelper {
         }
     }
 
-    fun handleTopUpAction(walletManager: WalletManager, scanResponse: ScanResponse, globalState: GlobalState) {
+    fun handleTopUpAction(walletManager: WalletManager, scanResponse: ScanResponse) {
         val blockchain = walletManager.wallet.blockchain
         val excludedBlockchains = store.inject(DaggerGraphState::excludedBlockchains)
 
@@ -238,15 +236,8 @@ object OnboardingHelper {
         Analytics.send(Onboarding.Topup.ButtonBuyCrypto(currencyType))
 
         scope.launch {
-            val homeFeatureToggles = store.inject(DaggerGraphState::homeFeatureToggles)
-
-            val isRussia = if (homeFeatureToggles.isMigrateUserCountryCodeEnabled) {
-                val getUserCountryCodeUseCase = store.inject(DaggerGraphState::getUserCountryUseCase)
-
-                getUserCountryCodeUseCase().isRight { it is UserCountry.Russia }
-            } else {
-                globalState.userCountryCode == RUSSIA_COUNTRY_CODE
-            }
+            val getUserCountryCodeUseCase = store.inject(DaggerGraphState::getUserCountryUseCase)
+            val isRussia = getUserCountryCodeUseCase().isRight { it is UserCountry.Russia }
 
             if (isRussia) {
                 val dialogData = AppDialog.RussianCardholdersWarningDialog.Data(topUpUrl)

diff --git a/...n/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteMiddleware.kt b/...n/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteMiddleware.kt
@@ -176,7 +176,6 @@ private fun handleNoteAction(appState: () -> AppState?, action: Action, dispatch
             OnboardingHelper.handleTopUpAction(
                 walletManager = walletManager,
                 scanResponse = scanResponse,
-                globalState = globalState,
             )
         }
         is OnboardingNoteAction.Done -> {

diff --git a/.../main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt b/.../main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt
@@ -299,7 +299,6 @@ private fun handle(action: Action, dispatch: DispatchFunction) {
             OnboardingHelper.handleTopUpAction(
                 walletManager = walletManager,
                 scanResponse = onboardingManager?.scanResponse ?: return,
-                globalState = globalState,
             )
         }
         TwinCardsAction.Done -> {

diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt
@@ -17,7 +17,6 @@ import com.tangem.tap.common.extensions.*
 import com.tangem.tap.common.redux.AppDialog
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.features.demo.DemoHelper
-import com.tangem.tap.features.home.RUSSIA_COUNTRY_CODE
 import com.tangem.tap.network.exchangeServices.CurrencyExchangeManager
 import com.tangem.tap.network.exchangeServices.buyErc20TestnetTokens
 import com.tangem.tap.proxy.redux.DaggerGraphState
@@ -26,7 +25,6 @@ import com.tangem.tap.store
 import kotlinx.coroutines.launch
 import org.rekotlin.Middleware
 
-@Suppress("LargeClass")
 @Deprecated("Will be removed soon")
 object TradeCryptoMiddleware {
 
@@ -41,25 +39,24 @@ object TradeCryptoMiddleware {
         }
     }
 
-    @Suppress("LongMethod", "CyclomaticComplexMethod")
     private fun handle(state: () -> AppState?, action: TradeCryptoAction) {
         if (DemoHelper.tryHandle(state, action)) return
 
         when (action) {
             is TradeCryptoAction.FinishSelling -> openReceiptUrl(action.transactionId)
-            is TradeCryptoAction.Buy -> proceedBuyAction(state, action)
+            is TradeCryptoAction.Buy -> proceedBuyAction(action)
             is TradeCryptoAction.Sell -> proceedSellAction(action)
             is TradeCryptoAction.SendToken -> handleNewSendToken(action = action)
             is TradeCryptoAction.SendCoin -> handleNewSendCoin(action = action)
         }
     }
 
-    private fun proceedBuyAction(state: () -> AppState?, action: TradeCryptoAction.Buy) {
+    private fun proceedBuyAction(action: TradeCryptoAction.Buy) {
         val isOnrampEnabled = store.inject(DaggerGraphState::onrampFeatureToggles).isFeatureEnabled
         if (isOnrampEnabled) {
             proceedWithOnramp(action.userWallet.walletId, action.cryptoCurrencyStatus.currency, action.source)
         } else {
-            proceedWithLegacyBuyAction(state, action)
+            proceedWithLegacyBuyAction(action)
         }
     }
 
@@ -75,7 +72,7 @@ object TradeCryptoMiddleware {
         }
     }
 
-    private fun proceedWithLegacyBuyAction(state: () -> AppState?, action: TradeCryptoAction.Buy) {
+    private fun proceedWithLegacyBuyAction(action: TradeCryptoAction.Buy) {
         val networkAddress = action.cryptoCurrencyStatus.value.networkAddress
             ?.defaultAddress
             ?.let(NetworkAddress.Address::value)
@@ -94,15 +91,9 @@ object TradeCryptoMiddleware {
         )
 
         scope.launch {
-            val homeFeatureToggles = store.inject(DaggerGraphState::homeFeatureToggles)
+            val getUserCountryCodeUseCase = store.inject(DaggerGraphState::getUserCountryUseCase)
 
-            val isRussia = if (homeFeatureToggles.isMigrateUserCountryCodeEnabled) {
-                val getUserCountryCodeUseCase = store.inject(DaggerGraphState::getUserCountryUseCase)
-
-                getUserCountryCodeUseCase().isRight { it is UserCountry.Russia }
-            } else {
-                state()?.globalState?.userCountryCode == RUSSIA_COUNTRY_CODE
-            }
+            val isRussia = getUserCountryCodeUseCase().isRight { it is UserCountry.Russia }
 
             if (action.checkUserLocation && isRussia) {
                 val dialogData = topUrl?.let {