feat(staking): AND-6780 summary sheet pt 1 - earn module (#4132)

blockchain · Nov 24, 2022 · ba652ce · ba652ce
1 parent e2c067c
commit ba652ce
Show file tree

Hide file tree

Showing 60 changed files with 389 additions and 165 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -419,6 +419,10 @@ dependencies {
     implementation project(':nfts:presentation')
     implementation project(':membership:presentation')
 
+    implementation project(':earn:data')
+    implementation project(':earn:domain')
+    implementation project(':earn:presentation')
+
     implementation Libraries.multidex
     coreLibraryDesugaring Libraries.desugaring
 

diff --git a/app/src/main/java/com/blockchain/koin/KoinStarter.kt b/app/src/main/java/com/blockchain/koin/KoinStarter.kt
@@ -14,6 +14,8 @@ import com.blockchain.core.price.pricesModule
 import com.blockchain.coreandroid.coreAndroidModule
 import com.blockchain.deeplinking.koin.deeplinkModule
 import com.blockchain.defiwalletbackup.data.koin.backupPhraseDataModule
+import com.blockchain.earn.data.koin.earnDataModule
+import com.blockchain.earn.koin.earnPresentationModule
 import com.blockchain.home.data.koin.homeDataModule
 import com.blockchain.home.presentation.koin.homePresentationModule
 import com.blockchain.koin.modules.apiInterceptorsModule
@@ -171,6 +173,7 @@ object KoinStarter {
                     fraudDataModule,
                     nftDataModule, nftPresentationModule,
                     multiAppModule,
+                    earnDataModule, earnPresentationModule
                 )
             )
         }

diff --git a/.../java/piuk/blockchain/android/ui/activity/adapter/CustodialStakingActivityItemDelegate.kt b/.../java/piuk/blockchain/android/ui/activity/adapter/CustodialStakingActivityItemDelegate.kt
@@ -8,7 +8,7 @@ import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.blockchain.coincore.CustodialStakingActivitySummaryItem
 import com.blockchain.core.price.historic.HistoricRateFetcher
-import com.blockchain.core.staking.domain.StakingState
+import com.blockchain.earn.domain.models.StakingState
 import com.blockchain.preferences.CurrencyPrefs
 import com.blockchain.utils.toFormattedDate
 import info.blockchain.balance.AssetInfo

diff --git a/app/src/main/java/piuk/blockchain/android/ui/activity/detail/ActivityDetailsModel.kt b/app/src/main/java/piuk/blockchain/android/ui/activity/detail/ActivityDetailsModel.kt
@@ -5,9 +5,9 @@ import com.blockchain.coincore.RecurringBuyActivitySummaryItem
 import com.blockchain.commonarch.presentation.mvi.MviModel
 import com.blockchain.commonarch.presentation.mvi.MviState
 import com.blockchain.core.interest.domain.model.InterestState
-import com.blockchain.core.staking.domain.StakingState
 import com.blockchain.domain.paymentmethods.model.MobilePaymentType
 import com.blockchain.domain.paymentmethods.model.PaymentMethodType
+import com.blockchain.earn.domain.models.StakingState
 import com.blockchain.enviroment.EnvironmentConfig
 import com.blockchain.logging.RemoteLogger
 import com.blockchain.nabu.datamanagers.OrderState

diff --git a/.../main/java/piuk/blockchain/android/ui/activity/detail/CryptoActivityDetailsBottomSheet.kt b/.../main/java/piuk/blockchain/android/ui/activity/detail/CryptoActivityDetailsBottomSheet.kt
@@ -24,8 +24,8 @@ import com.blockchain.componentlib.viewextensions.gone
 import com.blockchain.componentlib.viewextensions.visible
 import com.blockchain.componentlib.viewextensions.visibleIf
 import com.blockchain.core.interest.domain.model.InterestState
-import com.blockchain.core.staking.domain.StakingState
 import com.blockchain.domain.paymentmethods.model.PaymentMethodType
+import com.blockchain.earn.domain.models.StakingState
 import com.blockchain.nabu.datamanagers.OrderState
 import com.blockchain.nabu.datamanagers.RecurringBuyFailureReason
 import com.blockchain.presentation.koin.scopedInject

diff --git a/app/src/main/java/piuk/blockchain/android/ui/coinview/domain/LoadAssetAccountsUseCase.kt b/app/src/main/java/piuk/blockchain/android/ui/coinview/domain/LoadAssetAccountsUseCase.kt
@@ -13,10 +13,10 @@ import com.blockchain.coincore.defaultFilter
 import com.blockchain.coincore.impl.CryptoNonCustodialAccount
 import com.blockchain.coincore.impl.CustodialTradingAccount
 import com.blockchain.core.interest.domain.InterestService
-import com.blockchain.core.staking.domain.StakingService
 import com.blockchain.data.DataResource
 import com.blockchain.data.combineDataResources
 import com.blockchain.data.map
+import com.blockchain.earn.domain.service.StakingService
 import com.blockchain.preferences.CurrencyPrefs
 import com.blockchain.store.flatMapData
 import com.blockchain.walletmode.WalletMode

diff --git a/app/src/main/java/piuk/blockchain/android/ui/coinview/presentation/CoinViewActivityV2.kt b/app/src/main/java/piuk/blockchain/android/ui/coinview/presentation/CoinViewActivityV2.kt
@@ -131,6 +131,7 @@ class CoinViewActivityV2 :
                 navigateToAccountActions(
                     cvAccount = navigationEvent.cvAccount,
                     interestRate = navigationEvent.interestRate,
+                    stakingRate = navigationEvent.stakingRate,
                     actions = navigationEvent.actions,
                     balanceCrypto = navigationEvent.cryptoBalance,
                     fiatBalance = navigationEvent.fiatBalance,
@@ -231,6 +232,9 @@ class CoinViewActivityV2 :
                 showBottomSheet(InterestSummarySheet.newInstance(navigationEvent.cvAccount.account as CryptoAccount))
             }
 
+            is CoinviewNavigationEvent.NavigateToStakingStatement ->
+                showBottomSheet(InterestSummarySheet.newInstance(navigationEvent.cvAccount.account as CryptoAccount))
+
             is CoinviewNavigationEvent.NavigateToInterestDeposit -> {
                 goToInterestDeposit(navigationEvent.cvAccount.account)
             }
@@ -312,6 +316,7 @@ class CoinViewActivityV2 :
     private fun navigateToAccountActions(
         cvAccount: CoinviewAccount,
         interestRate: Double,
+        stakingRate: Double,
         fiatBalance: Money,
         balanceCrypto: Money,
         actions: List<StateAwareAction>
@@ -322,6 +327,7 @@ class CoinViewActivityV2 :
                 balanceFiat = fiatBalance,
                 balanceCrypto = balanceCrypto,
                 interestRate = interestRate,
+                stakingRate = stakingRate,
                 stateAwareActions = actions.toTypedArray()
             )
         )

diff --git a/...src/main/java/piuk/blockchain/android/ui/coinview/presentation/CoinviewNavigationEvent.kt b/...src/main/java/piuk/blockchain/android/ui/coinview/presentation/CoinviewNavigationEvent.kt
@@ -19,6 +19,7 @@ sealed interface CoinviewNavigationEvent : NavigationEvent {
     data class ShowAccountActions(
         val cvAccount: CoinviewAccount,
         val interestRate: Double,
+        val stakingRate: Double,
         val fiatBalance: Money,
         val cryptoBalance: Money,
         val actions: List<StateAwareAction>
@@ -54,6 +55,10 @@ sealed interface CoinviewNavigationEvent : NavigationEvent {
         val cvAccount: CoinviewAccount
     ) : CoinviewNavigationEvent
 
+    data class NavigateToStakingStatement(
+        val cvAccount: CoinviewAccount
+    ) : CoinviewNavigationEvent
+
     data class NavigateToInterestDeposit(
         val cvAccount: CoinviewAccount
     ) : CoinviewNavigationEvent

diff --git a/app/src/main/java/piuk/blockchain/android/ui/coinview/presentation/CoinviewViewModel.kt b/app/src/main/java/piuk/blockchain/android/ui/coinview/presentation/CoinviewViewModel.kt
@@ -49,6 +49,8 @@ import piuk.blockchain.android.ui.coinview.domain.model.CoinviewAssetPriceHistor
 import piuk.blockchain.android.ui.coinview.domain.model.CoinviewAssetTotalBalance
 import piuk.blockchain.android.ui.coinview.domain.model.CoinviewQuickAction
 import piuk.blockchain.android.ui.coinview.domain.model.CoinviewQuickActions
+import piuk.blockchain.android.ui.coinview.domain.model.isInterestAccount
+import piuk.blockchain.android.ui.coinview.domain.model.isStakingAccount
 import piuk.blockchain.android.ui.coinview.presentation.CoinviewAccountsState.Data.CoinviewAccountState.Available
 import piuk.blockchain.android.ui.coinview.presentation.CoinviewAccountsState.Data.CoinviewAccountState.Unavailable
 import piuk.blockchain.android.ui.coinview.presentation.CoinviewAccountsState.Data.CoinviewAccountsHeaderState
@@ -89,7 +91,6 @@ class CoinviewViewModel(
     private var loadQuickActionsJob: Job? = null
     private var loadRecurringBuyJob: Job? = null
     private var loadAssetInfoJob: Job? = null
-    private var loadAccountActionsJob: Job? = null
     private var snackbarMessageJob: Job? = null
 
     private val fiatCurrency: FiatCurrency
@@ -870,6 +871,7 @@ class CoinviewViewModel(
                     CoinviewNavigationEvent.ShowAccountActions(
                         cvAccount = cvAccount,
                         interestRate = cvAccount.interestRate(),
+                        stakingRate = cvAccount.stakingRate(),
                         actions = intent.actions,
                         cryptoBalance = balance.data,
                         fiatBalance = fiatBalance.data,
@@ -1212,6 +1214,7 @@ class CoinviewViewModel(
                                 CoinviewNavigationEvent.ShowAccountActions(
                                     cvAccount = account,
                                     interestRate = account.interestRate(),
+                                    stakingRate = account.stakingRate(),
                                     actions = actions,
                                     cryptoBalance = (account.cryptoBalance as DataResource.Data).data,
                                     fiatBalance = (account.fiatBalance as DataResource.Data).data
@@ -1313,9 +1316,19 @@ class CoinviewViewModel(
             )
 
             AssetAction.ViewStatement -> navigate(
-                CoinviewNavigationEvent.NavigateToInterestStatement(
-                    cvAccount = account
-                )
+                when {
+                    account.isInterestAccount() -> {
+                        CoinviewNavigationEvent.NavigateToInterestStatement(
+                            cvAccount = account
+                        )
+                    }
+                    account.isStakingAccount() -> {
+                        CoinviewNavigationEvent.NavigateToInterestStatement(
+                            cvAccount = account
+                        )
+                    }
+                    else -> throw IllegalStateException("ViewStatement is not supported for account $account")
+                }
             )
 
             AssetAction.InterestDeposit -> navigate(
@@ -1330,12 +1343,11 @@ class CoinviewViewModel(
                 )
             )
 
-            AssetAction.StakingDeposit ->
-                navigate(
-                    CoinviewNavigationEvent.NavigateToStakingDeposit(
-                        cvAccount = account
-                    )
+            AssetAction.StakingDeposit -> navigate(
+                CoinviewNavigationEvent.NavigateToStakingDeposit(
+                    cvAccount = account
                 )
+            )
 
             else -> throw IllegalStateException("Action $action is not supported in this flow")
         }

diff --git a/app/src/main/java/piuk/blockchain/android/ui/dashboard/coinview/CoinViewActivity.kt b/app/src/main/java/piuk/blockchain/android/ui/dashboard/coinview/CoinViewActivity.kt
@@ -531,6 +531,7 @@ class CoinViewActivity :
                             balanceFiat = fiatBalance,
                             balanceCrypto = balance,
                             interestRate = interestRate,
+                            stakingRate = stakingRate,
                             stateAwareActions = state.actions
                         )
                     )

diff --git a/app/src/main/java/piuk/blockchain/android/ui/dashboard/coinview/CoinViewInteractor.kt b/app/src/main/java/piuk/blockchain/android/ui/dashboard/coinview/CoinViewInteractor.kt
@@ -12,6 +12,7 @@ import com.blockchain.coincore.InterestAccount
 import com.blockchain.coincore.NonCustodialAccount
 import com.blockchain.coincore.NullCryptoAccount
 import com.blockchain.coincore.SingleAccountList
+import com.blockchain.coincore.StakingAccount
 import com.blockchain.coincore.StateAwareAction
 import com.blockchain.coincore.TradingAccount
 import com.blockchain.coincore.defaultFilter
@@ -303,8 +304,9 @@ class CoinViewInteractor(
             accounts,
             load24hPriceDelta(asset),
             asset.interestRate(),
+            asset.stakingRate(),
             watchlistDataManager.isAssetInWatchlist(asset.currency)
-        ) { accounts, prices, interestRate, isAddedToWatchlist ->
+        ) { accounts, prices, interestRate, stakingRate, isAddedToWatchlist ->
             // while we wait for a BE flag on whether an asset is tradeable or not, we can check the
             // available accounts to see if we support custodial or PK balances as a guideline to asset support
             val tradeableAsset = accounts.any {
@@ -318,7 +320,7 @@ class CoinViewInteractor(
                 )
             } else {
                 val accountsList = mapAccounts(
-                    accounts, prices.currentRate, interestRate
+                    accounts, prices.currentRate, interestRate, stakingRate
                 )
                 var totalCryptoMoneyAll = Money.zero(asset.currency)
                 val totalCryptoBalance = hashMapOf<AssetFilter, Money>()
@@ -358,7 +360,8 @@ class CoinViewInteractor(
     private fun mapAccounts(
         accounts: List<DetailsItem>,
         exchangeRate: ExchangeRate,
-        interestRate: Double = Double.NaN
+        interestRate: Double = Double.NaN,
+        stakingRate: Double = Double.NaN
     ): List<AssetDisplayInfo> {
 
         val accountComparator = object : Comparator<DetailsItem> {
@@ -371,7 +374,8 @@ class CoinViewInteractor(
                     detailItem.account is NonCustodialAccount && detailItem.isDefault -> 0
                     detailItem.account is TradingAccount -> 1
                     detailItem.account is InterestAccount -> 2
-                    detailItem.account is NonCustodialAccount && detailItem.isDefault.not() -> 3
+                    detailItem.account is StakingAccount -> 3
+                    detailItem.account is NonCustodialAccount && detailItem.isDefault.not() -> 4
                     else -> Int.MAX_VALUE
                 }
             }
@@ -388,6 +392,7 @@ class CoinViewInteractor(
                         filter = when (it.account) {
                             is TradingAccount -> AssetFilter.Trading
                             is InterestAccount -> AssetFilter.Interest
+                            is StakingAccount -> AssetFilter.Staking
                             // todo (othman) should be removed once universal mode is removed
                             is NonCustodialAccount -> AssetFilter.NonCustodial
                             else -> error("account type not supported")
@@ -398,7 +403,8 @@ class CoinViewInteractor(
                         actions = it.actions.filter { action ->
                             action.action != AssetAction.InterestDeposit
                         }.toSet(),
-                        interestRate = interestRate
+                        interestRate = interestRate,
+                        stakingRate = stakingRate
                     )
                 }
                 WalletMode.NON_CUSTODIAL_ONLY -> {

diff --git a/app/src/main/java/piuk/blockchain/android/ui/dashboard/coinview/CoinViewState.kt b/app/src/main/java/piuk/blockchain/android/ui/dashboard/coinview/CoinViewState.kt
@@ -65,6 +65,7 @@ sealed class AssetDisplayInfo(
     open val fiatValue: Money,
     open val actions: Set<StateAwareAction>,
     open val interestRate: Double,
+    open val stakingRate: Double,
     open val filter: AssetFilter
 ) {
     data class BrokerageDisplayInfo(
@@ -74,9 +75,10 @@ sealed class AssetDisplayInfo(
         override val fiatValue: Money,
         override val actions: Set<StateAwareAction>,
         override val interestRate: Double,
+        override val stakingRate: Double,
         override val filter: AssetFilter
     ) : AssetDisplayInfo(
-        account, amount, pendingAmount, fiatValue, actions, interestRate, filter
+        account, amount, pendingAmount, fiatValue, actions, interestRate, stakingRate, filter
     )
 
     data class DefiDisplayInfo(
@@ -86,7 +88,7 @@ sealed class AssetDisplayInfo(
         override val fiatValue: Money,
         override val actions: Set<StateAwareAction>,
     ) : AssetDisplayInfo(
-        account, amount, pendingAmount, fiatValue, actions, Double.NaN, AssetFilter.NonCustodial
+        account, amount, pendingAmount, fiatValue, actions, Double.NaN, Double.NaN, AssetFilter.NonCustodial
     )
 }
 

diff --git a/app/src/main/java/piuk/blockchain/android/ui/dashboard/coinview/CoinViewViewState.kt b/app/src/main/java/piuk/blockchain/android/ui/dashboard/coinview/CoinViewViewState.kt
@@ -76,7 +76,8 @@ sealed interface AssetDetailsItem {
         open val balance: Money,
         open val fiatBalance: Money,
         open val actions: Set<StateAwareAction>,
-        open val interestRate: Double
+        open val interestRate: Double,
+        open val stakingRate: Double
     ) : AssetDetailsItem
 
     /**
@@ -88,13 +89,15 @@ sealed interface AssetDetailsItem {
         override val balance: Money,
         override val fiatBalance: Money,
         override val actions: Set<StateAwareAction>,
-        override val interestRate: Double = Double.NaN
+        override val interestRate: Double = Double.NaN,
+        override val stakingRate: Double = Double.NaN
     ) : CryptoDetailsInfo(
         account = account,
         balance = balance,
         fiatBalance = fiatBalance,
         actions = actions,
-        interestRate = interestRate
+        interestRate = interestRate,
+        stakingRate = stakingRate
     )
 
     /**
@@ -110,7 +113,8 @@ sealed interface AssetDetailsItem {
         balance = balance,
         fiatBalance = fiatBalance,
         actions = actions,
-        interestRate = Double.NaN
+        interestRate = Double.NaN,
+        stakingRate = Double.NaN
     )
 
     data class CentralCta(