SN-2813: ui lib version upgrade

build.gradle

@@ -44,7 +44,7 @@ buildscript {
             composeMaterial        : '1.4.3',
             composeCompiler        : '1.4.6',
             composeConstraintLayout: '1.1.0-alpha05',
-            uiCore                 : '0.1.2',
+            uiCore                 : '0.1.3',
             soraCard               : '0.1.40',
             lazySodium             : '5.0.2',
             jna                    : '5.8.0',

common/src/main/java/jp/co/soramitsu/common/domain/AssetAmountInputState.kt

@@ -37,11 +37,10 @@ import java.math.BigDecimal
 data class AssetAmountInputState(
     val token: Token,
     val balance: String,
-    val amount: BigDecimal,
-    val initialAmount: BigDecimal? = null,
+    val amount: BigDecimal? = null,
     val amountFiat: String,
     val enabled: Boolean,
     val readOnly: Boolean = false,
     val error: Boolean = false,
-    val errorHint: String = "",
+    val errorHint: String = ""
 )

common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/AssetAmount.kt

@@ -68,9 +68,11 @@ 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.util.ext.orZero
 import jp.co.soramitsu.common.util.ext.testTagAsId
 import jp.co.soramitsu.ui_core.component.button.properties.Size
 import jp.co.soramitsu.ui_core.component.input.number.BasicNumberInput
+import jp.co.soramitsu.ui_core.component.input.number.DefaultCursorPosition
 import jp.co.soramitsu.ui_core.resources.Dimens
 import jp.co.soramitsu.ui_core.theme.borderRadius
 import jp.co.soramitsu.ui_core.theme.customColors
@@ -157,7 +159,8 @@ fun AssetAmountInput(
                     textStyle = MaterialTheme.customTypography.displayS.copy(textAlign = TextAlign.End),
                     enabled = state?.let { it.enabled && !it.readOnly } ?: false,
                     precision = state?.token?.precision ?: OptionsProvider.defaultScale,
-                    initial = state?.initialAmount,
+                    defaultCursorPosition = DefaultCursorPosition.START,
+                    initial = state?.amount,
                     onValueChanged = onAmountChange,
                     focusRequester = focusRequester,
                     textFieldColors = TextFieldDefaults.textFieldColors(
@@ -215,8 +218,7 @@ val previewAssetAmountInputState = AssetAmountInputState(
     token = previewToken,
     balance = "10.234 ($2.234.23)",
     amountFiat = "$2.342.12",
-    amount = BigDecimal.ZERO,
-    initialAmount = null,
+    amount = null,
     enabled = true,
     error = false,
     errorHint = "",
@@ -237,7 +239,6 @@ private fun PreviewAssetAmountInput() {
         Button(onClick = {
             state.value = state.value.copy(
                 amount = bb.value,
-                initialAmount = bb.value,
             )
             bb.value = bb.value.plus(BigDecimal.ONE)
         }) {
@@ -255,7 +256,7 @@ private fun PreviewAssetAmountInput() {
             onFocusChange = {},
         )
         Spacer(modifier = Modifier.size(10.dp))
-        Text(text = state.value.amount.toPlainString())
+        Text(text = state.value.amount.orZero().toPlainString())
         AssetAmountInput(
             modifier = Modifier,
             state = previewAssetAmountInputState,

common_wallet/src/main/java/jp/co/soramitsu/common_wallet/presentation/compose/util/PolkaswapFormulas.kt

@@ -125,10 +125,9 @@ object PolkaswapFormulas {
         amount: BigDecimal,
         percentage: Double,
         precision: Int,
-    ): BigDecimal {
-        return if (percentage == 100.0) amount else amount.safeDivide(Big100, precision)
-            .multiply(percentage.toBigDecimal())
-    }
+    ): BigDecimal = if (percentage == 100.0) amount else
+        amount.multiply(percentage.toBigDecimal())
+            .safeDivide(Big100, precision)
 
     fun calculateOneAmountFromAnother(
         amount: BigDecimal,

feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/receiverequest/QRCodeFlowViewModel.kt

@@ -163,10 +163,9 @@ class QRCodeFlowViewModel @Inject constructor(
                         nf = numbersFormatter,
                         precision = DEFAULT_TOKEN_PRINT_PRECISION,
                     ),
-                    amount = BigDecimal.ZERO,
-                    initialAmount = null,
+                    amount = null,
                     amountFiat = "",
-                    enabled = false,
+                    enabled = true,
                 ) else _requestTokenScreenState.value.assetAmountInputState!!.copy(
                     token = assetInUse.token,
                     balance = getAssetBalanceText(
@@ -381,7 +380,7 @@ class QRCodeFlowViewModel @Inject constructor(
                 _requestTokenScreenState.value.assetAmountInputState?.let { assetAmountInputState ->
                     _requestTokenScreenState.value = _requestTokenScreenState.value.copy(
                         assetAmountInputState = assetAmountInputState.copy(
-                            initialAmount = assetAmountInputState.amount,
+                            amount = assetAmountInputState.amount,
                         )
                     )
                 }
@@ -417,7 +416,7 @@ class QRCodeFlowViewModel @Inject constructor(
                         .untransformedUserAddress,
                     assetAmountInputState = _requestTokenScreenState.value
                         .assetAmountInputState?.copy(
-                            initialAmount = _requestTokenScreenState.value
+                            amount = _requestTokenScreenState.value
                                 .assetAmountInputState?.amount,
                             enabled = false,
                             readOnly = true,

feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/send/TransferAmountViewModel.kt

@@ -162,12 +162,11 @@ class TransferAmountViewModel @AssistedInject constructor(
                     input = AssetAmountInputState(
                         token = asset.token,
                         balance = getAssetBalanceText(asset),
-                        amount = initialSendAmount?.toBigDecimalOrNull() ?: BigDecimal.ZERO,
-                        initialAmount = initialSendAmount?.toBigDecimalOrNull(),
+                        amount = initialSendAmount?.toBigDecimalOrNull(),
                         amountFiat = "",
                         enabled = false,
                         error = false,
-                        errorHint = "",
+                        errorHint = ""
                     )
                 )
             } else {
@@ -178,7 +177,7 @@ class TransferAmountViewModel @AssistedInject constructor(
                         amountFiat = asset.token.printFiat(
                             _sendState.value.input?.amount.orZero(),
                             numbersFormatter
-                        ),
+                        )
                     )
                 )
             }
@@ -230,7 +229,7 @@ class TransferAmountViewModel @AssistedInject constructor(
                     _sendState.value = _sendState.value.copy(
                         input = _sendState.value.input?.copy(
                             readOnly = false,
-                            initialAmount = _sendState.value.input?.amount?.nullZero()
+                            amount = _sendState.value.input?.amount?.nullZero()
                         ),
                     )
                 }
@@ -393,7 +392,7 @@ class TransferAmountViewModel @AssistedInject constructor(
     fun onReviewClick() {
         _sendState.value = _sendState.value.copy(
             input = _sendState.value.input?.copy(
-                initialAmount = _sendState.value.input?.amount.orZero()
+                amount = _sendState.value.input?.amount.orZero()
             )
         )
     }
@@ -425,7 +424,6 @@ class TransferAmountViewModel @AssistedInject constructor(
         _sendState.value = _sendState.value.copy(
             input = _sendState.value.input?.copy(
                 amount = amount,
-                initialAmount = amount,
                 amountFiat = _sendState.value.input?.token?.printFiat(
                     amount,
                     numbersFormatter

feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/presentation/qr/QrCodeFlowViewModelTest.kt

@@ -186,7 +186,7 @@ class QrCodeFlowViewModelTest {
 
             Assert.assertEquals(
                 viewModel.requestTokenScreenState.value.assetAmountInputState?.amount,
-                viewModel.requestTokenConfirmScreenState.value.assetAmountInputState?.initialAmount
+                viewModel.requestTokenConfirmScreenState.value.assetAmountInputState?.amount
             )
         }
 

feature_blockexplorer_api/src/main/java/jp/co/soramitsu/feature_blockexplorer_api/data/BlockExplorerManager.kt

@@ -40,6 +40,7 @@ import javax.inject.Singleton
 import jp.co.soramitsu.common.config.BuildConfigWrapper
 import jp.co.soramitsu.common.domain.AppStateProvider
 import jp.co.soramitsu.common.domain.fiatChange
+import jp.co.soramitsu.common.logger.FirebaseWrapper
 import jp.co.soramitsu.core_db.AppDatabase
 import jp.co.soramitsu.core_db.model.FiatTokenPriceLocal
 import jp.co.soramitsu.core_db.model.ReferralLocal
@@ -72,7 +73,7 @@ class BlockExplorerManager @Inject constructor(
             assetsInfo = it
         }
 
-    private suspend fun getAssetsInfoInternal(tokenIds: List<String>): List<Pair<String, BigInteger>> {
+    private suspend fun getAssetsInfoInternal(tokenIds: List<String>): List<Pair<String, BigInteger>> = runCatching {
         val selected = soraConfigManager.getSelectedCurrency()
         val tokens = db.assetDao().getFiatTokenPriceLocal(selected.code)
         val yesterdayHour = yesterday()
@@ -87,7 +88,10 @@ class BlockExplorerManager @Inject constructor(
             resultList.add(assetInfo.tokenId to BigInteger(assetInfo.liquidity))
         }
         db.assetDao().insertFiatPrice(fiats)
-        return resultList
+        resultList
+    }.getOrElse {
+        FirebaseWrapper.recordException(it)
+        emptyList()
     }
 
     suspend fun updatePoolsSbApy() {
@@ -113,6 +117,9 @@ class BlockExplorerManager @Inject constructor(
                     db.referralsDao().insertReferrals(it)
                 }
             }
+            .onFailure {
+                FirebaseWrapper.recordException(it)
+            }
     }
 
     suspend fun getXorPerEurRatio(): Double? = runCatching {