Merge pull request #217 from sora-xor/sca-133

Sca-133
sora-xor · Oct 8, 2023 · 481403c · 481403c
2 parents e31a434 + 643fa3e
commit 481403c
Show file tree

Hide file tree

Showing 18 changed files with 369 additions and 200 deletions.
diff --git a/build.gradle b/build.gradle
@@ -44,7 +44,7 @@ buildscript {
             composeCompiler        : '1.5.3',
             composeConstraintLayout: '1.1.0-alpha05',
             uiCore                 : '0.2.7',
-            soraCard               : '0.1.51',
+            soraCard               : '0.1.54',
             lazySodium             : '5.0.2',
             jna                    : '5.8.0',
             accompanist            : '0.30.1',

diff --git a/common/src/main/java/jp/co/soramitsu/common/domain/Fiat.kt b/common/src/main/java/jp/co/soramitsu/common/domain/Fiat.kt
@@ -33,6 +33,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 package jp.co.soramitsu.common.domain
 
 import java.math.BigDecimal
+import jp.co.soramitsu.common.domain.OptionsProvider.nbspace
 import jp.co.soramitsu.common.util.NumbersFormatter
 
 fun formatFiatAmount(
@@ -43,7 +44,7 @@ fun formatFiatAmount(
 ) = "$currencySymbol%s".format(nf.format(value, 2, checkFraction))
 
 fun formatFiatChange(value: Double, nf: NumbersFormatter) =
-    String.format("%s%s %%", if (value >= 0.0001) "+" else "", nf.format(value * 100, 2)).trim()
+    String.format("%s%s$nbspace%%", if (value >= 0.0001) "+" else "", nf.format(value * 100, 2)).trim()
 
 fun List<Asset>.fiatSum(): Double =
     if (isNotEmpty()) map { it.fiat ?: 0.0 }.reduce { acc, d -> acc + d } else 0.0

diff --git a/common/src/test/java/jp/co/soramitsu/common/domain/FiatTest.kt b/common/src/test/java/jp/co/soramitsu/common/domain/FiatTest.kt
@@ -56,24 +56,24 @@ class FiatTest {
     @Test
     fun test001() {
         val f = formatFiatChange(12.2394, nf)
-        assertEquals("+1${nbspace}223.94 %", f)
+        assertEquals("+1${nbspace}223.94${nbspace}%", f)
     }
 
     @Test
     fun test002() {
         val f = formatFiatChange(0.0004, nf)
-        assertEquals("+0.04 %", f)
+        assertEquals("+0.04${nbspace}%", f)
     }
 
     @Test
     fun test003() {
         val f = formatFiatChange(0.0001, nf)
-        assertEquals("+0.01 %", f)
+        assertEquals("+0.01${nbspace}%", f)
     }
 
     @Test
     fun test004() {
         val f = formatFiatChange(0.0000999999, nf)
-        assertEquals("0 %", f)
+        assertEquals("0${nbspace}%", f)
     }
 }
diff --git a/...let/src/main/java/jp/co/soramitsu/common_wallet/presentation/compose/BasicPoolListItem.kt b/...let/src/main/java/jp/co/soramitsu/common_wallet/presentation/compose/BasicPoolListItem.kt
@@ -47,12 +47,15 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import androidx.constraintlayout.compose.ConstraintLayout
 import jp.co.soramitsu.common.R
@@ -128,26 +131,28 @@ fun BasicPoolListItem(
             style = MaterialTheme.customTypography.textXSBold,
             color = MaterialTheme.customColors.fgSecondary,
         )
-        ConstraintLayout(
-            modifier = Modifier.wrapContentSize()
-        ) {
-            val (token1, token2) = createRefs()
-            TokenIcon(
-                modifier = Modifier.constrainAs(token1) {
-                    top.linkTo(parent.top)
-                    start.linkTo(parent.start)
-                },
-                uri = state.token1Icon,
-                size = Size.Small,
-            )
-            TokenIcon(
-                modifier = Modifier.constrainAs(token2) {
-                    top.linkTo(parent.top)
-                    start.linkTo(token1.start, margin = 24.dp)
-                },
-                uri = state.token2Icon,
-                size = Size.Small,
-            )
+        CompositionLocalProvider(LocalLayoutDirection provides LayoutDirection.Ltr) {
+            ConstraintLayout(
+                modifier = Modifier.wrapContentSize()
+            ) {
+                val (token1, token2) = createRefs()
+                TokenIcon(
+                    modifier = Modifier.constrainAs(token1) {
+                        top.linkTo(parent.top)
+                        start.linkTo(parent.start)
+                    },
+                    uri = state.token1Icon,
+                    size = Size.Small,
+                )
+                TokenIcon(
+                    modifier = Modifier.constrainAs(token2) {
+                        top.linkTo(parent.top)
+                        start.linkTo(token1.start, margin = 24.dp)
+                    },
+                    uri = state.token2Icon,
+                    size = Size.Small,
+                )
+            }
         }
         Column(
             modifier = Modifier

diff --git a/...llet/src/main/java/jp/co/soramitsu/common_wallet/presentation/compose/states/CardState.kt b/...llet/src/main/java/jp/co/soramitsu/common_wallet/presentation/compose/states/CardState.kt
@@ -51,7 +51,9 @@ data class CardsState(
     val cards: List<CardState> = emptyList(),
 )
 
-sealed interface CardState
+sealed class CardState(
+    open val loading: Boolean,
+)
 
 sealed interface AssetCardState
 
@@ -62,7 +64,8 @@ data class TitledAmountCardState(
     val collapsedState: Boolean = false,
     val onCollapseClick: () -> Unit,
     val onExpandClick: (() -> Unit)? = null,
-) : CardState
+    override val loading: Boolean,
+) : CardState(loading)
 
 class FavoriteAssetsCardState(
     val assets: List<AssetItemCardState>
@@ -118,18 +121,22 @@ fun mapAssetsToCardState(
 }
 
 data class SoraCardState(
-    val balance: String?,
+    val success: Boolean,
+    val ibanBalance: String?,
     val kycStatus: String?,
     val visible: Boolean = false,
-) : CardState
+    override val loading: Boolean,
+) : CardState(loading)
 
 data class BuyXorState(
     val visible: Boolean = false,
-) : CardState
+    override val loading: Boolean,
+) : CardState(loading)
 
 data class ReferralState(
     val visible: Boolean = false,
-) : CardState
+    override val loading: Boolean,
+) : CardState(loading)
 
 class FavoritePoolsCardState(
     val state: PoolsListState,

diff --git a/...card_api/src/main/java/jp/co/soramitsu/feature_sora_card_api/domain/SoraCardInteractor.kt b/...card_api/src/main/java/jp/co/soramitsu/feature_sora_card_api/domain/SoraCardInteractor.kt
@@ -51,5 +51,7 @@ interface SoraCardInteractor {
 
     suspend fun fetchIbanBalance(): Result<String>
 
+    suspend fun fetchApplicationFee(): String
+
     suspend fun logOutFromSoraCard()
 }
diff --git a/...d_impl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/domain/SoraCardClientProxy.kt b/...d_impl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/domain/SoraCardClientProxy.kt
@@ -56,6 +56,8 @@ internal class SoraCardClientProxy @Inject constructor(
 
     suspend fun getKycStatus() = clientsFacade.getKycStatus()
 
+    suspend fun getApplicationFee() = clientsFacade.getApplicationFee()
+
     suspend fun getIBAN() = clientsFacade.getIBAN()
 
     suspend fun logout() = clientsFacade.logout()

diff --git a/...mpl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/domain/SoraCardInteractorImpl.kt b/...mpl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/domain/SoraCardInteractorImpl.kt
@@ -179,6 +179,8 @@ internal class SoraCardInteractorImpl @Inject constructor(
             "%s%.2f".format(euroSign, euroValue)
         }
 
+    override suspend fun fetchApplicationFee(): String = soraCardClientProxy.getApplicationFee()
+
     override suspend fun logOutFromSoraCard() {
         soraCardClientProxy.logout()
         setLogout()

diff --git a/.../src/main/java/jp/co/soramitsu/feature_sora_card_impl/presentation/GetSoraCardFragment.kt b/.../src/main/java/jp/co/soramitsu/feature_sora_card_impl/presentation/GetSoraCardFragment.kt
@@ -37,6 +37,7 @@ import android.view.View
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.ScrollState
 import androidx.fragment.app.viewModels
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.composable
@@ -84,9 +85,10 @@ class GetSoraCardFragment : SoraBaseFragment<GetSoraCardViewModel>() {
         composable(
             route = theOnlyRoute,
         ) {
+            val state = viewModel.state.collectAsStateWithLifecycle().value
             GetSoraCardScreen(
                 scrollState = scrollState,
-                state = viewModel.state.value,
+                state = state,
                 viewModel::onSeeBlacklist,
                 viewModel::onEnableCard,
             )

diff --git a/...pl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/presentation/GetSoraCardScreen.kt b/...pl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/presentation/GetSoraCardScreen.kt
@@ -107,7 +107,7 @@ fun GetSoraCardScreen(
 
                 AnnualFee()
 
-                FreeCardIssuance()
+                FreeCardIssuance(state.applicationFee)
 
                 Text(
                     modifier = Modifier
@@ -130,7 +130,6 @@ fun GetSoraCardScreen(
                     ),
                     color = MaterialTheme.customColors.statusError,
                 )
-
                 FilledButton(
                     modifier = Modifier
                         .fillMaxWidth()
@@ -169,7 +168,9 @@ private fun AnnualFee() {
 }
 
 @Composable
-private fun FreeCardIssuance() {
+private fun FreeCardIssuance(
+    applicationFee: String,
+) {
     ContentCard(
         modifier = Modifier
             .fillMaxWidth()
@@ -203,7 +204,7 @@ private fun FreeCardIssuance() {
                     .fillMaxWidth()
                     .wrapContentHeight()
                     .padding(vertical = Dimens.x2),
-                text = stringResource(R.string.sora_card_free_card_issuance_conditions_euro),
+                text = stringResource(jp.co.soramitsu.oauth.R.string.details_free_card_issuance_conditions_euro, applicationFee),
                 style = MaterialTheme.customTypography.paragraphM,
                 color = MaterialTheme.customColors.fgSecondary,
             )
@@ -216,7 +217,7 @@ private fun FreeCardIssuance() {
 private fun PreviewGetSoraCardScreen() {
     GetSoraCardScreen(
         scrollState = rememberScrollState(),
-        state = GetSoraCardState(),
+        state = GetSoraCardState(applicationFee = "29"),
         {}, {},
     )
 }
diff --git a/...mpl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/presentation/GetSoraCardState.kt b/...mpl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/presentation/GetSoraCardState.kt
@@ -35,4 +35,5 @@ package jp.co.soramitsu.feature_sora_card_impl.presentation
 data class GetSoraCardState(
     val xorRatioAvailable: Boolean = false,
     val connection: Boolean = false,
+    val applicationFee: String,
 )
diff --git a/...src/main/java/jp/co/soramitsu/feature_sora_card_impl/presentation/GetSoraCardViewModel.kt b/...src/main/java/jp/co/soramitsu/feature_sora_card_impl/presentation/GetSoraCardViewModel.kt
@@ -32,7 +32,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package jp.co.soramitsu.feature_sora_card_impl.presentation
 
-import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.viewModelScope
 import dagger.assisted.Assisted
@@ -55,7 +54,10 @@ import jp.co.soramitsu.oauth.base.sdk.contract.SoraCardContractData
 import jp.co.soramitsu.oauth.base.sdk.contract.SoraCardResult
 import jp.co.soramitsu.sora.substrate.runtime.SubstrateOptionsProvider
 import jp.co.soramitsu.sora.substrate.substrate.ConnectionManager
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 
@@ -84,33 +86,40 @@ class GetSoraCardViewModel @AssistedInject constructor(
     private val _launchSoraCardRegistration = SingleLiveEvent<SoraCardContractData>()
     val launchSoraCardRegistration: LiveData<SoraCardContractData> = _launchSoraCardRegistration
 
-    var state = mutableStateOf(GetSoraCardState())
-        private set
+    private val _state = MutableStateFlow(GetSoraCardState(applicationFee = "."))
+    val state = _state.asStateFlow()
+
+    private var applicationFeeCache: String? = null
 
     init {
         _toolbarState.value = initSmallTitle2(
             title = R.string.get_sora_card_title,
         )
 
         soraCardInteractor.subscribeToSoraCardAvailabilityFlow()
-            .onEach {
+            .combine(connectionManager.connectionState) { f1, f2 ->
+                f1 to f2
+            }
+            .catch { onError(it) }
+            .onEach { (info, connection) ->
                 currentSoraCardContractData = createSoraCardContract(
-                    userAvailableXorAmount = it.xorBalance.toDouble(),
-                    isEnoughXorAvailable = it.enoughXor,
+                    userAvailableXorAmount = info.xorBalance.toDouble(),
+                    isEnoughXorAvailable = info.enoughXor,
                 )
-                state.value = state.value.copy(
-                    xorRatioAvailable = it.xorRatioAvailable,
+                _state.value = _state.value.copy(
+                    connection = connection,
+                    applicationFee = fetchApplicationFee(),
+                    xorRatioAvailable = info.xorRatioAvailable,
                 )
-            }.launchIn(viewModelScope)
-
-        connectionManager.connectionState
-            .catch { onError(it) }
-            .onEach {
-                state.value = state.value.copy(connection = it)
             }
             .launchIn(viewModelScope)
     }
 
+    private suspend fun fetchApplicationFee(): String =
+        applicationFeeCache ?: soraCardInteractor.fetchApplicationFee().also {
+            applicationFeeCache = it
+        }
+
     fun handleSoraCardResult(soraCardResult: SoraCardResult) {
         when (soraCardResult) {
             is SoraCardResult.NavigateTo -> {
@@ -120,12 +129,15 @@ class GetSoraCardViewModel @AssistedInject constructor(
                     OutwardsScreen.BUY -> assetsRouter.showBuyCrypto()
                 }
             }
+
             is SoraCardResult.Success -> {
                 soraCardInteractor.setStatus(soraCardResult.status)
             }
+
             is SoraCardResult.Failure -> {
                 soraCardInteractor.setStatus(soraCardResult.status)
             }
+
             is SoraCardResult.Canceled -> {}
             is SoraCardResult.Logout -> {
                 soraCardInteractor.setLogout()