Merge pull request #422 from sora-xor/mwr-824

mwr-824
sora-xor · Jun 27, 2024 · f3e529c · f3e529c
2 parents de7c6e0 + b4b885c
commit f3e529c
Show file tree

Hide file tree

Showing 30 changed files with 260 additions and 251 deletions.
diff --git a/common/src/main/java/jp/co/soramitsu/common/domain/Asset.kt b/common/src/main/java/jp/co/soramitsu/common/domain/Asset.kt
@@ -34,9 +34,9 @@ package jp.co.soramitsu.common.domain
 
 import android.os.Parcelable
 import java.math.BigDecimal
+import jp.co.soramitsu.androidfoundation.format.equalTo
 import jp.co.soramitsu.common.R
 import jp.co.soramitsu.common.util.NumbersFormatter
-import jp.co.soramitsu.common.util.ext.equalTo
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 

diff --git a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/AssetAmount.kt b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/AssetAmount.kt
@@ -65,12 +65,12 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import java.math.BigDecimal
+import jp.co.soramitsu.androidfoundation.format.orZero
 import jp.co.soramitsu.common.R
 import jp.co.soramitsu.common.domain.AssetAmountInputState
 import jp.co.soramitsu.common.domain.OptionsProvider
 import jp.co.soramitsu.common.presentation.compose.TokenIcon
 import jp.co.soramitsu.common.presentation.compose.theme.SoraAppTheme
-import jp.co.soramitsu.common.util.ext.orZero
 import jp.co.soramitsu.common.util.testTagAsId
 import jp.co.soramitsu.ui_core.component.button.properties.Size
 import jp.co.soramitsu.ui_core.component.input.number.BasicNumberInput

diff --git a/common/src/main/java/jp/co/soramitsu/common/util/ext/BigDecimalExt.kt b/common/src/main/java/jp/co/soramitsu/common/util/ext/BigDecimalExt.kt
diff --git a/...rc/main/java/jp/co/soramitsu/common_wallet/presentation/compose/util/PolkaswapFormulas.kt b/...rc/main/java/jp/co/soramitsu/common_wallet/presentation/compose/util/PolkaswapFormulas.kt
@@ -33,11 +33,11 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 package jp.co.soramitsu.common_wallet.presentation.compose.util
 
 import java.math.BigDecimal
+import jp.co.soramitsu.androidfoundation.format.Big100
+import jp.co.soramitsu.androidfoundation.format.divideBy
+import jp.co.soramitsu.androidfoundation.format.equalTo
+import jp.co.soramitsu.androidfoundation.format.safeDivide
 import jp.co.soramitsu.common.domain.OptionsProvider
-import jp.co.soramitsu.common.util.ext.Big100
-import jp.co.soramitsu.common.util.ext.divideBy
-import jp.co.soramitsu.common.util.ext.equalTo
-import jp.co.soramitsu.common.util.ext.safeDivide
 import jp.co.soramitsu.common_wallet.domain.model.WithDesired
 
 object PolkaswapFormulas {

diff --git a/..._wallet/src/test/java/jp/co/soramitsu/common_wallet/presentation/PolkaswapFormulasTest.kt b/..._wallet/src/test/java/jp/co/soramitsu/common_wallet/presentation/PolkaswapFormulasTest.kt
@@ -33,10 +33,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 package jp.co.soramitsu.common_wallet.presentation
 
 import java.math.BigDecimal
-import jp.co.soramitsu.common.util.ext.Big100
-import jp.co.soramitsu.common.util.ext.divideBy
-import jp.co.soramitsu.common.util.ext.equalTo
-import jp.co.soramitsu.common.util.ext.safeDivide
+import jp.co.soramitsu.androidfoundation.format.Big100
+import jp.co.soramitsu.androidfoundation.format.divideBy
+import jp.co.soramitsu.androidfoundation.format.equalTo
+import jp.co.soramitsu.androidfoundation.format.safeDivide
 import jp.co.soramitsu.common_wallet.domain.model.WithDesired
 import jp.co.soramitsu.common_wallet.presentation.compose.util.PolkaswapFormulas
 import org.junit.Assert.assertEquals

diff --git a/demeter/src/main/java/jp/co/soramitsu/demeter/data/DemeterFarmingRepository.kt b/demeter/src/main/java/jp/co/soramitsu/demeter/data/DemeterFarmingRepository.kt
@@ -35,9 +35,9 @@ package jp.co.soramitsu.demeter.data
 import java.math.BigDecimal
 import java.math.BigInteger
 import java.util.concurrent.ConcurrentHashMap
+import jp.co.soramitsu.androidfoundation.format.isZero
 import jp.co.soramitsu.androidfoundation.format.safeCast
 import jp.co.soramitsu.common.domain.OptionsProvider
-import jp.co.soramitsu.common.util.ext.isZero
 import jp.co.soramitsu.common.util.mapBalance
 import jp.co.soramitsu.common_wallet.data.AssetLocalToAssetMapper
 import jp.co.soramitsu.core_db.AppDatabase

diff --git a/feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/data/AssetsRepository.kt b/feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/data/AssetsRepository.kt
@@ -33,6 +33,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 package jp.co.soramitsu.feature_assets_api.data
 
 import java.math.BigDecimal
+import java.math.BigInteger
 import jp.co.soramitsu.common.account.SoraAccount
 import jp.co.soramitsu.common.domain.Asset
 import jp.co.soramitsu.common.domain.Token
@@ -121,4 +122,6 @@ interface AssetsRepository {
     suspend fun updateBalancesVisibleAssets(address: String)
 
     suspend fun updateWhitelistBalances(address: String)
+
+    suspend fun fetchBalance(address: String, ids: List<String>): List<BigInteger>
 }
diff --git a/...re_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/domain/AssetsInteractor.kt b/...re_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/domain/AssetsInteractor.kt
@@ -35,6 +35,7 @@ package jp.co.soramitsu.feature_assets_api.domain
 import java.math.BigDecimal
 import jp.co.soramitsu.common.account.SoraAccount
 import jp.co.soramitsu.common.domain.Asset
+import jp.co.soramitsu.common.domain.OptionsProvider
 import jp.co.soramitsu.common.domain.Token
 import jp.co.soramitsu.common_wallet.data.XorAssetBalance
 import kotlinx.coroutines.flow.Flow
@@ -94,4 +95,10 @@ interface AssetsInteractor {
     suspend fun updateWhitelistBalances()
 
     suspend fun updateBalanceVisibleAssets()
+
+    suspend fun fetchBalance(
+        address: String,
+        ids: List<String>,
+        precision: Int = OptionsProvider.defaultScale,
+    ): List<BigDecimal>
 }
diff --git a/...ssets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/data/AssetsRepositoryImpl.kt b/...ssets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/data/AssetsRepositoryImpl.kt
@@ -432,6 +432,13 @@ class AssetsRepositoryImpl @Inject constructor(
         return balances to xorBalance
     }
 
+    override suspend fun fetchBalance(
+        address: String,
+        ids: List<String>,
+    ): List<BigInteger> {
+        return substrateCalls.fetchBalances(address, ids)
+    }
+
     private suspend fun checkDefaultNeed(address: String, code: String) {
         if (db.assetDao().getAssetsWhitelist(address, code)
                 .all { it.assetLocal == null }

diff --git a/...ets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/domain/AssetsInteractorImpl.kt b/...ets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/domain/AssetsInteractorImpl.kt
@@ -34,15 +34,16 @@ package jp.co.soramitsu.feature_assets_impl.domain
 
 import java.math.BigDecimal
 import java.util.Date
+import jp.co.soramitsu.androidfoundation.format.isZero
+import jp.co.soramitsu.androidfoundation.format.orZero
 import jp.co.soramitsu.common.account.SoraAccount
 import jp.co.soramitsu.common.domain.Asset
 import jp.co.soramitsu.common.domain.AssetHolder
 import jp.co.soramitsu.common.domain.CoroutineManager
 import jp.co.soramitsu.common.domain.Token
 import jp.co.soramitsu.common.util.BuildUtils
 import jp.co.soramitsu.common.util.Flavor
-import jp.co.soramitsu.common.util.ext.isZero
-import jp.co.soramitsu.common.util.ext.orZero
+import jp.co.soramitsu.common.util.mapBalance
 import jp.co.soramitsu.common_wallet.data.XorAssetBalance
 import jp.co.soramitsu.feature_account_api.domain.interfaces.CredentialsRepository
 import jp.co.soramitsu.feature_account_api.domain.interfaces.UserRepository
@@ -211,6 +212,16 @@ class AssetsInteractorImpl constructor(
         assetsRepository.updateBalancesVisibleAssets(soraAccount.substrateAddress)
     }
 
+    override suspend fun fetchBalance(
+        address: String,
+        ids: List<String>,
+        precision: Int,
+    ): List<BigDecimal> {
+        return assetsRepository.fetchBalance(address, ids).map {
+            mapBalance(it, precision)
+        }
+    }
+
     override suspend fun updateWhitelistBalances() {
         val soraAccount = userRepository.getCurSoraAccount()
         assetsRepository.updateWhitelistBalances(soraAccount.substrateAddress)

diff --git a/.../soramitsu/feature_assets_impl/presentation/screens/assetdetails/AssetDetailsViewModel.kt b/.../soramitsu/feature_assets_impl/presentation/screens/assetdetails/AssetDetailsViewModel.kt
@@ -41,6 +41,7 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import java.math.BigDecimal
+import jp.co.soramitsu.androidfoundation.format.isZero
 import jp.co.soramitsu.androidfoundation.fragment.SingleLiveEvent
 import jp.co.soramitsu.androidfoundation.fragment.trigger
 import jp.co.soramitsu.androidfoundation.phone.BasicClipboardManager
@@ -57,7 +58,6 @@ import jp.co.soramitsu.common.presentation.compose.components.initSmallTitle2
 import jp.co.soramitsu.common.presentation.viewmodel.BaseViewModel
 import jp.co.soramitsu.common.util.NumbersFormatter
 import jp.co.soramitsu.common.util.StringPair
-import jp.co.soramitsu.common.util.ext.isZero
 import jp.co.soramitsu.common_wallet.data.XorAssetBalance
 import jp.co.soramitsu.common_wallet.domain.model.fiatSymbol
 import jp.co.soramitsu.common_wallet.presentation.compose.states.mapPoolsData

diff --git a/.../jp/co/soramitsu/feature_assets_impl/presentation/screens/send/TransferAmountViewModel.kt b/.../jp/co/soramitsu/feature_assets_impl/presentation/screens/send/TransferAmountViewModel.kt
@@ -38,6 +38,9 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import java.math.BigDecimal
+import jp.co.soramitsu.androidfoundation.format.isZero
+import jp.co.soramitsu.androidfoundation.format.nullZero
+import jp.co.soramitsu.androidfoundation.format.orZero
 import jp.co.soramitsu.androidfoundation.fragment.SingleLiveEvent
 import jp.co.soramitsu.androidfoundation.fragment.trigger
 import jp.co.soramitsu.androidfoundation.phone.BasicClipboardManager
@@ -52,9 +55,6 @@ import jp.co.soramitsu.common.domain.subtractFee
 import jp.co.soramitsu.common.presentation.compose.components.initSmallTitle2
 import jp.co.soramitsu.common.presentation.viewmodel.BaseViewModel
 import jp.co.soramitsu.common.util.NumbersFormatter
-import jp.co.soramitsu.common.util.ext.isZero
-import jp.co.soramitsu.common.util.ext.nullZero
-import jp.co.soramitsu.common.util.ext.orZero
 import jp.co.soramitsu.common.view.ViewHelper
 import jp.co.soramitsu.common_wallet.presentation.compose.util.PolkaswapFormulas
 import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor

diff --git a/.../test/java/jp/co/soramitsu/feature_assets_impl/presentation/qr/QrCodeFlowViewModelTest.kt b/.../test/java/jp/co/soramitsu/feature_assets_impl/presentation/qr/QrCodeFlowViewModelTest.kt
@@ -44,6 +44,7 @@ import io.mockk.mockk
 import io.mockk.mockkStatic
 import io.mockk.verify
 import java.util.StringJoiner
+import jp.co.soramitsu.androidfoundation.format.Big100
 import jp.co.soramitsu.androidfoundation.phone.BasicClipboardManager
 import jp.co.soramitsu.androidfoundation.resource.ResourceManager
 import jp.co.soramitsu.common.account.AccountAvatarGenerator
@@ -53,7 +54,6 @@ import jp.co.soramitsu.common.domain.CoroutineManager
 import jp.co.soramitsu.common.io.FileManager
 import jp.co.soramitsu.common.util.NumbersFormatter
 import jp.co.soramitsu.common.util.QrCodeGenerator
-import jp.co.soramitsu.common.util.ext.Big100
 import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor
 import jp.co.soramitsu.feature_assets_api.domain.QrCodeInteractor
 import jp.co.soramitsu.feature_assets_impl.presentation.screens.receiverequest.QRCodeFlowViewModel

diff --git a/...java/jp/co/soramitsu/feature_assets_impl/presentation/send/TransferAmountViewModelTest.kt b/...java/jp/co/soramitsu/feature_assets_impl/presentation/send/TransferAmountViewModelTest.kt
@@ -40,12 +40,12 @@ import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.junit4.MockKRule
 import java.math.BigDecimal
+import jp.co.soramitsu.androidfoundation.format.equalTo
 import jp.co.soramitsu.androidfoundation.phone.BasicClipboardManager
 import jp.co.soramitsu.androidfoundation.resource.ResourceManager
 import jp.co.soramitsu.common.R
 import jp.co.soramitsu.common.account.AccountAvatarGenerator
 import jp.co.soramitsu.common.util.NumbersFormatter
-import jp.co.soramitsu.common.util.ext.equalTo
 import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor
 import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter
 import jp.co.soramitsu.feature_assets_impl.presentation.screens.send.TransferAmountViewModel

diff --git a/..._api/src/main/java/jp/co/soramitsu/feature_blockexplorer_api/data/BlockExplorerManager.kt b/..._api/src/main/java/jp/co/soramitsu/feature_blockexplorer_api/data/BlockExplorerManager.kt
@@ -37,12 +37,11 @@ import java.math.BigDecimal
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import javax.inject.Singleton
+import jp.co.soramitsu.androidfoundation.format.toDoubleInfinite
 import jp.co.soramitsu.common.config.BuildConfigWrapper
 import jp.co.soramitsu.common.domain.AppStateProvider
 import jp.co.soramitsu.common.domain.RetryStrategyBuilder
-import jp.co.soramitsu.common.domain.fiatChange
 import jp.co.soramitsu.common.logger.FirebaseWrapper
-import jp.co.soramitsu.common.util.ext.toDoubleInfinite
 import jp.co.soramitsu.common.util.mapBalance
 import jp.co.soramitsu.core_db.AppDatabase
 import jp.co.soramitsu.core_db.model.FiatTokenPriceLocal

diff --git a/...l/src/main/java/jp/co/soramitsu/feature_ecosystem_impl/domain/EcoSystemPoolsInteractor.kt b/...l/src/main/java/jp/co/soramitsu/feature_ecosystem_impl/domain/EcoSystemPoolsInteractor.kt
@@ -32,7 +32,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package jp.co.soramitsu.feature_ecosystem_impl.domain
 
-import jp.co.soramitsu.common.util.ext.compareNullDesc
+import jp.co.soramitsu.androidfoundation.format.compareNullDesc
 import jp.co.soramitsu.feature_polkaswap_api.domain.interfaces.PolkaswapRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map

diff --git a/.../src/main/java/jp/co/soramitsu/feature_ecosystem_impl/domain/EcoSystemTokensInteractor.kt b/.../src/main/java/jp/co/soramitsu/feature_ecosystem_impl/domain/EcoSystemTokensInteractor.kt
@@ -32,7 +32,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package jp.co.soramitsu.feature_ecosystem_impl.domain
 
-import jp.co.soramitsu.common.util.ext.compareNullDesc
+import jp.co.soramitsu.androidfoundation.format.compareNullDesc
 import jp.co.soramitsu.feature_assets_api.data.AssetsRepository
 import jp.co.soramitsu.feature_blockexplorer_api.data.BlockExplorerManager
 import kotlinx.coroutines.flow.Flow

diff --git a/...in/java/jp/co/soramitsu/feature_ecosystem_impl/presentation/editfarm/EditFarmViewModel.kt b/...in/java/jp/co/soramitsu/feature_ecosystem_impl/presentation/editfarm/EditFarmViewModel.kt
@@ -37,15 +37,15 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import java.math.BigDecimal
+import jp.co.soramitsu.androidfoundation.format.Big100
+import jp.co.soramitsu.androidfoundation.format.divideBy
 import jp.co.soramitsu.androidfoundation.resource.ResourceManager
 import jp.co.soramitsu.common.R
 import jp.co.soramitsu.common.domain.Asset
 import jp.co.soramitsu.common.presentation.viewmodel.BaseViewModel
 import jp.co.soramitsu.common.util.NumbersFormatter
 import jp.co.soramitsu.common.util.StringPair
 import jp.co.soramitsu.common.util.StringTriple
-import jp.co.soramitsu.common.util.ext.Big100
-import jp.co.soramitsu.common.util.ext.divideBy
 import jp.co.soramitsu.common_wallet.domain.model.CommonUserPoolData
 import jp.co.soramitsu.common_wallet.presentation.compose.util.PolkaswapFormulas
 import jp.co.soramitsu.demeter.domain.DemeterFarmingInteractor

diff --git a/...main/java/jp/co/soramitsu/feature_ecosystem_impl/presentation/explore/ExploreViewModel.kt b/...main/java/jp/co/soramitsu/feature_ecosystem_impl/presentation/explore/ExploreViewModel.kt
@@ -35,6 +35,7 @@ package jp.co.soramitsu.feature_ecosystem_impl.presentation.explore
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
+import jp.co.soramitsu.androidfoundation.format.compareNullDesc
 import jp.co.soramitsu.androidfoundation.format.formatFiatSuffix
 import jp.co.soramitsu.androidfoundation.resource.ResourceManager
 import jp.co.soramitsu.common.domain.iconUri
@@ -44,7 +45,6 @@ import jp.co.soramitsu.common.presentation.viewmodel.BaseViewModel
 import jp.co.soramitsu.common.util.NumbersFormatter
 import jp.co.soramitsu.common.util.StringPair
 import jp.co.soramitsu.common.util.StringTriple
-import jp.co.soramitsu.common.util.ext.compareNullDesc
 import jp.co.soramitsu.common_wallet.domain.model.isFilterMatch
 import jp.co.soramitsu.common_wallet.presentation.compose.BasicFarmListItemState
 import jp.co.soramitsu.common_wallet.presentation.compose.BasicPoolListItemState