From d2219e9a9604ec9cf7d6ed4b8f74459156386947 Mon Sep 17 00:00:00 2001 From: Konstantin Ivanov <54908981+konstantiniiv@users.noreply.github.com> Date: Thu, 22 May 2025 09:21:09 +0200 Subject: [PATCH] DROID-3656 Membership | Support new tiers (#2426) --- .../anytype/analytics/props/UserProperty.kt | 4 +- .../anytype/core_models/ext/MembershipExt.kt | 8 +- .../membership/MembershipConstants.kt | 6 +- .../res/drawable/logo_new_explorer_64.xml | 46 ++++++++++++ .../res/drawable/logo_new_explorer_96.xml | 46 ++++++++++++ core-ui/src/main/res/values-night/colors.xml | 3 + core-ui/src/main/res/values/colors.xml | 3 + .../anytype/payments/mapping/MembershipExt.kt | 6 +- .../payments/screens/TierPreviewView.kt | 39 ++++++++-- .../anytype/payments/screens/TierScreen.kt | 4 +- .../payments/viewmodel/MembershipViewModel.kt | 4 +- .../anytype/payments/CocreatorActiveTest.kt | 2 +- .../anytype/payments/MembershipTestsSetup.kt | 2 +- .../payments/MembershipViewModelTest.kt | 6 +- .../payments/TierActiveAndFreeTests.kt | 20 ++--- .../payments/TierActivePurchasedOniOSTests.kt | 2 +- .../TierActiveWithDifferentSubIdTest.kt | 10 +-- .../TierAndroidActivePurchasedOniOS.kt | 2 +- .../payments/TierAndroidActiveTests.kt | 2 +- .../TierAndroidBillingUnavailableTest.kt | 4 +- .../payments/TierAndroidNotActiveTests.kt | 4 +- .../TierBuilderFallbackOnExplorerTest.kt | 10 +-- .../payments/TierConditionInfoTests.kt | 74 +++++++++---------- .../multiplayer/SpaceJoinRequestViewModel.kt | 4 +- 24 files changed, 222 insertions(+), 89 deletions(-) create mode 100644 core-ui/src/main/res/drawable/logo_new_explorer_64.xml create mode 100644 core-ui/src/main/res/drawable/logo_new_explorer_96.xml diff --git a/analytics/src/main/java/com/anytypeio/anytype/analytics/props/UserProperty.kt b/analytics/src/main/java/com/anytypeio/anytype/analytics/props/UserProperty.kt index 348c6af763..351dfe22f1 100644 --- a/analytics/src/main/java/com/anytypeio/anytype/analytics/props/UserProperty.kt +++ b/analytics/src/main/java/com/anytypeio/anytype/analytics/props/UserProperty.kt @@ -7,7 +7,9 @@ sealed class UserProperty { val tier: String get() = when (tierId) { 0 -> "None" - 1 -> "Explorer" + 20 -> "Explorer" + 21 -> "Starter" + 22 -> "Pioneer" 4 -> "Builder" 5 -> "Co-Creator" else -> "Custom" diff --git a/core-models/src/main/java/com/anytypeio/anytype/core_models/ext/MembershipExt.kt b/core-models/src/main/java/com/anytypeio/anytype/core_models/ext/MembershipExt.kt index cd230bdde2..2662d7289e 100644 --- a/core-models/src/main/java/com/anytypeio/anytype/core_models/ext/MembershipExt.kt +++ b/core-models/src/main/java/com/anytypeio/anytype/core_models/ext/MembershipExt.kt @@ -20,7 +20,9 @@ fun TierId.isPossibleToUpgrade( fun TierId.isPossibleToUpgradeNumberOfSpaceMembers(): Boolean { return when (this.value) { MembershipConstants.NONE_ID -> true - MembershipConstants.EXPLORER_ID -> true + MembershipConstants.STARTER_ID -> true + MembershipConstants.PIONEER_ID -> true + MembershipConstants.NEW_EXPLORER_ID -> true MembershipConstants.BUILDER_ID -> false MembershipConstants.CO_CREATOR_ID -> false MembershipConstants.ANY_TEAM_ID -> false @@ -31,7 +33,9 @@ fun TierId.isPossibleToUpgradeNumberOfSpaceMembers(): Boolean { fun TierId.isPossibleToUpgradeStorageSpace(): Boolean { return when (this.value) { MembershipConstants.NONE_ID -> true - MembershipConstants.EXPLORER_ID -> true + MembershipConstants.STARTER_ID -> true + MembershipConstants.PIONEER_ID -> true + MembershipConstants.NEW_EXPLORER_ID -> true MembershipConstants.BUILDER_ID -> true MembershipConstants.CO_CREATOR_ID -> false MembershipConstants.ANY_TEAM_ID -> false diff --git a/core-models/src/main/java/com/anytypeio/anytype/core_models/membership/MembershipConstants.kt b/core-models/src/main/java/com/anytypeio/anytype/core_models/membership/MembershipConstants.kt index 8189733634..3d65089632 100644 --- a/core-models/src/main/java/com/anytypeio/anytype/core_models/membership/MembershipConstants.kt +++ b/core-models/src/main/java/com/anytypeio/anytype/core_models/membership/MembershipConstants.kt @@ -3,7 +3,9 @@ package com.anytypeio.anytype.core_models.membership object MembershipConstants { const val NONE_ID = 0 - const val EXPLORER_ID = 1 + const val STARTER_ID = 21 + const val PIONEER_ID = 22 + const val NEW_EXPLORER_ID = 20 const val BUILDER_ID = 4 const val CO_CREATOR_ID = 5 const val ANY_TEAM_ID = 7 @@ -13,7 +15,7 @@ object MembershipConstants { const val TERMS_OF_SERVICE = "https://anytype.io/terms_of_use" const val MEMBERSHIP_CONTACT_EMAIL = "membership-upgrade@anytype.io" - val ACTIVE_TIERS_WITH_BANNERS = listOf(NONE_ID, EXPLORER_ID) + val ACTIVE_TIERS_WITH_BANNERS = listOf(NONE_ID, STARTER_ID, PIONEER_ID) const val ERROR_PRODUCT_NOT_FOUND = "Product not found" const val ERROR_PRODUCT_PRICE = "Price of the product is not available" diff --git a/core-ui/src/main/res/drawable/logo_new_explorer_64.xml b/core-ui/src/main/res/drawable/logo_new_explorer_64.xml new file mode 100644 index 0000000000..a8cfbaa264 --- /dev/null +++ b/core-ui/src/main/res/drawable/logo_new_explorer_64.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core-ui/src/main/res/drawable/logo_new_explorer_96.xml b/core-ui/src/main/res/drawable/logo_new_explorer_96.xml new file mode 100644 index 0000000000..eb24deb3ba --- /dev/null +++ b/core-ui/src/main/res/drawable/logo_new_explorer_96.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core-ui/src/main/res/values-night/colors.xml b/core-ui/src/main/res/values-night/colors.xml index f319de1f87..b6c94854d0 100644 --- a/core-ui/src/main/res/values-night/colors.xml +++ b/core-ui/src/main/res/values-night/colors.xml @@ -129,6 +129,9 @@ #00000000 #E86DE3 + #00000000 + #FF91D3FF + #393835 #F2222222 diff --git a/core-ui/src/main/res/values/colors.xml b/core-ui/src/main/res/values/colors.xml index 8865aada97..6c90bd1246 100644 --- a/core-ui/src/main/res/values/colors.xml +++ b/core-ui/src/main/res/values/colors.xml @@ -173,6 +173,9 @@ #FBEAFF #E86DE3 + #1A0091D3 + #FF91D3FF + #CFF6CF #FEF2C6 #FFEBEB diff --git a/payments/src/main/java/com/anytypeio/anytype/payments/mapping/MembershipExt.kt b/payments/src/main/java/com/anytypeio/anytype/payments/mapping/MembershipExt.kt index 23664d9030..b053fb0a3e 100644 --- a/payments/src/main/java/com/anytypeio/anytype/payments/mapping/MembershipExt.kt +++ b/payments/src/main/java/com/anytypeio/anytype/payments/mapping/MembershipExt.kt @@ -184,10 +184,10 @@ private fun MembershipTierData.mapActiveTierButtonAndNameStates( val wasPurchasedOnAndroid = isActiveTierPurchasedOnAndroid(paymentMethod) if (!wasPurchasedOnAndroid) { return when { - id == MembershipConstants.EXPLORER_ID && userEmail.isBlank() -> { + id == MembershipConstants.STARTER_ID && userEmail.isBlank() -> { TierButton.Submit.Enabled to TierAnyName.Hidden } - id == MembershipConstants.EXPLORER_ID -> { + id == MembershipConstants.STARTER_ID -> { TierButton.ChangeEmail to TierAnyName.Hidden } paymentMethod == METHOD_NONE -> { @@ -448,7 +448,7 @@ private fun convertToTierViewPeriod(tier: MembershipTierData): TierPeriod { private fun MembershipTierData.getTierEmail(isActive: Boolean, membershipEmail: String): TierEmail { if (isActive) { - if (id == MembershipConstants.EXPLORER_ID && membershipEmail.isBlank()) { + if (id == MembershipConstants.STARTER_ID && membershipEmail.isBlank()) { return TierEmail.Visible.Enter } } diff --git a/payments/src/main/java/com/anytypeio/anytype/payments/screens/TierPreviewView.kt b/payments/src/main/java/com/anytypeio/anytype/payments/screens/TierPreviewView.kt index 8bd07f40b5..3e20c2609d 100644 --- a/payments/src/main/java/com/anytypeio/anytype/payments/screens/TierPreviewView.kt +++ b/payments/src/main/java/com/anytypeio/anytype/payments/screens/TierPreviewView.kt @@ -40,7 +40,9 @@ import com.anytypeio.anytype.core_ui.views.Relations3 import com.anytypeio.anytype.core_ui.views.fontInterSemibold import com.anytypeio.anytype.core_models.membership.MembershipConstants.BUILDER_ID import com.anytypeio.anytype.core_models.membership.MembershipConstants.CO_CREATOR_ID -import com.anytypeio.anytype.core_models.membership.MembershipConstants.EXPLORER_ID +import com.anytypeio.anytype.core_models.membership.MembershipConstants.NEW_EXPLORER_ID +import com.anytypeio.anytype.core_models.membership.MembershipConstants.STARTER_ID +import com.anytypeio.anytype.core_models.membership.MembershipConstants.PIONEER_ID import com.anytypeio.anytype.payments.models.TierPreview import com.anytypeio.anytype.payments.models.Tier import com.anytypeio.anytype.payments.models.TierConditionInfo @@ -157,12 +159,24 @@ fun mapTierToResources(tier: Tier): TierResources { colors = toValue(tier.color), features = tier.features, ) - EXPLORER_ID -> TierResources( + STARTER_ID -> TierResources( mediumIcon = R.drawable.logo_explorer_96, smallIcon = R.drawable.logo_explorer_64, colors = toValue(tier.color), features = tier.features, ) + PIONEER_ID -> TierResources( + mediumIcon = R.drawable.logo_custom_64, + smallIcon = R.drawable.logo_custom_64, + colors = toValue(tier.color), + features = tier.features, + ) + NEW_EXPLORER_ID -> TierResources( + mediumIcon = R.drawable.logo_new_explorer_96, + smallIcon = R.drawable.logo_new_explorer_64, + colors = toValue(tier.color), + features = tier.features, + ) else -> TierResources( smallIcon = R.drawable.logo_custom_64, mediumIcon = R.drawable.logo_custom_64, @@ -186,11 +200,21 @@ fun mapTierPreviewToResources(tier: TierPreview): TierResources { smallIcon = R.drawable.logo_co_creator_64, colors = toValue(tier.color) ) - EXPLORER_ID -> TierResources( + STARTER_ID -> TierResources( mediumIcon = R.drawable.logo_explorer_96, smallIcon = R.drawable.logo_explorer_64, colors = toValue(tier.color) ) + PIONEER_ID -> TierResources( + mediumIcon = R.drawable.logo_custom_64, + smallIcon = R.drawable.logo_custom_64, + colors = toValue(tier.color) + ) + NEW_EXPLORER_ID -> TierResources( + mediumIcon = R.drawable.logo_new_explorer_96, + smallIcon = R.drawable.logo_new_explorer_64, + colors = toValue(tier.color) + ) else -> TierResources( smallIcon = R.drawable.logo_custom_64, mediumIcon = R.drawable.logo_custom_64, @@ -213,6 +237,7 @@ fun String.gradientStart(): Color = when (this) { CoverColor.BLUE.code -> colorResource(id = R.color.tier_gradient_blue_start) CoverColor.GREEN.code -> colorResource(id = R.color.tier_gradient_teal_start) CoverColor.PURPLE.code -> colorResource(id = R.color.tier_gradient_purple_start) + CoverColor.ICE.code -> colorResource(id = R.color.tier_gradient_ice_start) else -> colorResource(id = R.color.tier_gradient_blue_start) } @@ -222,6 +247,7 @@ private fun String.gradientEnd(): Color = when (this) { CoverColor.BLUE.code -> colorResource(id = R.color.tier_gradient_blue_end) CoverColor.GREEN.code -> colorResource(id = R.color.tier_gradient_teal_end) CoverColor.PURPLE.code -> colorResource(id = R.color.tier_gradient_purple_end) + CoverColor.ICE.code -> colorResource(id = R.color.tier_gradient_ice_end) else -> colorResource(id = R.color.tier_gradient_blue_end) } @@ -252,11 +278,12 @@ data class TierColors( fun TierPreviewViewPreview() { TierPreviewView( tier = TierPreview( - id = TierId(BUILDER_ID), - title = "Builder", + id = TierId(NEW_EXPLORER_ID), + title = "Explorer", subtitle = "For those who want to build and create", conditionInfo = TierConditionInfo.Visible.Price("99.99", TierPeriod.Year(1)), - isActive = true + isActive = true, + color = "ice" ) ) {} } \ No newline at end of file diff --git a/payments/src/main/java/com/anytypeio/anytype/payments/screens/TierScreen.kt b/payments/src/main/java/com/anytypeio/anytype/payments/screens/TierScreen.kt index 4725bf4384..9b08c2952f 100644 --- a/payments/src/main/java/com/anytypeio/anytype/payments/screens/TierScreen.kt +++ b/payments/src/main/java/com/anytypeio/anytype/payments/screens/TierScreen.kt @@ -36,7 +36,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.withStyle import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.anytypeio.anytype.core_models.membership.MembershipConstants.EXPLORER_ID +import com.anytypeio.anytype.core_models.membership.MembershipConstants.STARTER_ID import com.anytypeio.anytype.core_models.membership.MembershipConstants.PRIVACY_POLICY import com.anytypeio.anytype.core_models.membership.MembershipConstants.TERMS_OF_SERVICE import com.anytypeio.anytype.core_models.membership.MembershipPaymentMethod @@ -466,7 +466,7 @@ fun TierViewScreenPreview() { payedBy = MembershipPaymentMethod.METHOD_INAPP_GOOGLE ), buttonState = TierButton.HiddenWithText.ManageOnIOS, - id = TierId(value = EXPLORER_ID), + id = TierId(value = STARTER_ID), membershipAnyName = TierAnyName.Visible.Purchased("someanyname111"), email = TierEmail.Visible.Enter, color = "teal", diff --git a/payments/src/main/java/com/anytypeio/anytype/payments/viewmodel/MembershipViewModel.kt b/payments/src/main/java/com/anytypeio/anytype/payments/viewmodel/MembershipViewModel.kt index f133b150b3..1490805ea7 100644 --- a/payments/src/main/java/com/anytypeio/anytype/payments/viewmodel/MembershipViewModel.kt +++ b/payments/src/main/java/com/anytypeio/anytype/payments/viewmodel/MembershipViewModel.kt @@ -11,7 +11,7 @@ import com.android.billingclient.api.ProductDetails import com.anytypeio.anytype.analytics.base.Analytics import com.anytypeio.anytype.analytics.base.EventsDictionary import com.anytypeio.anytype.core_models.membership.EmailVerificationStatus -import com.anytypeio.anytype.core_models.membership.MembershipConstants.EXPLORER_ID +import com.anytypeio.anytype.core_models.membership.MembershipConstants.STARTER_ID import com.anytypeio.anytype.core_models.membership.MembershipConstants.MEMBERSHIP_NAME_MIN_LENGTH import com.anytypeio.anytype.core_models.membership.MembershipConstants.NONE_ID import com.anytypeio.anytype.core_models.membership.MembershipErrors @@ -458,7 +458,7 @@ class MembershipViewModel( (tierState.value as? MembershipTierState.Visible)?.tier ?: return@fold when (status) { EmailVerificationStatus.STATUS_VERIFIED -> { - if (tierView.id.value == EXPLORER_ID) { + if (tierView.id.value == STARTER_ID) { anyEmailState.clearText() val updatedState = tierView.copy( email = TierEmail.Hidden, diff --git a/payments/src/test/java/com/anytypeio/anytype/payments/CocreatorActiveTest.kt b/payments/src/test/java/com/anytypeio/anytype/payments/CocreatorActiveTest.kt index e306be7ebc..cb05d33c88 100644 --- a/payments/src/test/java/com/anytypeio/anytype/payments/CocreatorActiveTest.kt +++ b/payments/src/test/java/com/anytypeio/anytype/payments/CocreatorActiveTest.kt @@ -38,7 +38,7 @@ class CocreatorActiveTest : MembershipTestsSetup() { private fun setupTierData(features: List): List { return listOf( StubMembershipTierData( - id = MembershipConstants.EXPLORER_ID, + id = MembershipConstants.STARTER_ID, androidProductId = null, features = features, periodType = MembershipPeriodType.PERIOD_TYPE_UNLIMITED, diff --git a/payments/src/test/java/com/anytypeio/anytype/payments/MembershipTestsSetup.kt b/payments/src/test/java/com/anytypeio/anytype/payments/MembershipTestsSetup.kt index c515dabd95..995f6aacb1 100644 --- a/payments/src/test/java/com/anytypeio/anytype/payments/MembershipTestsSetup.kt +++ b/payments/src/test/java/com/anytypeio/anytype/payments/MembershipTestsSetup.kt @@ -90,7 +90,7 @@ open class MembershipTestsSetup { protected val accountId = "accountId-${RandomString.make()}" fun membershipStatus(tiers: List) = MembershipStatus( - activeTier = TierId(MembershipConstants.EXPLORER_ID), + activeTier = TierId(MembershipConstants.STARTER_ID), status = Membership.Status.STATUS_ACTIVE, dateEnds = 1714199910, paymentMethod = MembershipPaymentMethod.METHOD_NONE, diff --git a/payments/src/test/java/com/anytypeio/anytype/payments/MembershipViewModelTest.kt b/payments/src/test/java/com/anytypeio/anytype/payments/MembershipViewModelTest.kt index 3132300012..65229d31ab 100644 --- a/payments/src/test/java/com/anytypeio/anytype/payments/MembershipViewModelTest.kt +++ b/payments/src/test/java/com/anytypeio/anytype/payments/MembershipViewModelTest.kt @@ -6,7 +6,7 @@ import com.anytypeio.anytype.core_models.membership.MembershipPaymentMethod import com.anytypeio.anytype.core_models.membership.MembershipConstants.ACTIVE_TIERS_WITH_BANNERS import com.anytypeio.anytype.core_models.membership.MembershipConstants.BUILDER_ID import com.anytypeio.anytype.core_models.membership.MembershipConstants.CO_CREATOR_ID -import com.anytypeio.anytype.core_models.membership.MembershipConstants.EXPLORER_ID +import com.anytypeio.anytype.core_models.membership.MembershipConstants.STARTER_ID import com.anytypeio.anytype.payments.viewmodel.MembershipMainState import com.anytypeio.anytype.payments.viewmodel.MembershipTierState import com.anytypeio.anytype.payments.viewmodel.MembershipEmailCodeState @@ -27,7 +27,7 @@ class MembershipViewModelTest : MembershipTestsSetup() { private val mTiers = listOf( StubMembershipTierData( - id = EXPLORER_ID, + id = STARTER_ID, ), StubMembershipTierData( id = BUILDER_ID, @@ -92,7 +92,7 @@ class MembershipViewModelTest : MembershipTestsSetup() { membershipStatus( listOf( StubMembershipTierData( - id = EXPLORER_ID, + id = STARTER_ID, ), StubMembershipTierData( id = BUILDER_ID, diff --git a/payments/src/test/java/com/anytypeio/anytype/payments/TierActiveAndFreeTests.kt b/payments/src/test/java/com/anytypeio/anytype/payments/TierActiveAndFreeTests.kt index 398e6cee7e..4c2e5d6c48 100644 --- a/payments/src/test/java/com/anytypeio/anytype/payments/TierActiveAndFreeTests.kt +++ b/payments/src/test/java/com/anytypeio/anytype/payments/TierActiveAndFreeTests.kt @@ -39,7 +39,7 @@ class TierActiveAndFreeTests : MembershipTestsSetup() { private fun setupTierData(features: List): List { return listOf( StubMembershipTierData( - id = MembershipConstants.EXPLORER_ID, + id = MembershipConstants.STARTER_ID, androidProductId = null, features = features, periodType = MembershipPeriodType.PERIOD_TYPE_UNLIMITED, @@ -53,7 +53,7 @@ class TierActiveAndFreeTests : MembershipTestsSetup() { email: String ): MembershipStatus { return MembershipStatus( - activeTier = TierId(MembershipConstants.EXPLORER_ID), + activeTier = TierId(MembershipConstants.STARTER_ID), status = Membership.Status.STATUS_ACTIVE, dateEnds = 0, paymentMethod = MembershipPaymentMethod.METHOD_NONE, @@ -83,8 +83,8 @@ class TierActiveAndFreeTests : MembershipTestsSetup() { viewStateFlow.awaitItem().let { result -> assertIs(result) val tier: TierPreview = - result.tiersPreview.find { it.id.value == MembershipConstants.EXPLORER_ID }!! - TestCase.assertEquals(MembershipConstants.EXPLORER_ID, tier.id.value) + result.tiersPreview.find { it.id.value == MembershipConstants.STARTER_ID }!! + TestCase.assertEquals(MembershipConstants.STARTER_ID, tier.id.value) TestCase.assertEquals(true, tier.isActive) TestCase.assertEquals( TierConditionInfo.Visible.Valid( @@ -96,7 +96,7 @@ class TierActiveAndFreeTests : MembershipTestsSetup() { ) } - viewModel.onTierClicked(TierId(MembershipConstants.EXPLORER_ID)) + viewModel.onTierClicked(TierId(MembershipConstants.STARTER_ID)) //STATE : EXPLORER, CURRENT, WITHOUT EMAIL tierStateFlow.awaitItem().let { result -> @@ -111,7 +111,7 @@ class TierActiveAndFreeTests : MembershipTestsSetup() { ), expectedAnyName = TierAnyName.Hidden, expectedButtonState = TierButton.Submit.Enabled, - expectedId = MembershipConstants.EXPLORER_ID, + expectedId = MembershipConstants.STARTER_ID, expectedActive = true, expectedEmailState = TierEmail.Visible.Enter ) @@ -138,8 +138,8 @@ class TierActiveAndFreeTests : MembershipTestsSetup() { viewStateFlow.awaitItem().let { result -> assertIs(result) val tier: TierPreview = - result.tiersPreview.find { it.id.value == MembershipConstants.EXPLORER_ID }!! - TestCase.assertEquals(MembershipConstants.EXPLORER_ID, tier.id.value) + result.tiersPreview.find { it.id.value == MembershipConstants.STARTER_ID }!! + TestCase.assertEquals(MembershipConstants.STARTER_ID, tier.id.value) TestCase.assertEquals(true, tier.isActive) TestCase.assertEquals( TierConditionInfo.Visible.Valid( @@ -151,7 +151,7 @@ class TierActiveAndFreeTests : MembershipTestsSetup() { ) } - viewModel.onTierClicked(TierId(MembershipConstants.EXPLORER_ID)) + viewModel.onTierClicked(TierId(MembershipConstants.STARTER_ID)) //STATE : EXPLORER, CURRENT, WITHOUT EMAIL tierStateFlow.awaitItem().let { result -> @@ -166,7 +166,7 @@ class TierActiveAndFreeTests : MembershipTestsSetup() { ), expectedAnyName = TierAnyName.Hidden, expectedButtonState = TierButton.ChangeEmail, - expectedId = MembershipConstants.EXPLORER_ID, + expectedId = MembershipConstants.STARTER_ID, expectedActive = true, expectedEmailState = TierEmail.Hidden ) diff --git a/payments/src/test/java/com/anytypeio/anytype/payments/TierActivePurchasedOniOSTests.kt b/payments/src/test/java/com/anytypeio/anytype/payments/TierActivePurchasedOniOSTests.kt index 472a0d749e..9dc79562ff 100644 --- a/payments/src/test/java/com/anytypeio/anytype/payments/TierActivePurchasedOniOSTests.kt +++ b/payments/src/test/java/com/anytypeio/anytype/payments/TierActivePurchasedOniOSTests.kt @@ -44,7 +44,7 @@ class TierActivePurchasedOniOSTests : MembershipTestsSetup() { private fun setupTierData(features: List): List { return listOf( StubMembershipTierData( - id = MembershipConstants.EXPLORER_ID, + id = MembershipConstants.STARTER_ID, androidProductId = null, features = features, periodType = MembershipPeriodType.PERIOD_TYPE_UNLIMITED, diff --git a/payments/src/test/java/com/anytypeio/anytype/payments/TierActiveWithDifferentSubIdTest.kt b/payments/src/test/java/com/anytypeio/anytype/payments/TierActiveWithDifferentSubIdTest.kt index 01b9979590..5bb16c1dd3 100644 --- a/payments/src/test/java/com/anytypeio/anytype/payments/TierActiveWithDifferentSubIdTest.kt +++ b/payments/src/test/java/com/anytypeio/anytype/payments/TierActiveWithDifferentSubIdTest.kt @@ -49,7 +49,7 @@ class TierActiveWithDifferentSubIdTest : MembershipTestsSetup() { private fun setupTierData(features: List): List { return listOf( StubMembershipTierData( - id = MembershipConstants.EXPLORER_ID, + id = MembershipConstants.STARTER_ID, androidProductId = null, features = features, periodType = MembershipPeriodType.PERIOD_TYPE_UNLIMITED, @@ -105,7 +105,7 @@ class TierActiveWithDifferentSubIdTest : MembershipTestsSetup() { val flow = flow { emit( MembershipStatus( - activeTier = TierId(MembershipConstants.EXPLORER_ID), + activeTier = TierId(MembershipConstants.STARTER_ID), status = Membership.Status.STATUS_ACTIVE, dateEnds = 0L, paymentMethod = MembershipPaymentMethod.METHOD_NONE, @@ -225,7 +225,7 @@ class TierActiveWithDifferentSubIdTest : MembershipTestsSetup() { val flow = flow { emit( MembershipStatus( - activeTier = TierId(MembershipConstants.EXPLORER_ID), + activeTier = TierId(MembershipConstants.STARTER_ID), status = Membership.Status.STATUS_ACTIVE, dateEnds = 0L, paymentMethod = MembershipPaymentMethod.METHOD_NONE, @@ -313,7 +313,7 @@ class TierActiveWithDifferentSubIdTest : MembershipTestsSetup() { val flow = flow { emit( MembershipStatus( - activeTier = TierId(MembershipConstants.EXPLORER_ID), + activeTier = TierId(MembershipConstants.STARTER_ID), status = Membership.Status.STATUS_ACTIVE, dateEnds = 0L, paymentMethod = MembershipPaymentMethod.METHOD_NONE, @@ -428,7 +428,7 @@ class TierActiveWithDifferentSubIdTest : MembershipTestsSetup() { val flow = flow { emit( MembershipStatus( - activeTier = TierId(MembershipConstants.EXPLORER_ID), + activeTier = TierId(MembershipConstants.STARTER_ID), status = Membership.Status.STATUS_ACTIVE, dateEnds = 0L, paymentMethod = MembershipPaymentMethod.METHOD_NONE, diff --git a/payments/src/test/java/com/anytypeio/anytype/payments/TierAndroidActivePurchasedOniOS.kt b/payments/src/test/java/com/anytypeio/anytype/payments/TierAndroidActivePurchasedOniOS.kt index 54370ae3f5..6de5217fb2 100644 --- a/payments/src/test/java/com/anytypeio/anytype/payments/TierAndroidActivePurchasedOniOS.kt +++ b/payments/src/test/java/com/anytypeio/anytype/payments/TierAndroidActivePurchasedOniOS.kt @@ -45,7 +45,7 @@ class TierAndroidActivePurchasedOniOS : MembershipTestsSetup() { private fun setupTierData(features: List): List { return listOf( StubMembershipTierData( - id = MembershipConstants.EXPLORER_ID, + id = MembershipConstants.STARTER_ID, androidProductId = null, features = features, periodType = MembershipPeriodType.PERIOD_TYPE_UNLIMITED, diff --git a/payments/src/test/java/com/anytypeio/anytype/payments/TierAndroidActiveTests.kt b/payments/src/test/java/com/anytypeio/anytype/payments/TierAndroidActiveTests.kt index 590ccc745e..6917fc79ff 100644 --- a/payments/src/test/java/com/anytypeio/anytype/payments/TierAndroidActiveTests.kt +++ b/payments/src/test/java/com/anytypeio/anytype/payments/TierAndroidActiveTests.kt @@ -42,7 +42,7 @@ class TierAndroidActiveTests : MembershipTestsSetup() { private fun setupTierData(features: List): List { return listOf( StubMembershipTierData( - id = MembershipConstants.EXPLORER_ID, + id = MembershipConstants.STARTER_ID, androidProductId = null, features = features, periodType = MembershipPeriodType.PERIOD_TYPE_UNLIMITED, diff --git a/payments/src/test/java/com/anytypeio/anytype/payments/TierAndroidBillingUnavailableTest.kt b/payments/src/test/java/com/anytypeio/anytype/payments/TierAndroidBillingUnavailableTest.kt index 684e9348b9..88b9383ac7 100644 --- a/payments/src/test/java/com/anytypeio/anytype/payments/TierAndroidBillingUnavailableTest.kt +++ b/payments/src/test/java/com/anytypeio/anytype/payments/TierAndroidBillingUnavailableTest.kt @@ -36,7 +36,7 @@ class TierAndroidBillingUnavailableTest : MembershipTestsSetup() { private fun setupTierData(features: List): List { return listOf( StubMembershipTierData( - id = MembershipConstants.EXPLORER_ID, + id = MembershipConstants.STARTER_ID, androidProductId = null, features = features, periodType = MembershipPeriodType.PERIOD_TYPE_UNLIMITED, @@ -64,7 +64,7 @@ class TierAndroidBillingUnavailableTest : MembershipTestsSetup() { private fun setupMembershipStatus(tiers: List): MembershipStatus { return MembershipStatus( - activeTier = TierId(MembershipConstants.EXPLORER_ID), + activeTier = TierId(MembershipConstants.STARTER_ID), status = Membership.Status.STATUS_ACTIVE, dateEnds = 0, paymentMethod = MembershipPaymentMethod.METHOD_NONE, diff --git a/payments/src/test/java/com/anytypeio/anytype/payments/TierAndroidNotActiveTests.kt b/payments/src/test/java/com/anytypeio/anytype/payments/TierAndroidNotActiveTests.kt index 874f4b3942..7d877d5132 100644 --- a/payments/src/test/java/com/anytypeio/anytype/payments/TierAndroidNotActiveTests.kt +++ b/payments/src/test/java/com/anytypeio/anytype/payments/TierAndroidNotActiveTests.kt @@ -46,7 +46,7 @@ class TierAndroidNotActiveTests : MembershipTestsSetup() { private fun setupTierData(features: List): List { return listOf( StubMembershipTierData( - id = MembershipConstants.EXPLORER_ID, + id = MembershipConstants.STARTER_ID, androidProductId = null, features = features, periodType = MembershipPeriodType.PERIOD_TYPE_UNLIMITED, @@ -85,7 +85,7 @@ class TierAndroidNotActiveTests : MembershipTestsSetup() { status : Membership.Status = Membership.Status.STATUS_ACTIVE ): MembershipStatus { return MembershipStatus( - activeTier = TierId(MembershipConstants.EXPLORER_ID), + activeTier = TierId(MembershipConstants.STARTER_ID), status = status, dateEnds = 1714199910, paymentMethod = MembershipPaymentMethod.METHOD_NONE, diff --git a/payments/src/test/java/com/anytypeio/anytype/payments/TierBuilderFallbackOnExplorerTest.kt b/payments/src/test/java/com/anytypeio/anytype/payments/TierBuilderFallbackOnExplorerTest.kt index 03032e2812..e844517002 100644 --- a/payments/src/test/java/com/anytypeio/anytype/payments/TierBuilderFallbackOnExplorerTest.kt +++ b/payments/src/test/java/com/anytypeio/anytype/payments/TierBuilderFallbackOnExplorerTest.kt @@ -7,7 +7,7 @@ import com.anytypeio.anytype.core_models.membership.MembershipPaymentMethod import com.anytypeio.anytype.core_models.membership.MembershipPeriodType import com.anytypeio.anytype.core_models.membership.MembershipTierData import com.anytypeio.anytype.core_models.membership.MembershipConstants.BUILDER_ID -import com.anytypeio.anytype.core_models.membership.MembershipConstants.EXPLORER_ID +import com.anytypeio.anytype.core_models.membership.MembershipConstants.STARTER_ID import com.anytypeio.anytype.payments.models.BillingPriceInfo import com.anytypeio.anytype.payments.models.MembershipPurchase import com.anytypeio.anytype.payments.models.PeriodDescription @@ -47,7 +47,7 @@ class TierBuilderFallbackOnExplorerTest : MembershipTestsSetup() { private fun setupTierData(features: List): List { return listOf( StubMembershipTierData( - id = EXPLORER_ID, + id = STARTER_ID, androidProductId = null, features = features, periodType = MembershipPeriodType.PERIOD_TYPE_UNLIMITED, @@ -102,7 +102,7 @@ class TierBuilderFallbackOnExplorerTest : MembershipTestsSetup() { delay(300) emit( MembershipStatus( - activeTier = TierId(EXPLORER_ID), + activeTier = TierId(STARTER_ID), status = Membership.Status.STATUS_ACTIVE, dateEnds = 0L, paymentMethod = MembershipPaymentMethod.METHOD_NONE, @@ -136,7 +136,7 @@ class TierBuilderFallbackOnExplorerTest : MembershipTestsSetup() { secondMainItem.let { assertIs(secondMainItem) val builderTier2 = secondMainItem.tiers.find { it.id == TierId(BUILDER_ID) } - val explorerTier2 = secondMainItem.tiers.find { it.id == TierId(EXPLORER_ID) } + val explorerTier2 = secondMainItem.tiers.find { it.id == TierId(STARTER_ID) } assertEquals(true, builderTier2?.isActive) assertEquals(false, explorerTier2?.isActive) } @@ -145,7 +145,7 @@ class TierBuilderFallbackOnExplorerTest : MembershipTestsSetup() { thirdMainItem.let { assertIs(thirdMainItem) val builderTier3 = thirdMainItem.tiers.find { it.id == TierId(BUILDER_ID) } - val explorerTier3 = thirdMainItem.tiers.find { it.id == TierId(EXPLORER_ID) } + val explorerTier3 = thirdMainItem.tiers.find { it.id == TierId(STARTER_ID) } assertEquals(false, builderTier3?.isActive) assertEquals(true, explorerTier3?.isActive) } diff --git a/payments/src/test/java/com/anytypeio/anytype/payments/TierConditionInfoTests.kt b/payments/src/test/java/com/anytypeio/anytype/payments/TierConditionInfoTests.kt index c5ac93e04a..b9f86647fe 100644 --- a/payments/src/test/java/com/anytypeio/anytype/payments/TierConditionInfoTests.kt +++ b/payments/src/test/java/com/anytypeio/anytype/payments/TierConditionInfoTests.kt @@ -24,7 +24,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { turbineScope { val tiers = listOf( StubMembershipTierData( - id = MembershipConstants.EXPLORER_ID, + id = MembershipConstants.STARTER_ID, name = "Explorer", periodType = MembershipPeriodType.PERIOD_TYPE_UNLIMITED, priceStripeUsdCents = 0, @@ -54,7 +54,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { val tier = result.tiersPreview[0] //Asserts - assertEquals(MembershipConstants.EXPLORER_ID, tier.id.value) + assertEquals(MembershipConstants.STARTER_ID, tier.id.value) assertEquals( TierConditionInfo.Visible.Free( period = TierPeriod.Unlimited @@ -68,7 +68,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { turbineScope { val tiers = listOf( StubMembershipTierData( - id = MembershipConstants.EXPLORER_ID, + id = MembershipConstants.STARTER_ID, name = "Explorer", periodType = MembershipPeriodType.PERIOD_TYPE_UNKNOWN, priceStripeUsdCents = 0, @@ -98,7 +98,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { val tier = result.tiersPreview[0] //Asserts - assertEquals(MembershipConstants.EXPLORER_ID, tier.id.value) + assertEquals(MembershipConstants.STARTER_ID, tier.id.value) assertEquals( TierConditionInfo.Visible.Free( period = TierPeriod.Unknown @@ -112,7 +112,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { turbineScope { val tiers = listOf( StubMembershipTierData( - id = MembershipConstants.EXPLORER_ID, + id = MembershipConstants.STARTER_ID, name = "Explorer", periodType = MembershipPeriodType.PERIOD_TYPE_YEARS, priceStripeUsdCents = 0, @@ -142,7 +142,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { val tier = result.tiersPreview[0] //Asserts - assertEquals(MembershipConstants.EXPLORER_ID, tier.id.value) + assertEquals(MembershipConstants.STARTER_ID, tier.id.value) assertEquals( TierConditionInfo.Visible.Free( period = TierPeriod.Year(3) @@ -156,7 +156,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { turbineScope { val tiers = listOf( StubMembershipTierData( - id = MembershipConstants.EXPLORER_ID, + id = MembershipConstants.STARTER_ID, name = "Explorer", periodType = MembershipPeriodType.PERIOD_TYPE_UNLIMITED, priceStripeUsdCents = 9999, @@ -186,7 +186,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { val tier = result.tiersPreview[0] //Asserts - assertEquals(MembershipConstants.EXPLORER_ID, tier.id.value) + assertEquals(MembershipConstants.STARTER_ID, tier.id.value) assertEquals( TierConditionInfo.Visible.Price( price = "$99.99", @@ -201,7 +201,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { turbineScope { val tiers = listOf( StubMembershipTierData( - id = MembershipConstants.EXPLORER_ID, + id = MembershipConstants.STARTER_ID, name = "Explorer", periodType = MembershipPeriodType.PERIOD_TYPE_UNKNOWN, priceStripeUsdCents = 9999, @@ -231,7 +231,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { val tier = result.tiersPreview[0] //Asserts - assertEquals(MembershipConstants.EXPLORER_ID, tier.id.value) + assertEquals(MembershipConstants.STARTER_ID, tier.id.value) assertEquals( TierConditionInfo.Visible.Price( price = "$99.99", @@ -246,7 +246,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { turbineScope { val tiers = listOf( StubMembershipTierData( - id = MembershipConstants.EXPLORER_ID, + id = MembershipConstants.STARTER_ID, name = "Explorer", periodType = MembershipPeriodType.PERIOD_TYPE_YEARS, priceStripeUsdCents = 9999, @@ -276,7 +276,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { val tier = result.tiersPreview[0] //Asserts - assertEquals(MembershipConstants.EXPLORER_ID, tier.id.value) + assertEquals(MembershipConstants.STARTER_ID, tier.id.value) assertEquals( TierConditionInfo.Visible.Price( price = "$99.99", @@ -291,7 +291,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { turbineScope { val tiers = listOf( StubMembershipTierData( - id = MembershipConstants.EXPLORER_ID, + id = MembershipConstants.STARTER_ID, name = "Explorer", periodType = MembershipPeriodType.PERIOD_TYPE_UNLIMITED, priceStripeUsdCents = 0, @@ -300,7 +300,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { ) stubMembershipProvider( MembershipStatus( - activeTier = TierId(MembershipConstants.EXPLORER_ID), + activeTier = TierId(MembershipConstants.STARTER_ID), status = Membership.Status.STATUS_ACTIVE, dateEnds = 1714199910, paymentMethod = MembershipPaymentMethod.METHOD_CRYPTO, @@ -321,7 +321,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { val tier = result.tiersPreview[0] //Asserts - assertEquals(MembershipConstants.EXPLORER_ID, tier.id.value) + assertEquals(MembershipConstants.STARTER_ID, tier.id.value) assertEquals( TierConditionInfo.Visible.Valid( period = TierPeriod.Unlimited, @@ -337,7 +337,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { turbineScope { val tiers = listOf( StubMembershipTierData( - id = MembershipConstants.EXPLORER_ID, + id = MembershipConstants.STARTER_ID, name = "Explorer", periodType = MembershipPeriodType.PERIOD_TYPE_UNKNOWN, priceStripeUsdCents = 0, @@ -346,7 +346,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { ) stubMembershipProvider( MembershipStatus( - activeTier = TierId(MembershipConstants.EXPLORER_ID), + activeTier = TierId(MembershipConstants.STARTER_ID), status = Membership.Status.STATUS_ACTIVE, dateEnds = 1714199910, paymentMethod = MembershipPaymentMethod.METHOD_CRYPTO, @@ -367,7 +367,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { val tier = result.tiersPreview[0] //Asserts - assertEquals(MembershipConstants.EXPLORER_ID, tier.id.value) + assertEquals(MembershipConstants.STARTER_ID, tier.id.value) assertEquals( TierConditionInfo.Visible.Valid( period = TierPeriod.Unknown, @@ -383,7 +383,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { turbineScope { val tiers = listOf( StubMembershipTierData( - id = MembershipConstants.EXPLORER_ID, + id = MembershipConstants.STARTER_ID, name = "Explorer", periodType = MembershipPeriodType.PERIOD_TYPE_YEARS, priceStripeUsdCents = 0, @@ -392,7 +392,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { ) stubMembershipProvider( MembershipStatus( - activeTier = TierId(MembershipConstants.EXPLORER_ID), + activeTier = TierId(MembershipConstants.STARTER_ID), status = Membership.Status.STATUS_ACTIVE, dateEnds = 1714199910, paymentMethod = MembershipPaymentMethod.METHOD_CRYPTO, @@ -413,7 +413,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { val tier = result.tiersPreview[0] //Asserts - assertEquals(MembershipConstants.EXPLORER_ID, tier.id.value) + assertEquals(MembershipConstants.STARTER_ID, tier.id.value) assertEquals( TierConditionInfo.Visible.Valid( period = TierPeriod.Year(2), @@ -475,7 +475,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { turbineScope { val tiers = listOf( StubMembershipTierData( - id = MembershipConstants.EXPLORER_ID, + id = MembershipConstants.STARTER_ID, name = "Explorer", colorStr = "#000000", features = listOf("feature1", "feature2"), @@ -507,7 +507,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { val tier = result.tiersPreview[0] //Asserts - assertEquals(MembershipConstants.EXPLORER_ID, tier.id.value) + assertEquals(MembershipConstants.STARTER_ID, tier.id.value) assertEquals( TierConditionInfo.Visible.Free( period = TierPeriod.Year(4) @@ -521,7 +521,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { turbineScope { val tiers = listOf( StubMembershipTierData( - id = MembershipConstants.EXPLORER_ID, + id = MembershipConstants.STARTER_ID, name = "Explorer", colorStr = "#000000", features = listOf("feature1", "feature2"), @@ -553,7 +553,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { val tier = result.tiersPreview[0] //Asserts - assertEquals(MembershipConstants.EXPLORER_ID, tier.id.value) + assertEquals(MembershipConstants.STARTER_ID, tier.id.value) assertEquals( TierConditionInfo.Visible.Free( period = TierPeriod.Month(3) @@ -567,7 +567,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { turbineScope { val tiers = listOf( StubMembershipTierData( - id = MembershipConstants.EXPLORER_ID, + id = MembershipConstants.STARTER_ID, name = "Explorer", colorStr = "#000000", features = listOf("feature1", "feature2"), @@ -599,7 +599,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { val tier = result.tiersPreview[0] //Asserts - assertEquals(MembershipConstants.EXPLORER_ID, tier.id.value) + assertEquals(MembershipConstants.STARTER_ID, tier.id.value) assertEquals(false, tier.isActive) assertEquals( TierConditionInfo.Visible.Free( @@ -614,7 +614,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { turbineScope { val tiers = listOf( StubMembershipTierData( - id = MembershipConstants.EXPLORER_ID, + id = MembershipConstants.STARTER_ID, name = "Explorer", colorStr = "#000000", features = listOf("feature1", "feature2"), @@ -646,7 +646,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { val tier = result.tiersPreview[0] //Asserts - assertEquals(MembershipConstants.EXPLORER_ID, tier.id.value) + assertEquals(MembershipConstants.STARTER_ID, tier.id.value) assertEquals(false, tier.isActive) assertEquals( TierConditionInfo.Visible.Free( @@ -661,7 +661,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { turbineScope { val tiers = listOf( StubMembershipTierData( - id = MembershipConstants.EXPLORER_ID, + id = MembershipConstants.STARTER_ID, name = "Explorer", colorStr = "#000000", features = listOf("feature1", "feature2"), @@ -693,7 +693,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { val tier = result.tiersPreview[0] //Asserts - assertEquals(MembershipConstants.EXPLORER_ID, tier.id.value) + assertEquals(MembershipConstants.STARTER_ID, tier.id.value) assertEquals(false, tier.isActive) assertEquals( TierConditionInfo.Visible.Free(period = TierPeriod.Unknown), @@ -710,7 +710,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { turbineScope { val tiers = listOf( StubMembershipTierData( - id = MembershipConstants.EXPLORER_ID, + id = MembershipConstants.STARTER_ID, name = "Explorer", colorStr = "#000000", features = listOf("feature1", "feature2"), @@ -742,7 +742,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { val tier = result.tiersPreview[0] //Asserts - assertEquals(MembershipConstants.EXPLORER_ID, tier.id.value) + assertEquals(MembershipConstants.STARTER_ID, tier.id.value) assertEquals(false, tier.isActive) assertEquals( TierConditionInfo.Visible.Free(period = TierPeriod.Unknown), @@ -756,7 +756,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { turbineScope { val tiers = listOf( StubMembershipTierData( - id = MembershipConstants.EXPLORER_ID, + id = MembershipConstants.STARTER_ID, name = "Explorer", colorStr = "#000000", features = listOf("feature1", "feature2"), @@ -788,7 +788,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { val tier = result.tiersPreview[0] //Asserts - assertEquals(MembershipConstants.EXPLORER_ID, tier.id.value) + assertEquals(MembershipConstants.STARTER_ID, tier.id.value) assertEquals(false, tier.isActive) assertEquals( TierConditionInfo.Visible.Price( @@ -804,7 +804,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { turbineScope { val tiers = listOf( StubMembershipTierData( - id = MembershipConstants.EXPLORER_ID, + id = MembershipConstants.STARTER_ID, name = "Explorer", colorStr = "#000000", features = listOf("feature1", "feature2"), @@ -836,7 +836,7 @@ class TierConditionInfoTests : MembershipTestsSetup() { val tier = result.tiersPreview[0] //Asserts - assertEquals(MembershipConstants.EXPLORER_ID, tier.id.value) + assertEquals(MembershipConstants.STARTER_ID, tier.id.value) assertEquals(false, tier.isActive) assertEquals( TierConditionInfo.Visible.Price( diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/multiplayer/SpaceJoinRequestViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/multiplayer/SpaceJoinRequestViewModel.kt index 4f8408b723..91e1ec6306 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/multiplayer/SpaceJoinRequestViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/multiplayer/SpaceJoinRequestViewModel.kt @@ -13,7 +13,7 @@ import com.anytypeio.anytype.core_models.Id import com.anytypeio.anytype.core_models.ObjectWrapper import com.anytypeio.anytype.core_models.ext.isPossibleToUpgradeNumberOfSpaceMembers import com.anytypeio.anytype.core_models.membership.MembershipConstants.BUILDER_ID -import com.anytypeio.anytype.core_models.membership.MembershipConstants.EXPLORER_ID +import com.anytypeio.anytype.core_models.membership.MembershipConstants.STARTER_ID import com.anytypeio.anytype.core_models.membership.TierId import com.anytypeio.anytype.core_models.multiplayer.MultiplayerError import com.anytypeio.anytype.core_models.multiplayer.SpaceMemberPermissions @@ -137,7 +137,7 @@ class SpaceJoinRequestViewModel( Timber.d("proceedWithState, tierId: $tierId, spaceView: $spaceView, spaceMembers: $spaceMembers, newMember: $newMember, isCurrentUserOwner: $isCurrentUserOwner") val state = when (tierId.value) { - EXPLORER_ID -> createExplorerState( + STARTER_ID -> createExplorerState( spaceView = spaceView, spaceMembers = spaceMembers, newMember = newMember,