diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 6edc1d9d21..5647ad7cfc 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -4,8 +4,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -19,6 +47,10 @@
+
+
+
+
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 9029856167..7da64b0215 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -74,13 +74,15 @@ dependencies {
implementation(projects.domain.walletConnect)
implementation(projects.domain.markets)
implementation(projects.domain.manageTokens)
+ implementation(projects.domain.onramp)
implementation(projects.common)
implementation(projects.common.routing)
+ implementation(projects.common.google)
implementation(projects.core.analytics)
implementation(projects.core.analytics.models)
implementation(projects.core.navigation)
- implementation(projects.core.featuretoggles)
+ implementation(projects.core.configToggles)
implementation(projects.core.res)
implementation(projects.core.ui)
implementation(projects.core.datasource)
@@ -112,6 +114,7 @@ dependencies {
implementation(projects.data.walletConnect)
implementation(projects.data.markets)
implementation(projects.data.manageTokens)
+ implementation(projects.data.onramp)
/** Features */
implementation(projects.features.onboarding)
@@ -220,14 +223,13 @@ dependencies {
implementation(deps.lottie)
implementation(deps.compose.accompanist.appCompatTheme)
implementation(deps.compose.accompanist.systemUiController)
- implementation(deps.compose.accompanist.webView)
implementation(deps.xmlShimmer)
implementation(deps.viewBindingDelegate)
implementation(deps.armadillo)
implementation(deps.mviCore.watcher)
implementation(deps.kotlin.serialization)
- implementation(deps.walletConnectCore)
- implementation(deps.walletConnectWeb3)
+ implementation(deps.reownCore)
+ implementation(deps.reownWeb3)
implementation(deps.prettyLogger)
/** Testing libraries */
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5979dc8c9a..b9db373358 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,7 @@
+
@@ -14,7 +15,7 @@
android:name="android.permission.READ_EXTERNAL_STORAGE"
android:maxSdkVersion="32" />
-
+
@@ -35,10 +36,10 @@
android:fullBackupContent="false"
android:hardwareAccelerated="true"
android:icon="@mipmap/ic_launcher"
- android:resizeableActivity="@bool/resizeable_activity"
android:label="@string/tangem_app_name"
android:largeHeap="@bool/largeHeap"
android:networkSecurityConfig="@xml/network_security_config"
+ android:resizeableActivity="@bool/resizeable_activity"
android:roundIcon="@mipmap/ic_launcher"
android:supportsRtl="true"
tools:ignore="GoogleAppIndexingWarning"
@@ -52,7 +53,7 @@
android:name="com.tangem.tap.MainActivity"
android:configChanges="uiMode"
android:exported="true"
- android:launchMode="singleTop"
+ android:launchMode="singleTask"
android:screenOrientation="portrait"
android:theme="@style/SplashTheme"
android:windowSoftInputMode="adjustResize">
@@ -118,6 +119,17 @@
android:scheme="tangem" />
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/assets/testnet_tokens.json b/app/src/main/assets/testnet_tokens.json
index 30fa60f3c4..67b96dd4a9 100644
--- a/app/src/main/assets/testnet_tokens.json
+++ b/app/src/main/assets/testnet_tokens.json
@@ -749,6 +749,16 @@
}
]
},
+ {
+ "id": "chiliz",
+ "name": "Chiliz",
+ "symbol": "CHZ",
+ "networks": [
+ {
+ "networkId": "chiliz/test"
+ }
+ ]
+ },
{
"id": "casper-network",
"name": "Casper",
diff --git a/app/src/main/java/com/tangem/tap/ApplicationEntryPoint.kt b/app/src/main/java/com/tangem/tap/ApplicationEntryPoint.kt
index b116caf952..2e99af7238 100644
--- a/app/src/main/java/com/tangem/tap/ApplicationEntryPoint.kt
+++ b/app/src/main/java/com/tangem/tap/ApplicationEntryPoint.kt
@@ -3,9 +3,11 @@ package com.tangem.tap
import com.tangem.TangemSdkLogger
import com.tangem.blockchainsdk.BlockchainSDKFactory
import com.tangem.blockchainsdk.signer.TransactionSignerFactory
+import com.tangem.blockchainsdk.utils.ExcludedBlockchains
import com.tangem.common.routing.AppRouter
import com.tangem.core.analytics.filter.OneTimeEventFilter
-import com.tangem.core.featuretoggle.manager.FeatureTogglesManager
+import com.tangem.core.configtoggle.blockchain.ExcludedBlockchainsManager
+import com.tangem.core.configtoggle.feature.FeatureTogglesManager
import com.tangem.core.navigation.share.ShareManager
import com.tangem.core.navigation.url.UrlOpener
import com.tangem.datasource.connection.NetworkConnectionManager
@@ -22,6 +24,7 @@ import com.tangem.domain.feedback.GetCardInfoUseCase
import com.tangem.domain.feedback.SendFeedbackEmailUseCase
import com.tangem.domain.onboarding.SaveTwinsOnboardingShownUseCase
import com.tangem.domain.onboarding.WasTwinsOnboardingShownUseCase
+import com.tangem.domain.onboarding.repository.OnboardingRepository
import com.tangem.domain.settings.repositories.SettingsRepository
import com.tangem.domain.settings.usercountry.GetUserCountryUseCase
import com.tangem.domain.walletmanager.WalletManagersFacade
@@ -34,6 +37,7 @@ import com.tangem.tap.common.log.TangemAppLoggerInitializer
import com.tangem.tap.domain.scanCard.CardScanningFeatureToggles
import com.tangem.tap.features.home.featuretoggles.HomeFeatureToggles
import com.tangem.tap.proxy.AppStateHolder
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
import dagger.hilt.EntryPoint
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
@@ -52,6 +56,8 @@ interface ApplicationEntryPoint {
fun getFeatureTogglesManager(): FeatureTogglesManager
+ fun getExcludedBlockchainsManager(): ExcludedBlockchainsManager
+
fun getNetworkConnectionManager(): NetworkConnectionManager
fun getCardScanningFeatureToggles(): CardScanningFeatureToggles
@@ -113,4 +119,10 @@ interface ApplicationEntryPoint {
fun getOnrampFeatureToggles(): OnrampFeatureToggles
fun getOnboardingV2FeatureToggles(): OnboardingV2FeatureToggles
+
+ fun getOnboardingRepository(): OnboardingRepository
+
+ fun getCoroutineDispatcherProvider(): CoroutineDispatcherProvider
+
+ fun getExcludedBlockchains(): ExcludedBlockchains
}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/ForegroundActivityObserver.kt b/app/src/main/java/com/tangem/tap/ForegroundActivityObserver.kt
index f459c74e77..5e2d1c0731 100644
--- a/app/src/main/java/com/tangem/tap/ForegroundActivityObserver.kt
+++ b/app/src/main/java/com/tangem/tap/ForegroundActivityObserver.kt
@@ -18,8 +18,7 @@ class ForegroundActivityObserver : ActivityResultCaller {
val foregroundActivity: AppCompatActivity?
get() = activities.entries
- .filterNot { it.value.isDestroyed }
- .firstOrNull()
+ .firstOrNull { it.value?.isDestroyed == false }
?.value
internal val callbacks: ActivityLifecycleCallbacks
diff --git a/app/src/main/java/com/tangem/tap/MainActivity.kt b/app/src/main/java/com/tangem/tap/MainActivity.kt
index e456f93295..e0a2bf62d7 100644
--- a/app/src/main/java/com/tangem/tap/MainActivity.kt
+++ b/app/src/main/java/com/tangem/tap/MainActivity.kt
@@ -6,6 +6,7 @@ import android.content.pm.ActivityInfo
import android.content.res.Configuration
import android.os.Build
import android.os.Bundle
+import android.view.MotionEvent
import android.view.View
import android.view.WindowManager
import androidx.activity.SystemBarStyle
@@ -44,6 +45,8 @@ import com.tangem.domain.apptheme.model.AppThemeMode
import com.tangem.domain.card.ScanCardUseCase
import com.tangem.domain.card.repository.CardRepository
import com.tangem.domain.card.repository.CardSdkConfigRepository
+import com.tangem.domain.settings.SetGooglePayAvailabilityUseCase
+import com.tangem.domain.settings.SetGoogleServicesAvailabilityUseCase
import com.tangem.domain.settings.ShouldInitiallyAskPermissionUseCase
import com.tangem.domain.settings.repositories.SettingsRepository
import com.tangem.domain.staking.SendUnsubmittedHashesUseCase
@@ -52,13 +55,16 @@ import com.tangem.domain.tokens.GetPolkadotCheckHasResetUseCase
import com.tangem.domain.wallets.legacy.UserWalletsListManager
import com.tangem.feature.qrscanning.QrScanningRouter
import com.tangem.feature.wallet.presentation.wallet.analytics.WalletScreenAnalyticsEvent
+import com.tangem.features.onboarding.v2.OnboardingV2FeatureToggles
import com.tangem.features.pushnotifications.api.navigation.PushNotificationsRouter
import com.tangem.features.pushnotifications.api.utils.PUSH_PERMISSION
import com.tangem.features.send.api.navigation.SendRouter
import com.tangem.features.staking.api.navigation.StakingRouter
import com.tangem.features.tokendetails.navigation.TokenDetailsRouter
import com.tangem.features.wallet.navigation.WalletRouter
+import com.tangem.google.GoogleServicesHelper
import com.tangem.operations.backup.BackupService
+import com.tangem.sdk.api.BackupServiceHolder
import com.tangem.sdk.api.TangemSdkManager
import com.tangem.sdk.extensions.init
import com.tangem.tap.common.ActivityResultCallbackHolder
@@ -72,6 +78,7 @@ import com.tangem.tap.common.redux.NotificationsHandler
import com.tangem.tap.domain.walletconnect2.domain.WalletConnectInteractor
import com.tangem.tap.features.intentHandler.IntentProcessor
import com.tangem.tap.features.intentHandler.handlers.BackgroundScanIntentHandler
+import com.tangem.tap.features.intentHandler.handlers.OnPushClickedIntentHandler
import com.tangem.tap.features.intentHandler.handlers.WalletConnectLinkIntentHandler
import com.tangem.tap.features.main.MainViewModel
import com.tangem.tap.features.main.model.Toast
@@ -80,6 +87,7 @@ import com.tangem.tap.proxy.AppStateHolder
import com.tangem.tap.proxy.redux.DaggerGraphAction
import com.tangem.tap.routing.RoutingComponent
import com.tangem.tap.routing.configurator.AppRouterConfig
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
import com.tangem.utils.coroutines.FeatureCoroutineExceptionHandler
import com.tangem.wallet.R
import com.tangem.wallet.databinding.ActivityMainBinding
@@ -186,6 +194,21 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
@Inject
lateinit var shouldInitiallyAskPermissionUseCase: ShouldInitiallyAskPermissionUseCase
+ @Inject
+ lateinit var backupServiceHolder: BackupServiceHolder
+
+ @Inject
+ lateinit var onboardingV2FeatureToggles: OnboardingV2FeatureToggles
+
+ @Inject
+ lateinit var setGoogleServicesAvailabilityUseCase: SetGoogleServicesAvailabilityUseCase
+
+ @Inject
+ lateinit var setGooglePayAvailabilityUseCase: SetGooglePayAvailabilityUseCase
+
+ @Inject
+ lateinit var dispatchers: CoroutineDispatcherProvider
+
internal val viewModel: MainViewModel by viewModels()
private lateinit var appThemeModeFlow: SharedFlow
@@ -223,6 +246,10 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING)
}
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+ window.setHideOverlayWindows(true)
+ }
+
splashScreen.setKeepOnScreenCondition { viewModel.isSplashScreenShown }
installActivityDependencies()
@@ -235,6 +262,7 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
observeStateUpdates()
observePolkadotAccountHealthCheck()
sendStakingUnsubmittedHashes()
+ checkGoogleServicesAvailability()
if (intent != null) {
deepLinksRegistry.launch(intent)
@@ -295,7 +323,14 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
cardSdkOwner.register(activity = this)
tangemSdkManager = injectedTangemSdkManager
appStateHolder.tangemSdkManager = tangemSdkManager
- backupService = BackupService.init(cardSdkConfigRepository.sdk, this)
+
+ if (onboardingV2FeatureToggles.isOnboardingV2Enabled) {
+ backupServiceHolder.createAndSetService(cardSdkConfigRepository.sdk, this)
+ backupService = backupServiceHolder.backupService.get()!! // will be deleted eventually
+ } else {
+ backupService = BackupService.init(cardSdkConfigRepository.sdk, this)
+ }
+
lockUserWalletsTimer = LockUserWalletsTimer(
owner = this,
settingsRepository = settingsRepository,
@@ -382,6 +417,7 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
private fun initIntentHandlers() {
val hasSavedWalletsProvider = { userWalletsListManager.hasUserWallets }
+ intentProcessor.addHandler(OnPushClickedIntentHandler(analyticsEventsHandler))
intentProcessor.addHandler(BackgroundScanIntentHandler(hasSavedWalletsProvider, lifecycleScope))
intentProcessor.addHandler(WalletConnectLinkIntentHandler())
}
@@ -487,6 +523,23 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
lockUserWalletsTimer?.restart()
}
+ override fun dispatchTouchEvent(event: MotionEvent): Boolean {
+ val isPartiallyObscured = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+ event.flags and MotionEvent.FLAG_WINDOW_IS_PARTIALLY_OBSCURED != 0
+ } else {
+ false
+ }
+
+ val isFullyObscured = event.flags and MotionEvent.FLAG_WINDOW_IS_OBSCURED != 0
+
+ if (isPartiallyObscured || isFullyObscured) {
+ Timber.e("Window is partially or fully obscured")
+ return false
+ }
+
+ return super.dispatchTouchEvent(event)
+ }
+
private fun showSnackbar(text: String, length: Int, buttonTitle: String?, action: View.OnClickListener?) {
if (snackbar != null) return
@@ -587,6 +640,22 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
}
}
+ private fun checkGoogleServicesAvailability() {
+ val isGoogleServicesAvailable = GoogleServicesHelper.checkGoogleServicesAvailability(this)
+
+ lifecycleScope.launch {
+ setGoogleServicesAvailabilityUseCase(isGoogleServicesAvailable)
+
+ if (isGoogleServicesAvailable) {
+ val paymentsClient = GoogleServicesHelper.createPaymentsClient(this@MainActivity)
+ val isGooglePayAvailable = GoogleServicesHelper.checkGooglePayAvailability(paymentsClient)
+ setGooglePayAvailabilityUseCase(isGooglePayAvailable)
+ } else {
+ setGooglePayAvailabilityUseCase(false)
+ }
+ }
+ }
+
companion object {
private const val APP_THEME_LOAD_TIMEOUT = 2
}
diff --git a/app/src/main/java/com/tangem/tap/TangemApplication.kt b/app/src/main/java/com/tangem/tap/TangemApplication.kt
index 78c59931bf..8409782c2b 100644
--- a/app/src/main/java/com/tangem/tap/TangemApplication.kt
+++ b/app/src/main/java/com/tangem/tap/TangemApplication.kt
@@ -9,6 +9,7 @@ import com.tangem.TangemSdkLogger
import com.tangem.blockchain.network.BlockchainSdkRetrofitBuilder
import com.tangem.blockchainsdk.BlockchainSDKFactory
import com.tangem.blockchainsdk.signer.TransactionSignerFactory
+import com.tangem.blockchainsdk.utils.ExcludedBlockchains
import com.tangem.common.routing.AppRouter
import com.tangem.core.analytics.Analytics
import com.tangem.core.analytics.api.ParamsInterceptor
@@ -17,7 +18,8 @@ import com.tangem.core.analytics.models.AnalyticsEvent
import com.tangem.core.analytics.models.AnalyticsParam
import com.tangem.core.analytics.models.Basic
import com.tangem.core.analytics.models.Basic.TransactionSent.WalletForm
-import com.tangem.core.featuretoggle.manager.FeatureTogglesManager
+import com.tangem.core.configtoggle.blockchain.ExcludedBlockchainsManager
+import com.tangem.core.configtoggle.feature.FeatureTogglesManager
import com.tangem.datasource.api.common.MoshiConverter
import com.tangem.datasource.api.common.createNetworkLoggingInterceptor
import com.tangem.datasource.connection.NetworkConnectionManager
@@ -36,6 +38,7 @@ import com.tangem.domain.feedback.GetCardInfoUseCase
import com.tangem.domain.feedback.SendFeedbackEmailUseCase
import com.tangem.domain.onboarding.SaveTwinsOnboardingShownUseCase
import com.tangem.domain.onboarding.WasTwinsOnboardingShownUseCase
+import com.tangem.domain.onboarding.repository.OnboardingRepository
import com.tangem.domain.settings.repositories.SettingsRepository
import com.tangem.domain.settings.usercountry.GetUserCountryUseCase
import com.tangem.domain.walletmanager.WalletManagersFacade
@@ -57,9 +60,11 @@ import com.tangem.tap.domain.tasks.product.DerivationsFinder
import com.tangem.tap.features.home.featuretoggles.HomeFeatureToggles
import com.tangem.tap.proxy.AppStateHolder
import com.tangem.tap.proxy.redux.DaggerGraphState
-import com.tangem.utils.coroutines.AppCoroutineDispatcherProvider
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
import com.tangem.wallet.BuildConfig
import dagger.hilt.EntryPoints
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.runBlocking
import org.rekotlin.Store
import com.tangem.tap.domain.walletconnect2.domain.LegacyWalletConnectRepository as WalletConnect2Repository
@@ -88,6 +93,9 @@ abstract class TangemApplication : Application(), ImageLoaderFactory {
private val featureTogglesManager: FeatureTogglesManager
get() = entryPoint.getFeatureTogglesManager()
+ private val excludedBlockchainsManager: ExcludedBlockchainsManager
+ get() = entryPoint.getExcludedBlockchainsManager()
+
private val networkConnectionManager: NetworkConnectionManager
get() = entryPoint.getNetworkConnectionManager()
@@ -180,6 +188,15 @@ abstract class TangemApplication : Application(), ImageLoaderFactory {
private val onboardingV2FeatureToggles: OnboardingV2FeatureToggles
get() = entryPoint.getOnboardingV2FeatureToggles()
+
+ private val onboardingRepository: OnboardingRepository
+ get() = entryPoint.getOnboardingRepository()
+
+ private val dispatchers: CoroutineDispatcherProvider
+ get() = entryPoint.getCoroutineDispatcherProvider()
+
+ private val excludedBlockchains: ExcludedBlockchains
+ get() = entryPoint.getExcludedBlockchains()
// endregion
override fun onCreate() {
@@ -200,9 +217,11 @@ abstract class TangemApplication : Application(), ImageLoaderFactory {
// TODO: Try to performance and user experience.
// [REDACTED_JIRA]
runBlocking {
- featureTogglesManager.init()
-
- initWithConfigDependency(environmentConfig = environmentConfigStorage.initialize())
+ awaitAll(
+ async { featureTogglesManager.init() },
+ async { excludedBlockchainsManager.init() },
+ async { initWithConfigDependency(environmentConfig = environmentConfigStorage.initialize()) },
+ )
}
loadNativeLibraries()
@@ -216,7 +235,7 @@ abstract class TangemApplication : Application(), ImageLoaderFactory {
derivationsFinder = DerivationsFinder(
appPreferencesStore = appPreferencesStore,
- dispatchers = AppCoroutineDispatcherProvider(),
+ dispatchers = dispatchers,
)
appStateHolder.mainStore = store
@@ -258,6 +277,8 @@ abstract class TangemApplication : Application(), ImageLoaderFactory {
onrampFeatureToggles = onrampFeatureToggles,
environmentConfigStorage = environmentConfigStorage,
onboardingV2FeatureToggles = onboardingV2FeatureToggles,
+ onboardingRepository = onboardingRepository,
+ excludedBlockchains = excludedBlockchains,
appPreferencesStore = appPreferencesStore,
),
),
diff --git a/app/src/main/java/com/tangem/tap/common/DialogManager.kt b/app/src/main/java/com/tangem/tap/common/DialogManager.kt
index 333923e760..b4df44bdff 100644
--- a/app/src/main/java/com/tangem/tap/common/DialogManager.kt
+++ b/app/src/main/java/com/tangem/tap/common/DialogManager.kt
@@ -140,11 +140,22 @@ class DialogManager : StoreSubscriber {
message = state.dialog.error.message,
context = context,
)
+ is WalletConnectDialog.UnsupportedWcVersion -> SimpleAlertDialog.create(
+ titleRes = R.string.common_error,
+ messageRes = R.string.unsupported_wc_version,
+ context = context,
+ )
is BackupDialog.AttestationFailed -> AttestationFailedDialog.create(context)
is BackupDialog.AddMoreBackupCards -> AddMoreBackupCardsDialog.create(context)
is BackupDialog.BackupInProgress -> BackupInProgressDialog.create(context)
- is BackupDialog.UnfinishedBackupFound -> UnfinishedBackupFoundDialog.create(context)
- is BackupDialog.ConfirmDiscardingBackup -> ConfirmDiscardingBackupDialog.create(context)
+ is BackupDialog.UnfinishedBackupFound -> UnfinishedBackupFoundDialog.create(
+ context = context,
+ scanResponse = state.dialog.scanResponse,
+ )
+ is BackupDialog.ConfirmDiscardingBackup -> ConfirmDiscardingBackupDialog.create(
+ context = context,
+ unfinishedBackupScanResponse = state.dialog.scanResponse,
+ )
is BackupDialog.ResetBackupCard -> ResetBackupCardDialog.create(
context = context,
cardId = state.dialog.cardId,
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/events/MainScreen.kt b/app/src/main/java/com/tangem/tap/common/analytics/events/MainScreen.kt
deleted file mode 100644
index f97dca3a02..0000000000
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/MainScreen.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.tangem.tap.common.analytics.events
-
-import com.tangem.core.analytics.models.AnalyticsEvent
-
-/**
-[REDACTED_AUTHOR]
- */
-sealed class MainScreen(
- event: String,
- params: Map = mapOf(),
-) : AnalyticsEvent("Main Screen", event, params) {
-
- class ScreenOpened : MainScreen("Screen opened")
- class ButtonScanCard : MainScreen("Button - Scan Card")
-
- class EnableBiometrics(state: AnalyticsParam.OnOffState) : MainScreen(
- event = "Enable Biometric",
- params = mapOf("State" to state.value),
- )
-
- class NoticeRateAppButton(result: AnalyticsParam.RateApp) : MainScreen(
- event = "Notice - Rate The App Button Tapped",
- params = mapOf("Result" to result.value),
- )
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/events/Push.kt b/app/src/main/java/com/tangem/tap/common/analytics/events/Push.kt
new file mode 100644
index 0000000000..46c647b06f
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/Push.kt
@@ -0,0 +1,13 @@
+package com.tangem.tap.common.analytics.events
+
+import com.tangem.core.analytics.models.AnalyticsEvent
+
+internal sealed class Push(event: String) : AnalyticsEvent(
+ category = "Push",
+ event = event,
+ params = emptyMap(),
+ error = null,
+) {
+
+ data object PushNotificationOpened : Push(event = "Push Notification Opened")
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/events/SignIn.kt b/app/src/main/java/com/tangem/tap/common/analytics/events/SignIn.kt
index de174fd193..212969481a 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/SignIn.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/SignIn.kt
@@ -11,7 +11,7 @@ sealed class SignIn(
error: Throwable? = null,
) : AnalyticsEvent("Sign In", event, params, error) {
- class ScreenOpened : SignIn(event = "Sing In Screen Opened")
+ class ScreenOpened : SignIn(event = "Sign In Screen Opened")
class ButtonBiometricSignIn : SignIn(event = "Button - Biometric Sign In")
class ButtonCardSignIn : SignIn(event = "Button - Card Sign In")
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/events/WalletConnect.kt b/app/src/main/java/com/tangem/tap/common/analytics/events/WalletConnect.kt
index 6ea8b5b88f..d2870bbb6a 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/WalletConnect.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/WalletConnect.kt
@@ -12,11 +12,12 @@ internal sealed class WalletConnect(
) : AnalyticsEvent("Wallet Connect", event, params, error) {
class ScreenOpened : WalletConnect(event = "WC Screen Opened")
- class NewSessionEstablished(dAppName: String, dAppUrl: String) : WalletConnect(
+ class NewSessionEstablished(dAppName: String, dAppUrl: String, blockchainNames: List) : WalletConnect(
event = "New Session Established",
params = mapOf(
AnalyticsParam.DAPP_NAME to dAppName,
AnalyticsParam.DAPP_URL to dAppUrl,
+ AnalyticsParam.BLOCKCHAIN to blockchainNames.joinToString(","),
),
)
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/paramsInterceptor/CardContextInterceptor.kt b/app/src/main/java/com/tangem/tap/common/analytics/paramsInterceptor/CardContextInterceptor.kt
index edc221250e..42a7f46c75 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/paramsInterceptor/CardContextInterceptor.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/paramsInterceptor/CardContextInterceptor.kt
@@ -9,7 +9,6 @@ import com.tangem.domain.wallets.builder.UserWalletIdBuilder
import com.tangem.tap.common.analytics.converters.ParamCardCurrencyConverter
import com.tangem.tap.common.analytics.events.AnalyticsParam
import com.tangem.tap.common.analytics.events.IntroductionProcess
-import com.tangem.tap.common.analytics.events.MainScreen
import com.tangem.tap.common.extensions.inject
import com.tangem.tap.features.demo.DemoHelper
import com.tangem.tap.proxy.redux.DaggerGraphState
@@ -31,7 +30,7 @@ class CardContextInterceptor(
override fun canBeAppliedTo(event: AnalyticsEvent): Boolean {
return when (event) {
- is IntroductionProcess.ButtonScanCard, is MainScreen.ButtonScanCard -> false
+ is IntroductionProcess.ButtonScanCard -> false
else -> true
}
}
diff --git a/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt b/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt
deleted file mode 100644
index 08c1b72a81..0000000000
--- a/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.tangem.tap.common.extensions
-
-import com.tangem.blockchain.common.Blockchain
-import com.tangem.common.extensions.remove
-
-fun Blockchain.getNetworkStandardName(): String {
- return when (this) {
- Blockchain.Ethereum, Blockchain.EthereumTestnet -> "ERC20"
- Blockchain.BSC, Blockchain.BSCTestnet -> "BEP20"
- Blockchain.Binance, Blockchain.BinanceTestnet -> "BEP2"
- Blockchain.Tron, Blockchain.TronTestnet -> "TRC20"
- Blockchain.TON -> "TON"
- else -> ""
- }
-}
-
-val Blockchain.networkNameWithoutTestnet
- get() = this.getNetworkName().remove(" Testnet")
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/extensions/WalletManager.kt b/app/src/main/java/com/tangem/tap/common/extensions/WalletManager.kt
index 5347ee2efc..d16033568b 100644
--- a/app/src/main/java/com/tangem/tap/common/extensions/WalletManager.kt
+++ b/app/src/main/java/com/tangem/tap/common/extensions/WalletManager.kt
@@ -43,7 +43,7 @@ suspend fun WalletManager.safeUpdate(isDemoCard: Boolean): Result = try
Result.Failure(TapError.NoInternetConnection)
} else {
val blockchain = wallet.blockchain
- val amountToCreateAccount = blockchain.amountToCreateAccount(wallet.getFirstToken())
+ val amountToCreateAccount = blockchain.amountToCreateAccount(this, wallet.getFirstToken())
if (exception is BlockchainSdkError.AccountNotFound && amountToCreateAccount != null) {
Result.Failure(TapError.WalletManager.NoAccountError(amountToCreateAccount.toString()))
diff --git a/app/src/main/java/com/tangem/tap/common/pushes/TangemPushNotificationService.kt b/app/src/main/java/com/tangem/tap/common/pushes/TangemPushNotificationService.kt
index 4a207104ca..c80f34373b 100644
--- a/app/src/main/java/com/tangem/tap/common/pushes/TangemPushNotificationService.kt
+++ b/app/src/main/java/com/tangem/tap/common/pushes/TangemPushNotificationService.kt
@@ -18,6 +18,7 @@ import com.google.firebase.messaging.RemoteMessage
import com.tangem.domain.common.LogConfig
import com.tangem.tap.MainActivity
import com.tangem.tap.common.images.createCoilImageLoader
+import com.tangem.tap.features.intentHandler.handlers.OnPushClickedIntentHandler
import com.tangem.wallet.R
import timber.log.Timber
@@ -37,6 +38,7 @@ internal class TangemPushNotificationService : FirebaseMessagingService() {
// TODO refactoring: [REDACTED_JIRA]
val intent = Intent(applicationContext, MainActivity::class.java)
+ intent.putExtra(OnPushClickedIntentHandler.IS_OPENED_FROM_PUSH, true)
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
val pendingIntent = PendingIntent.getActivity(
/* context = */ this,
diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMiddleware.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMiddleware.kt
index c4366e8215..b8865305c5 100644
--- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMiddleware.kt
@@ -64,12 +64,16 @@ private fun handleAction(action: Action, appState: () -> AppState?) {
}
val cardProvider: () -> CardDTO? = { scanResponseProvider.invoke()?.card }
+ val buyService = makeBuyExchangeService(config)
+ val sellService = makeSellExchangeService(config)
val exchangeManager = CurrencyExchangeManager(
- buyService = makeBuyExchangeService(config),
- sellService = makeSellExchangeService(config),
+ buyService = buyService,
+ sellService = sellService,
primaryRules = CardExchangeRules(cardProvider),
)
// TODO: for refactoring (after remove old design refactor CurrencyExchangeManager and use 1 instance)
+ store.inject(DaggerGraphState::appStateHolder).buyService = buyService
+ store.inject(DaggerGraphState::appStateHolder).sellService = sellService
store.inject(DaggerGraphState::appStateHolder).exchangeService = exchangeManager
store.dispatchOnMain(GlobalAction.ExchangeManager.Init.Success(exchangeManager))
store.dispatchOnMain(GlobalAction.ExchangeManager.Update)
diff --git a/app/src/main/java/com/tangem/tap/di/ActivityModule.kt b/app/src/main/java/com/tangem/tap/di/ActivityModule.kt
index c8d8c5c2bf..85d5a6630b 100644
--- a/app/src/main/java/com/tangem/tap/di/ActivityModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/ActivityModule.kt
@@ -1,15 +1,23 @@
package com.tangem.tap.di
+import com.tangem.blockchainsdk.utils.ExcludedBlockchains
+import com.tangem.datasource.exchangeservice.swap.ExpressServiceLoader
+import com.tangem.datasource.local.token.ExpressAssetsStore
import com.tangem.domain.card.ScanCardUseCase
import com.tangem.domain.card.repository.CardSdkConfigRepository
import com.tangem.domain.exchange.RampStateManager
+import com.tangem.domain.tokens.GetNetworkCoinStatusUseCase
import com.tangem.domain.tokens.GetPolkadotCheckHasImmortalUseCase
import com.tangem.domain.tokens.GetPolkadotCheckHasResetUseCase
+import com.tangem.domain.tokens.repository.CurrenciesRepository
import com.tangem.domain.tokens.repository.PolkadotAccountHealthCheckRepository
+import com.tangem.features.onramp.OnrampFeatureToggles
import com.tangem.sdk.api.TangemSdkManager
import com.tangem.tap.domain.scanCard.repository.DefaultScanCardRepository
import com.tangem.tap.network.exchangeServices.DefaultRampManager
import com.tangem.tap.proxy.AppStateHolder
+import com.tangem.utils.Provider
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
@@ -39,8 +47,28 @@ internal object ActivityModule {
@Provides
@Singleton
- fun provideDefaultRampManager(appStateHolder: AppStateHolder): RampStateManager {
- return DefaultRampManager(appStateHolder.exchangeService)
+ fun provideDefaultRampManager(
+ appStateHolder: AppStateHolder,
+ expressServiceLoader: ExpressServiceLoader,
+ currenciesRepository: CurrenciesRepository,
+ getNetworkCoinStatusUseCase: GetNetworkCoinStatusUseCase,
+ excludedBlockchains: ExcludedBlockchains,
+ dispatchers: CoroutineDispatcherProvider,
+ onrampFeatureToggles: OnrampFeatureToggles,
+ expressAssetsStore: ExpressAssetsStore,
+ ): RampStateManager {
+ return DefaultRampManager(
+ exchangeService = appStateHolder.exchangeService,
+ buyService = Provider { requireNotNull(appStateHolder.buyService) },
+ sellService = Provider { requireNotNull(appStateHolder.sellService) },
+ expressServiceLoader = expressServiceLoader,
+ currenciesRepository = currenciesRepository,
+ getNetworkCoinStatusUseCase = getNetworkCoinStatusUseCase,
+ excludedBlockchains = excludedBlockchains,
+ dispatchers = dispatchers,
+ onrampFeatureToggles = onrampFeatureToggles,
+ expressAssetsStore = expressAssetsStore,
+ )
}
@Provides
diff --git a/app/src/main/java/com/tangem/tap/di/TangemSdkModule.kt b/app/src/main/java/com/tangem/tap/di/TangemSdkModule.kt
new file mode 100644
index 0000000000..b2f2f6d5c5
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/di/TangemSdkModule.kt
@@ -0,0 +1,17 @@
+package com.tangem.tap.di
+
+import com.tangem.sdk.api.BackupServiceHolder
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal object TangemSdkModule {
+
+ @Provides
+ @Singleton
+ fun provideBackupServiceHolder(): BackupServiceHolder = BackupServiceHolder()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/di/data/CardDataModule.kt b/app/src/main/java/com/tangem/tap/di/data/CardDataModule.kt
index 66d63389c9..34411415bf 100644
--- a/app/src/main/java/com/tangem/tap/di/data/CardDataModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/data/CardDataModule.kt
@@ -1,5 +1,6 @@
package com.tangem.tap.di.data
+import com.tangem.blockchainsdk.utils.ExcludedBlockchains
import com.tangem.datasource.local.userwallet.UserWalletsStore
import com.tangem.domain.card.repository.DerivationsRepository
import com.tangem.sdk.api.TangemSdkManager
@@ -20,8 +21,9 @@ internal object CardDataModule {
fun providesDerivationsRepository(
tangemSdkManager: TangemSdkManager,
userWalletsStore: UserWalletsStore,
+ excludedBlockchains: ExcludedBlockchains,
dispatchers: CoroutineDispatcherProvider,
): DerivationsRepository {
- return DefaultDerivationsRepository(tangemSdkManager, userWalletsStore, dispatchers)
+ return DefaultDerivationsRepository(tangemSdkManager, userWalletsStore, excludedBlockchains, dispatchers)
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/di/domain/CardLegacyDomainModule.kt b/app/src/main/java/com/tangem/tap/di/domain/CardLegacyDomainModule.kt
index 12b071ad16..38adc6ec9e 100644
--- a/app/src/main/java/com/tangem/tap/di/domain/CardLegacyDomainModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/domain/CardLegacyDomainModule.kt
@@ -1,6 +1,6 @@
package com.tangem.tap.di.domain
-import com.tangem.core.featuretoggle.manager.FeatureTogglesManager
+import com.tangem.core.configtoggle.feature.FeatureTogglesManager
import com.tangem.domain.card.ScanCardProcessor
import com.tangem.domain.wallets.legacy.UserWalletsListManager
import com.tangem.domain.wallets.usecase.GenerateWalletNameUseCase
diff --git a/app/src/main/java/com/tangem/tap/di/domain/OnrampDomainModule.kt b/app/src/main/java/com/tangem/tap/di/domain/OnrampDomainModule.kt
new file mode 100644
index 0000000000..ca9f43d672
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/di/domain/OnrampDomainModule.kt
@@ -0,0 +1,232 @@
+package com.tangem.tap.di.domain
+
+import com.tangem.domain.onramp.*
+import com.tangem.domain.onramp.repositories.OnrampErrorResolver
+import com.tangem.domain.onramp.repositories.OnrampRepository
+import com.tangem.domain.onramp.repositories.OnrampTransactionRepository
+import com.tangem.domain.settings.repositories.SettingsRepository
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Suppress("TooManyFunctions")
+@Module
+@InstallIn(SingletonComponent::class)
+internal object OnrampDomainModule {
+
+ @Provides
+ @Singleton
+ fun provideGetOnrampCurrenciesUseCase(
+ onrampRepository: OnrampRepository,
+ onrampErrorResolver: OnrampErrorResolver,
+ ): GetOnrampCurrenciesUseCase {
+ return GetOnrampCurrenciesUseCase(onrampRepository, onrampErrorResolver)
+ }
+
+ @Provides
+ @Singleton
+ fun provideOnrampSaveDefaultCurrencyUseCase(
+ onrampRepository: OnrampRepository,
+ onrampErrorResolver: OnrampErrorResolver,
+ ): OnrampSaveDefaultCurrencyUseCase {
+ return OnrampSaveDefaultCurrencyUseCase(onrampRepository, onrampErrorResolver)
+ }
+
+ @Provides
+ @Singleton
+ fun provideGetOnrampCountriesUseCase(
+ onrampRepository: OnrampRepository,
+ onrampErrorResolver: OnrampErrorResolver,
+ ): GetOnrampCountriesUseCase {
+ return GetOnrampCountriesUseCase(onrampRepository, onrampErrorResolver)
+ }
+
+ @Provides
+ @Singleton
+ fun provideGetOnrampCountryUseCase(
+ onrampRepository: OnrampRepository,
+ onrampErrorResolver: OnrampErrorResolver,
+ ): GetOnrampCountryUseCase {
+ return GetOnrampCountryUseCase(onrampRepository, onrampErrorResolver)
+ }
+
+ @Provides
+ @Singleton
+ fun provideOnrampSaveDefaultCountryUseCase(
+ onrampRepository: OnrampRepository,
+ onrampErrorResolver: OnrampErrorResolver,
+ ): OnrampSaveDefaultCountryUseCase {
+ return OnrampSaveDefaultCountryUseCase(onrampRepository, onrampErrorResolver)
+ }
+
+ @Provides
+ @Singleton
+ fun provideCheckOnrampAvailabilityUseCase(
+ onrampRepository: OnrampRepository,
+ onrampErrorResolver: OnrampErrorResolver,
+ ): CheckOnrampAvailabilityUseCase {
+ return CheckOnrampAvailabilityUseCase(onrampRepository, onrampErrorResolver)
+ }
+
+ @Provides
+ @Singleton
+ fun provideGetOnrampStatusUseCase(
+ onrampRepository: OnrampRepository,
+ onrampErrorResolver: OnrampErrorResolver,
+ ): GetOnrampStatusUseCase {
+ return GetOnrampStatusUseCase(
+ onrampRepository,
+ onrampErrorResolver,
+ )
+ }
+
+ @Provides
+ @Singleton
+ fun provideGetOnrampTransactionsUseCase(
+ onrampTransactionRepository: OnrampTransactionRepository,
+ onrampErrorResolver: OnrampErrorResolver,
+ ): GetOnrampTransactionsUseCase {
+ return GetOnrampTransactionsUseCase(onrampTransactionRepository, onrampErrorResolver)
+ }
+
+ @Provides
+ @Singleton
+ fun provideGetOnrampTransactionUseCase(
+ onrampTransactionRepository: OnrampTransactionRepository,
+ onrampErrorResolver: OnrampErrorResolver,
+ ): GetOnrampTransactionUseCase {
+ return GetOnrampTransactionUseCase(onrampTransactionRepository, onrampErrorResolver)
+ }
+
+ @Provides
+ @Singleton
+ fun provideOnrampRemoveTransactionUseCase(
+ onrampTransactionRepository: OnrampTransactionRepository,
+ onrampErrorResolver: OnrampErrorResolver,
+ ): OnrampRemoveTransactionUseCase {
+ return OnrampRemoveTransactionUseCase(onrampTransactionRepository, onrampErrorResolver)
+ }
+
+ @Provides
+ @Singleton
+ fun provideOnrampSaveTransactionUseCase(
+ onrampTransactionRepository: OnrampTransactionRepository,
+ onrampErrorResolver: OnrampErrorResolver,
+ ): OnrampSaveTransactionUseCase {
+ return OnrampSaveTransactionUseCase(onrampTransactionRepository, onrampErrorResolver)
+ }
+
+ @Provides
+ @Singleton
+ fun provideOnrampUpdateTransactionStatusUseCase(
+ onrampTransactionRepository: OnrampTransactionRepository,
+ onrampErrorResolver: OnrampErrorResolver,
+ ): OnrampUpdateTransactionStatusUseCase {
+ return OnrampUpdateTransactionStatusUseCase(onrampTransactionRepository, onrampErrorResolver)
+ }
+
+ @Provides
+ @Singleton
+ fun provideGetOnrampPaymentMethodsUseCase(
+ onrampRepository: OnrampRepository,
+ settingsRepository: SettingsRepository,
+ onrampErrorResolver: OnrampErrorResolver,
+ ): GetOnrampPaymentMethodsUseCase {
+ return GetOnrampPaymentMethodsUseCase(onrampRepository, settingsRepository, onrampErrorResolver)
+ }
+
+ @Provides
+ @Singleton
+ fun provideClearOnrampCacheUseCase(onrampRepository: OnrampRepository): ClearOnrampCacheUseCase {
+ return ClearOnrampCacheUseCase(onrampRepository)
+ }
+
+ @Provides
+ @Singleton
+ fun provideOnrampFetchQuotesUseCase(
+ onrampRepository: OnrampRepository,
+ onrampErrorResolver: OnrampErrorResolver,
+ ): OnrampFetchQuotesUseCase {
+ return OnrampFetchQuotesUseCase(onrampRepository, onrampErrorResolver)
+ }
+
+ @Provides
+ @Singleton
+ fun provideGetOnrampQuotesUseCase(
+ settingsRepository: SettingsRepository,
+ onrampRepository: OnrampRepository,
+ onrampErrorResolver: OnrampErrorResolver,
+ ): GetOnrampQuotesUseCase {
+ return GetOnrampQuotesUseCase(
+ settingsRepository = settingsRepository,
+ repository = onrampRepository,
+ errorResolver = onrampErrorResolver,
+ )
+ }
+
+ @Provides
+ @Singleton
+ fun provideGetOnrampSelectedPaymentMethodUseCase(
+ onrampRepository: OnrampRepository,
+ onrampErrorResolver: OnrampErrorResolver,
+ ): GetOnrampSelectedPaymentMethodUseCase {
+ return GetOnrampSelectedPaymentMethodUseCase(onrampRepository, onrampErrorResolver)
+ }
+
+ @Provides
+ @Singleton
+ fun provideGetOnrampProviderWithQuoteUseCase(
+ onrampRepository: OnrampRepository,
+ onrampErrorResolver: OnrampErrorResolver,
+ ): GetOnrampProviderWithQuoteUseCase {
+ return GetOnrampProviderWithQuoteUseCase(onrampRepository, onrampErrorResolver)
+ }
+
+ @Provides
+ @Singleton
+ fun provideOnrampSaveSelectedPaymentMethod(
+ onrampRepository: OnrampRepository,
+ onrampErrorResolver: OnrampErrorResolver,
+ ): OnrampSaveSelectedPaymentMethod {
+ return OnrampSaveSelectedPaymentMethod(onrampRepository, onrampErrorResolver)
+ }
+
+ @Provides
+ @Singleton
+ fun provideOnrampFetchPairsUseCase(
+ onrampRepository: OnrampRepository,
+ onrampErrorResolver: OnrampErrorResolver,
+ ): OnrampFetchPairsUseCase {
+ return OnrampFetchPairsUseCase(onrampRepository, onrampErrorResolver)
+ }
+
+ @Provides
+ @Singleton
+ fun provideGetOnrampRedirectUrlUseCase(
+ onrampRepository: OnrampRepository,
+ transactionRepository: OnrampTransactionRepository,
+ onrampErrorResolver: OnrampErrorResolver,
+ ): GetOnrampRedirectUrlUseCase {
+ return GetOnrampRedirectUrlUseCase(onrampRepository, transactionRepository, onrampErrorResolver)
+ }
+
+ @Provides
+ @Singleton
+ fun provideFetchOnrampCurrenciesUseCase(
+ onrampRepository: OnrampRepository,
+ onrampErrorResolver: OnrampErrorResolver,
+ ): FetchOnrampCurrenciesUseCase {
+ return FetchOnrampCurrenciesUseCase(onrampRepository, onrampErrorResolver)
+ }
+
+ @Provides
+ @Singleton
+ fun provideFetchOnrampCountriesUseCase(
+ onrampRepository: OnrampRepository,
+ onrampErrorResolver: OnrampErrorResolver,
+ ): FetchOnrampCountriesUseCase {
+ return FetchOnrampCountriesUseCase(onrampRepository, onrampErrorResolver)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/di/domain/SettingsDomainModule.kt b/app/src/main/java/com/tangem/tap/di/domain/SettingsDomainModule.kt
index 8ec26eb230..352171f53a 100644
--- a/app/src/main/java/com/tangem/tap/di/domain/SettingsDomainModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/domain/SettingsDomainModule.kt
@@ -133,14 +133,6 @@ internal object SettingsDomainModule {
return ShouldShowRingPromoUseCase(promoSettingsRepository)
}
- @Provides
- @Singleton
- fun provideShouldShowTravalaPromoWalletUseCase(
- promoSettingsRepository: PromoSettingsRepository,
- ): ShouldShowTravalaPromoWalletUseCase {
- return ShouldShowTravalaPromoWalletUseCase(promoSettingsRepository)
- }
-
@Provides
@Singleton
fun provideShouldShowSwapPromoTokenUseCase(
@@ -234,4 +226,36 @@ internal object SettingsDomainModule {
fun provideGetUserCountryCodeUseCase(settingsRepository: SettingsRepository): GetUserCountryUseCase {
return GetUserCountryUseCase(settingsRepository)
}
+
+ // region Google services availability
+ @Provides
+ @Singleton
+ fun provideSetGoogleServicesAvailabilityUseCase(
+ settingsRepository: SettingsRepository,
+ ): SetGoogleServicesAvailabilityUseCase {
+ return SetGoogleServicesAvailabilityUseCase(settingsRepository)
+ }
+
+ @Provides
+ @Singleton
+ fun provideIsGoogleServicesAvailableUseCase(
+ settingsRepository: SettingsRepository,
+ ): IsGoogleServicesAvailableUseCase {
+ return IsGoogleServicesAvailableUseCase(settingsRepository)
+ }
+
+ @Provides
+ @Singleton
+ fun provideSetGooglePayAvailabilityUseCase(
+ settingsRepository: SettingsRepository,
+ ): SetGooglePayAvailabilityUseCase {
+ return SetGooglePayAvailabilityUseCase(settingsRepository)
+ }
+
+ @Provides
+ @Singleton
+ fun provideIsGooglePayAvailableUseCase(settingsRepository: SettingsRepository): IsGooglePayAvailableUseCase {
+ return IsGooglePayAvailableUseCase(settingsRepository)
+ }
+ // endregion
}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/di/domain/SwapDomainModule.kt b/app/src/main/java/com/tangem/tap/di/domain/SwapDomainModule.kt
new file mode 100644
index 0000000000..e94429b646
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/di/domain/SwapDomainModule.kt
@@ -0,0 +1,23 @@
+package com.tangem.tap.di.domain
+
+import com.tangem.feature.swap.domain.GetAvailablePairsUseCase
+import com.tangem.feature.swap.domain.api.SwapRepository
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+/**
+[REDACTED_AUTHOR]
+ */
+@Module
+@InstallIn(SingletonComponent::class)
+internal object SwapDomainModule {
+
+ @Provides
+ @Singleton
+ fun provideGetAvailablePairsUseCase(swapRepository: SwapRepository): GetAvailablePairsUseCase {
+ return GetAvailablePairsUseCase(swapRepository = swapRepository)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/di/domain/TokensDomainModule.kt b/app/src/main/java/com/tangem/tap/di/domain/TokensDomainModule.kt
index 7e547182ce..9bea3ac624 100644
--- a/app/src/main/java/com/tangem/tap/di/domain/TokensDomainModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/domain/TokensDomainModule.kt
@@ -7,7 +7,6 @@ import com.tangem.domain.tokens.*
import com.tangem.domain.tokens.repository.*
import com.tangem.domain.walletmanager.WalletManagersFacade
import com.tangem.feature.swap.domain.api.SwapRepository
-import com.tangem.features.staking.api.featuretoggles.StakingFeatureToggles
import com.tangem.utils.coroutines.CoroutineDispatcherProvider
import dagger.Module
import dagger.Provides
@@ -119,26 +118,26 @@ internal object TokensDomainModule {
currenciesRepository: CurrenciesRepository,
quotesRepository: QuotesRepository,
networksRepository: NetworksRepository,
- marketCryptoCurrencyRepository: MarketCryptoCurrencyRepository,
swapRepository: SwapRepository,
currencyChecksRepository: CurrencyChecksRepository,
showSwapPromoTokenUseCase: ShouldShowSwapPromoTokenUseCase,
promoRepository: PromoRepository,
stakingRepository: StakingRepository,
dispatchers: CoroutineDispatcherProvider,
+ rampStateManager: RampStateManager,
): GetCurrencyWarningsUseCase {
return GetCurrencyWarningsUseCase(
walletManagersFacade = walletManagersFacade,
currenciesRepository = currenciesRepository,
quotesRepository = quotesRepository,
networksRepository = networksRepository,
- marketCryptoCurrencyRepository = marketCryptoCurrencyRepository,
currencyChecksRepository = currencyChecksRepository,
swapRepository = swapRepository,
showSwapPromoTokenUseCase = showSwapPromoTokenUseCase,
promoRepository = promoRepository,
stakingRepository = stakingRepository,
dispatchers = dispatchers,
+ rampStateManager = rampStateManager,
)
}
@@ -216,23 +215,19 @@ internal object TokensDomainModule {
fun provideGetCryptoCurrencyActionsUseCase(
rampStateManager: RampStateManager,
walletManagersFacade: WalletManagersFacade,
- marketCryptoCurrencyRepository: MarketCryptoCurrencyRepository,
currenciesRepository: CurrenciesRepository,
quotesRepository: QuotesRepository,
networksRepository: NetworksRepository,
stakingRepository: StakingRepository,
- stakingFeatureToggles: StakingFeatureToggles,
dispatchers: CoroutineDispatcherProvider,
): GetCryptoCurrencyActionsUseCase {
return GetCryptoCurrencyActionsUseCase(
rampManager = rampStateManager,
walletManagersFacade = walletManagersFacade,
- marketCryptoCurrencyRepository = marketCryptoCurrencyRepository,
currenciesRepository = currenciesRepository,
quotesRepository = quotesRepository,
networksRepository = networksRepository,
stakingRepository = stakingRepository,
- stakingFeatureToggles = stakingFeatureToggles,
dispatchers = dispatchers,
)
}
diff --git a/app/src/main/java/com/tangem/tap/di/domain/TransactionDomainModule.kt b/app/src/main/java/com/tangem/tap/di/domain/TransactionDomainModule.kt
index 73c0236567..507a284a76 100644
--- a/app/src/main/java/com/tangem/tap/di/domain/TransactionDomainModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/domain/TransactionDomainModule.kt
@@ -58,6 +58,28 @@ internal object TransactionDomainModule {
)
}
+ @Provides
+ @Singleton
+ fun provideRetryTransactionUseCase(
+ cardSdkConfigRepository: CardSdkConfigRepository,
+ walletManagersFacade: WalletManagersFacade,
+ ): RetryIncompleteTransactionUseCase {
+ return RetryIncompleteTransactionUseCase(
+ cardSdkConfigRepository = cardSdkConfigRepository,
+ walletManagersFacade = walletManagersFacade,
+ )
+ }
+
+ @Provides
+ @Singleton
+ fun provideDismissIncompleteTransactionUseCase(
+ walletManagersFacade: WalletManagersFacade,
+ ): DismissIncompleteTransactionUseCase {
+ return DismissIncompleteTransactionUseCase(
+ walletManagersFacade = walletManagersFacade,
+ )
+ }
+
@Provides
@Singleton
fun provideCreateTransactionUseCase(transactionRepository: TransactionRepository): CreateTransactionUseCase {
diff --git a/app/src/main/java/com/tangem/tap/domain/card/DefaultDerivationsRepository.kt b/app/src/main/java/com/tangem/tap/domain/card/DefaultDerivationsRepository.kt
index 45cc75e9da..f9e14a3a11 100644
--- a/app/src/main/java/com/tangem/tap/domain/card/DefaultDerivationsRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/card/DefaultDerivationsRepository.kt
@@ -1,6 +1,7 @@
package com.tangem.tap.domain.card
import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchainsdk.utils.ExcludedBlockchains
import com.tangem.blockchainsdk.utils.fromNetworkId
import com.tangem.common.CompletionResult
import com.tangem.common.card.EllipticCurve
@@ -32,6 +33,7 @@ private typealias DerivedKeys = Map
internal class DefaultDerivationsRepository(
private val tangemSdkManager: TangemSdkManager,
private val userWalletsStore: UserWalletsStore,
+ private val excludedBlockchains: ExcludedBlockchains,
private val dispatchers: CoroutineDispatcherProvider,
) : DerivationsRepository {
@@ -49,6 +51,7 @@ internal class DefaultDerivationsRepository(
blockchain = Blockchain.fromNetworkId(it.value) ?: return@mapNotNull null,
extraDerivationPath = null,
scanResponse = userWallet.scanResponse,
+ excludedBlockchains = excludedBlockchains,
)
},
)
@@ -85,6 +88,7 @@ internal class DefaultDerivationsRepository(
blockchain = Blockchain.fromNetworkId(backendId) ?: return@mapNotNull null,
extraDerivationPath = extraDerivationPath,
scanResponse = userWallet.scanResponse,
+ excludedBlockchains = excludedBlockchains,
)
},
)
diff --git a/app/src/main/java/com/tangem/tap/domain/scanCard/CardScanningFeatureToggles.kt b/app/src/main/java/com/tangem/tap/domain/scanCard/CardScanningFeatureToggles.kt
index 904cfe1673..59310f93b5 100644
--- a/app/src/main/java/com/tangem/tap/domain/scanCard/CardScanningFeatureToggles.kt
+++ b/app/src/main/java/com/tangem/tap/domain/scanCard/CardScanningFeatureToggles.kt
@@ -1,6 +1,6 @@
package com.tangem.tap.domain.scanCard
-import com.tangem.core.featuretoggle.manager.FeatureTogglesManager
+import com.tangem.core.configtoggle.feature.FeatureTogglesManager
/**
* Add custom token feature toggles
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/di/UserWalletsListManagerModule.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/di/UserWalletsListManagerModule.kt
index 1128c659f5..2885696de1 100644
--- a/app/src/main/java/com/tangem/tap/domain/userWalletList/di/UserWalletsListManagerModule.kt
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/di/UserWalletsListManagerModule.kt
@@ -7,6 +7,7 @@ import com.tangem.common.authentication.storage.AuthenticatedStorage
import com.tangem.common.json.TangemSdkAdapter
import com.tangem.common.services.secure.SecureStorage
import com.tangem.datasource.local.preferences.AppPreferencesStore
+import com.tangem.domain.models.scan.serialization.*
import com.tangem.domain.wallets.legacy.UserWalletsListManager
import com.tangem.sdk.storage.AndroidSecureStorage
import com.tangem.sdk.storage.createEncryptedSharedPreferences
@@ -19,7 +20,6 @@ import com.tangem.tap.domain.userWalletList.repository.implementation.BiometricU
import com.tangem.tap.domain.userWalletList.repository.implementation.DefaultSelectedUserWalletRepository
import com.tangem.tap.domain.userWalletList.repository.implementation.DefaultUserWalletsPublicInformationRepository
import com.tangem.tap.domain.userWalletList.repository.implementation.DefaultUserWalletsSensitiveInformationRepository
-import com.tangem.tap.domain.userWalletList.utils.json.*
import com.tangem.tap.tangemSdkManager
import com.tangem.utils.Provider
import com.tangem.utils.coroutines.CoroutineDispatcherProvider
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/ByteArrayListExtensions.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/ByteArrayListExtensions.kt
deleted file mode 100644
index fa3d2aefba..0000000000
--- a/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/ByteArrayListExtensions.kt
+++ /dev/null
@@ -1 +0,0 @@
-package com.tangem.tap.domain.userWalletList.utils
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/walletconnect2/data/DefaultLegacyWalletConnectRepository.kt b/app/src/main/java/com/tangem/tap/domain/walletconnect2/data/DefaultLegacyWalletConnectRepository.kt
index 9e980da2ba..776836a294 100644
--- a/app/src/main/java/com/tangem/tap/domain/walletconnect2/data/DefaultLegacyWalletConnectRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/walletconnect2/data/DefaultLegacyWalletConnectRepository.kt
@@ -2,6 +2,11 @@ package com.tangem.tap.domain.walletconnect2.data
import android.app.Application
import arrow.core.flatten
+import com.reown.android.Core
+import com.reown.android.CoreClient
+import com.reown.android.relay.ConnectionType
+import com.reown.walletkit.client.Wallet
+import com.reown.walletkit.client.WalletKit
import com.tangem.core.analytics.api.AnalyticsEventHandler
import com.tangem.tap.common.analytics.events.WalletConnect
import com.tangem.tap.domain.walletconnect2.domain.LegacyWalletConnectRepository
@@ -9,11 +14,6 @@ import com.tangem.tap.domain.walletconnect2.domain.WcJrpcMethods
import com.tangem.tap.domain.walletconnect2.domain.WcJrpcRequestsDeserializer
import com.tangem.tap.domain.walletconnect2.domain.WcRequest
import com.tangem.tap.domain.walletconnect2.domain.models.*
-import com.walletconnect.android.Core
-import com.walletconnect.android.CoreClient
-import com.walletconnect.android.relay.ConnectionType
-import com.walletconnect.web3.wallet.client.Wallet
-import com.walletconnect.web3.wallet.client.Web3Wallet
import kotlinx.coroutines.*
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableSharedFlow
@@ -72,7 +72,7 @@ internal class DefaultLegacyWalletConnectRepository(
}
}
- Web3Wallet.initialize(Wallet.Params.Init(core = CoreClient)) { error ->
+ WalletKit.initialize(Wallet.Params.Init(core = CoreClient)) { error ->
Timber.e("Error while initializing Web3Wallet: $error")
scope.launch {
_events.emit(
@@ -84,11 +84,11 @@ internal class DefaultLegacyWalletConnectRepository(
}
val walletDelegate = defineWalletDelegate()
- Web3Wallet.setWalletDelegate(walletDelegate)
+ WalletKit.setWalletDelegate(walletDelegate)
}
- private fun defineWalletDelegate(): Web3Wallet.WalletDelegate {
- return object : Web3Wallet.WalletDelegate {
+ private fun defineWalletDelegate(): WalletKit.WalletDelegate {
+ return object : WalletKit.WalletDelegate {
override fun onSessionProposal(
sessionProposal: Wallet.Model.SessionProposal,
verifyContext: Wallet.Model.VerifyContext,
@@ -188,14 +188,6 @@ internal class DefaultLegacyWalletConnectRepository(
}
}
- override fun onAuthRequest(
- authRequest: Wallet.Model.AuthRequest,
- verifyContext: Wallet.Model.VerifyContext,
- ) {
- // Triggered when Dapp / Requester makes an authorization request
- Timber.i("onAuthRequest: $authRequest")
- }
-
override fun onSessionDelete(sessionDelete: Wallet.Model.SessionDelete) {
// Triggered when the session is deleted by the peer
if (sessionDelete is Wallet.Model.SessionDelete.Success) {
@@ -251,7 +243,7 @@ internal class DefaultLegacyWalletConnectRepository(
}
override fun pair(uri: String) {
- Web3Wallet.pair(
+ WalletKit.pair(
params = Wallet.Params.Pair(uri),
onSuccess = {
Timber.i("Paired successfully: $it")
@@ -267,7 +259,7 @@ internal class DefaultLegacyWalletConnectRepository(
)
}
- override fun approve(userNamespaces: Map>) {
+ override fun approve(userNamespaces: Map>, blockchainNames: List) {
val sessionProposal: Wallet.Model.SessionProposal = requireNotNull(this.sessionProposal)
val userChains = userNamespaces.flatMap { namespace ->
@@ -303,7 +295,7 @@ internal class DefaultLegacyWalletConnectRepository(
Timber.i("Session approval is prepared for sending: $sessionApproval")
- Web3Wallet.approveSession(
+ WalletKit.approveSession(
params = sessionApproval,
onSuccess = {
Timber.i("Approved successfully: $it")
@@ -311,6 +303,7 @@ internal class DefaultLegacyWalletConnectRepository(
WalletConnect.NewSessionEstablished(
dAppName = sessionProposal.name,
dAppUrl = sessionProposal.url,
+ blockchainNames = blockchainNames,
),
)
},
@@ -363,7 +356,7 @@ internal class DefaultLegacyWalletConnectRepository(
)
}
- Web3Wallet.respondSessionRequest(
+ WalletKit.respondSessionRequest(
params = Wallet.Params.SessionRequestResponse(
sessionTopic = requestData.topic,
jsonRpcResponse = Wallet.Model.JsonRpcResponse.JsonRpcResult(
@@ -408,7 +401,7 @@ internal class DefaultLegacyWalletConnectRepository(
}
override fun cancelRequest(topic: String, id: Long, message: String) {
- Web3Wallet.respondSessionRequest(
+ WalletKit.respondSessionRequest(
params = Wallet.Params.SessionRequestResponse(
sessionTopic = topic,
jsonRpcResponse = Wallet.Model.JsonRpcResponse.JsonRpcError(
@@ -423,7 +416,7 @@ internal class DefaultLegacyWalletConnectRepository(
}
override fun reject() {
- Web3Wallet.rejectSession(
+ WalletKit.rejectSession(
params = Wallet.Params.SessionReject(
proposerPublicKey = sessionProposal?.proposerPublicKey ?: "",
reason = "",
@@ -439,7 +432,7 @@ internal class DefaultLegacyWalletConnectRepository(
override fun disconnect(topic: String) {
val session = currentSessions.find { it.topic == topic }
- Web3Wallet.disconnectSession(
+ WalletKit.disconnectSession(
params = Wallet.Params.SessionDisconnect(topic),
onSuccess = {
analyticsHandler.send(
@@ -458,7 +451,7 @@ internal class DefaultLegacyWalletConnectRepository(
}
fun send(topic: String, id: Long, data: String) {
- Web3Wallet.respondSessionRequest(
+ WalletKit.respondSessionRequest(
params = Wallet.Params.SessionRequestResponse(
sessionTopic = topic,
jsonRpcResponse = Wallet.Model.JsonRpcResponse.JsonRpcResult(
@@ -476,7 +469,7 @@ internal class DefaultLegacyWalletConnectRepository(
}
private fun updateSessionsInternal(): Job = scope.launch {
- val availableSessions = Web3Wallet.getListOfActiveSessions()
+ val availableSessions = WalletKit.getListOfActiveSessions()
.map {
WalletConnectSession(
topic = it.topic,
diff --git a/app/src/main/java/com/tangem/tap/domain/walletconnect2/di/WalletConnectInteractorModule.kt b/app/src/main/java/com/tangem/tap/domain/walletconnect2/di/WalletConnectInteractorModule.kt
index cc4a3e16c4..9b7a44b10d 100644
--- a/app/src/main/java/com/tangem/tap/domain/walletconnect2/di/WalletConnectInteractorModule.kt
+++ b/app/src/main/java/com/tangem/tap/domain/walletconnect2/di/WalletConnectInteractorModule.kt
@@ -3,7 +3,7 @@ package com.tangem.tap.domain.walletconnect2.di
import android.app.Application
import com.squareup.moshi.Moshi
import com.tangem.core.analytics.api.AnalyticsEventHandler
-import com.tangem.core.featuretoggle.manager.FeatureTogglesManager
+import com.tangem.core.configtoggle.feature.FeatureTogglesManager
import com.tangem.datasource.di.SdkMoshi
import com.tangem.datasource.files.FileReader
import com.tangem.domain.tokens.repository.CurrenciesRepository
diff --git a/app/src/main/java/com/tangem/tap/domain/walletconnect2/domain/LegacyWalletConnectRepository.kt b/app/src/main/java/com/tangem/tap/domain/walletconnect2/domain/LegacyWalletConnectRepository.kt
index 616643a960..d755da5aea 100644
--- a/app/src/main/java/com/tangem/tap/domain/walletconnect2/domain/LegacyWalletConnectRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/walletconnect2/domain/LegacyWalletConnectRepository.kt
@@ -21,7 +21,7 @@ interface LegacyWalletConnectRepository {
fun disconnect(topic: String)
- fun approve(userNamespaces: Map>)
+ fun approve(userNamespaces: Map>, blockchainNames: List)
fun reject()
diff --git a/app/src/main/java/com/tangem/tap/domain/walletconnect2/domain/WalletConnectInteractor.kt b/app/src/main/java/com/tangem/tap/domain/walletconnect2/domain/WalletConnectInteractor.kt
index 9d3e956799..e53938eaf6 100644
--- a/app/src/main/java/com/tangem/tap/domain/walletconnect2/domain/WalletConnectInteractor.kt
+++ b/app/src/main/java/com/tangem/tap/domain/walletconnect2/domain/WalletConnectInteractor.kt
@@ -1,5 +1,6 @@
package com.tangem.tap.domain.walletconnect2.domain
+import arrow.core.flatten
import com.tangem.blockchain.common.Blockchain
import com.tangem.blockchainsdk.utils.toNetworkId
import com.tangem.domain.tokens.model.CryptoCurrency
@@ -236,8 +237,12 @@ class WalletConnectInteractor(
blockchainHelper.getNamespaceFromFullChainIdOrNull(account.chainId)
?.let { NetworkNamespace(it) }
}.filterNotNull()
+
+ val blockchainNames = blockchainHelper.chainIdsToBlockchains(userNamespaces.values.flatten().map { it.chainId })
+ .map { it.fullName }
walletConnectRepository.approve(
userNamespaces = userNamespaces,
+ blockchainNames = blockchainNames,
)
}
diff --git a/app/src/main/java/com/tangem/tap/domain/walletconnect2/toggles/WalletConnectFeatureToggles.kt b/app/src/main/java/com/tangem/tap/domain/walletconnect2/toggles/WalletConnectFeatureToggles.kt
index 26547d68e8..a6da04800a 100644
--- a/app/src/main/java/com/tangem/tap/domain/walletconnect2/toggles/WalletConnectFeatureToggles.kt
+++ b/app/src/main/java/com/tangem/tap/domain/walletconnect2/toggles/WalletConnectFeatureToggles.kt
@@ -1,6 +1,6 @@
package com.tangem.tap.domain.walletconnect2.toggles
-import com.tangem.core.featuretoggle.manager.FeatureTogglesManager
+import com.tangem.core.configtoggle.feature.FeatureTogglesManager
internal class WalletConnectFeatureToggles(
private val featureTogglesManager: FeatureTogglesManager,
diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectAction.kt b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectAction.kt
index 06591c01b0..476bcd288d 100644
--- a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectAction.kt
@@ -37,5 +37,7 @@ sealed class WalletConnectAction : Action {
data class PerformRequestedAction(val sessionRequest: WcPreparedRequest) : WalletConnectAction()
data class PairConnectErrorAction(val throwable: Throwable) : WalletConnectAction()
+
+ data object UnsupportedDappRequest : WalletConnectAction()
//endregion WalletConnect 2.0
}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectMiddleware.kt b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectMiddleware.kt
index facfd60eab..fd477038f6 100644
--- a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectMiddleware.kt
@@ -78,6 +78,12 @@ class WalletConnectMiddleware {
val index = action.wcUri.indexOf("@")
when (action.wcUri[index + 1]) {
'2' -> walletConnectRepository.pair(uri = action.wcUri)
+ '1' -> {
+ store.dispatchOnMain(WalletConnectAction.UnsupportedDappRequest)
+ store.dispatchOnMain(
+ GlobalAction.ShowDialog(WalletConnectDialog.UnsupportedWcVersion),
+ )
+ }
}
}
is WalletConnectAction.RejectRequest -> {
diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectReducer.kt b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectReducer.kt
index a7640ed758..1cf6c4da24 100644
--- a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectReducer.kt
@@ -15,6 +15,7 @@ object WalletConnectReducer {
is WalletConnectAction.SessionEstablished,
is WalletConnectAction.SessionRejected,
is WalletConnectAction.PairConnectErrorAction,
+ is WalletConnectAction.UnsupportedDappRequest,
-> state.copy(loading = false)
is WalletConnectAction.SessionListUpdated -> state.copy(
wc2Sessions = action.sessions,
diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectState.kt b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectState.kt
index d1a9368288..d557aa6910 100644
--- a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectState.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectState.kt
@@ -82,6 +82,7 @@ data class WalletForSession(
}
sealed class WalletConnectDialog : StateDialog {
+ data object UnsupportedWcVersion : WalletConnectDialog()
data class ClipboardOrScanQr(val clipboardUri: String) : WalletConnectDialog()
data object UnsupportedCard : WalletConnectDialog()
data class UnsupportedNetwork(val networks: List? = null) : WalletConnectDialog()
diff --git a/app/src/main/java/com/tangem/tap/features/home/featuretoggles/HomeFeatureToggles.kt b/app/src/main/java/com/tangem/tap/features/home/featuretoggles/HomeFeatureToggles.kt
index ce8c0bcec3..55ebe3e10d 100644
--- a/app/src/main/java/com/tangem/tap/features/home/featuretoggles/HomeFeatureToggles.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/featuretoggles/HomeFeatureToggles.kt
@@ -1,6 +1,6 @@
package com.tangem.tap.features.home.featuretoggles
-import com.tangem.core.featuretoggle.manager.FeatureTogglesManager
+import com.tangem.core.configtoggle.feature.FeatureTogglesManager
import javax.inject.Inject
class HomeFeatureToggles @Inject constructor(
diff --git a/app/src/main/java/com/tangem/tap/features/intentHandler/handlers/OnPushClickedIntentHandler.kt b/app/src/main/java/com/tangem/tap/features/intentHandler/handlers/OnPushClickedIntentHandler.kt
new file mode 100644
index 0000000000..e21d25ea54
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/intentHandler/handlers/OnPushClickedIntentHandler.kt
@@ -0,0 +1,24 @@
+package com.tangem.tap.features.intentHandler.handlers
+
+import android.content.Intent
+import com.tangem.core.analytics.api.AnalyticsEventHandler
+import com.tangem.tap.common.analytics.events.Push
+import com.tangem.tap.features.intentHandler.IntentHandler
+
+internal class OnPushClickedIntentHandler(val analyticsEventHandler: AnalyticsEventHandler) : IntentHandler {
+
+ override fun handleIntent(intent: Intent?, isFromForeground: Boolean): Boolean {
+ val fromPush = intent?.extras?.getBoolean(IS_OPENED_FROM_PUSH) ?: false
+
+ return if (fromPush) {
+ analyticsEventHandler.send(Push.PushNotificationOpened)
+ true
+ } else {
+ false
+ }
+ }
+
+ companion object {
+ const val IS_OPENED_FROM_PUSH = "IS_OPENED_FROM_PUSH"
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/main/MainViewModel.kt b/app/src/main/java/com/tangem/tap/features/main/MainViewModel.kt
index 444b2c6f89..cde9a3b7df 100644
--- a/app/src/main/java/com/tangem/tap/features/main/MainViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/main/MainViewModel.kt
@@ -17,7 +17,6 @@ import com.tangem.domain.settings.IncrementAppLaunchCounterUseCase
import com.tangem.domain.settings.usercountry.FetchUserCountryUseCase
import com.tangem.domain.staking.FetchStakingTokensUseCase
import com.tangem.domain.wallets.legacy.UserWalletsListManager
-import com.tangem.features.staking.api.featuretoggles.StakingFeatureToggles
import com.tangem.tap.common.extensions.setContext
import com.tangem.tap.features.home.featuretoggles.HomeFeatureToggles
import com.tangem.tap.features.main.model.MainScreenState
@@ -40,7 +39,6 @@ internal class MainViewModel @Inject constructor(
private val blockchainSDKFactory: BlockchainSDKFactory,
private val userWalletsListManager: UserWalletsListManager,
private val dispatchers: CoroutineDispatcherProvider,
- stakingFeatureToggles: StakingFeatureToggles,
private val fetchStakingTokensUseCase: FetchStakingTokensUseCase,
private val apiConfigsManager: ApiConfigsManager,
homeFeatureToggles: HomeFeatureToggles,
@@ -78,9 +76,7 @@ internal class MainViewModel @Inject constructor(
displayBalancesHidingStatusToast()
displayHiddenBalancesModalNotification()
- if (stakingFeatureToggles.isStakingEnabled) {
- fetchStakingTokens()
- }
+ fetchStakingTokens()
deleteDeprecatedLogsUseCase()
}
@@ -216,7 +212,6 @@ internal class MainViewModel @Inject constructor(
override fun onDismissBottomSheet() {
listenToFlipsUseCase.changeUpdateEnabled(true)
- router.pop()
stateHolder.updateWithoutModalNotification()
stateHolder.updateWithHiddenBalancesToast(true)
}
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt
index 2f18b059ca..e6166576ce 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt
@@ -16,6 +16,7 @@ import com.tangem.domain.models.scan.ScanResponse
import com.tangem.domain.settings.usercountry.models.UserCountry
import com.tangem.domain.wallets.builder.UserWalletBuilder
import com.tangem.domain.wallets.builder.UserWalletIdBuilder
+import com.tangem.domain.wallets.models.UserWallet
import com.tangem.tap.common.analytics.converters.ParamCardCurrencyConverter
import com.tangem.tap.common.analytics.events.AnalyticsParam
import com.tangem.tap.common.analytics.events.Onboarding
@@ -23,8 +24,9 @@ import com.tangem.tap.common.extensions.*
import com.tangem.tap.common.redux.AppDialog
import com.tangem.tap.common.redux.global.GlobalState
import com.tangem.tap.features.demo.DemoHelper
-import com.tangem.tap.features.onboarding.products.wallet.redux.OnboardingWalletAction
import com.tangem.tap.features.home.RUSSIA_COUNTRY_CODE
+import com.tangem.tap.features.onboarding.products.wallet.redux.OnboardingWalletAction
+import com.tangem.tap.features.onboarding.products.wallet.redux.BackupStartedSource
import com.tangem.tap.features.saveWallet.redux.SaveWalletAction
import com.tangem.tap.mainScope
import com.tangem.tap.proxy.redux.DaggerGraphState
@@ -66,8 +68,22 @@ object OnboardingHelper {
}
fun whereToNavigate(scanResponse: ScanResponse): AppRoute {
- if (store.inject(DaggerGraphState::onboardingV2FeatureToggles).isOnboardingV2Enabled) {
- return AppRoute.Onboarding(scanResponse)
+ val newOnboardingSupportTypes = scanResponse.productType == ProductType.Wallet2 ||
+ scanResponse.productType == ProductType.Ring ||
+ scanResponse.productType == ProductType.Wallet
+ if (store.inject(DaggerGraphState::onboardingV2FeatureToggles).isOnboardingV2Enabled &&
+ newOnboardingSupportTypes
+ ) {
+ val backupState = store.state.onboardingWalletState.backupState
+
+ return AppRoute.Onboarding(
+ scanResponse = scanResponse,
+ startFromBackup = false,
+ mode = when (backupState.startedSource) {
+ BackupStartedSource.Onboarding -> AppRoute.Onboarding.Mode.Onboarding
+ BackupStartedSource.CreateBackup -> AppRoute.Onboarding.Mode.AddBackup
+ },
+ )
}
return when (val type = scanResponse.productType) {
@@ -88,6 +104,7 @@ object OnboardingHelper {
}
fun saveWallet(
+ alreadyCreatedWallet: UserWallet?,
scanResponse: ScanResponse,
accessCode: String? = null,
backupCardsIds: List? = null,
@@ -117,7 +134,7 @@ object OnboardingHelper {
// When should not save user wallets but device has biometry and save wallet screen has not been shown,
// then open save wallet screen
tangemSdkManager.checkCanUseBiometry() && settingsRepository.shouldShowSaveUserWalletScreen() -> {
- proceedWithScanResponse(scanResponse, backupCardsIds, hasBackupError)
+ proceedWithScanResponse(scanResponse, backupCardsIds, hasBackupError, alreadyCreatedWallet)
delay(timeMillis = 1_200)
@@ -131,7 +148,7 @@ object OnboardingHelper {
}
// If device has no biometry and save wallet screen has been shown, then go through old scenario
else -> {
- proceedWithScanResponse(scanResponse, backupCardsIds, hasBackupError)
+ proceedWithScanResponse(scanResponse, backupCardsIds, hasBackupError, alreadyCreatedWallet)
}
}
}
@@ -207,7 +224,9 @@ object OnboardingHelper {
fun handleTopUpAction(walletManager: WalletManager, scanResponse: ScanResponse, globalState: GlobalState) {
val blockchain = walletManager.wallet.blockchain
- val cryptoCurrency = CryptoCurrencyFactory().createCoin(
+ val excludedBlockchains = store.inject(DaggerGraphState::excludedBlockchains)
+
+ val cryptoCurrency = CryptoCurrencyFactory(excludedBlockchains).createCoin(
blockchain = blockchain,
extraDerivationPath = null,
scanResponse = scanResponse,
@@ -220,6 +239,7 @@ object OnboardingHelper {
scope.launch {
val homeFeatureToggles = store.inject(DaggerGraphState::homeFeatureToggles)
+ val onrampFeatureToggles = store.inject(DaggerGraphState::onrampFeatureToggles)
val isRussia = if (homeFeatureToggles.isMigrateUserCountryCodeEnabled) {
val getUserCountryCodeUseCase = store.inject(DaggerGraphState::getUserCountryUseCase)
@@ -229,7 +249,7 @@ object OnboardingHelper {
globalState.userCountryCode == RUSSIA_COUNTRY_CODE
}
- if (isRussia) {
+ if (isRussia && !onrampFeatureToggles.isFeatureEnabled) {
val dialogData = AppDialog.RussianCardholdersWarningDialog.Data(topUpUrl)
store.dispatchDialogShow(AppDialog.RussianCardholdersWarningDialog(dialogData))
} else {
@@ -242,9 +262,10 @@ object OnboardingHelper {
scanResponse: ScanResponse,
backupCardsIds: List?,
hasBackupError: Boolean,
+ alreadyCreatedWallet: UserWallet? = null,
) {
val walletNameGenerateUseCase = store.inject(DaggerGraphState::generateWalletNameUseCase)
- val userWallet = UserWalletBuilder(scanResponse, walletNameGenerateUseCase)
+ val userWallet = alreadyCreatedWallet ?: UserWalletBuilder(scanResponse, walletNameGenerateUseCase)
.hasBackupError(hasBackupError)
.backupCardsIds(backupCardsIds?.toSet())
.build()
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletAction.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletAction.kt
index 0f29d53f73..a4be295931 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletAction.kt
@@ -3,6 +3,7 @@ package com.tangem.tap.features.onboarding.products.wallet.redux
import android.net.Uri
import com.tangem.common.CompletionResult
import com.tangem.common.card.Card
+import com.tangem.domain.models.scan.ScanResponse
import com.tangem.domain.wallets.models.UserWalletId
import com.tangem.feature.onboarding.data.model.CreateWalletResponse
import com.tangem.feature.onboarding.presentation.wallet2.analytics.SeedPhraseSource
@@ -98,7 +99,10 @@ sealed class BackupAction : Action {
data object DiscardBackup : BackupAction()
data object DiscardSavedBackup : BackupAction()
- data object ResumeFoundUnfinishedBackup : BackupAction()
+
+ data class ResumeFoundUnfinishedBackup(
+ val unfinishedBackupScanResponse: ScanResponse?,
+ ) : BackupAction()
data class ResetBackupCard(val cardId: String) : BackupAction()
}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
index 58d13a9b0e..0cb19b30a1 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
@@ -197,11 +197,11 @@ private fun handleWalletAction(action: Action) {
}
}
-private fun handleFinishBackup(scanResponse: ScanResponse) {
+private fun handleFinishBackup(scanResponse: ScanResponse, userWallet: UserWallet? = null) {
val backupState = store.state.onboardingWalletState.backupState
val updatedScanResponse = updateScanResponseAfterBackup(scanResponse, backupState)
- val userWalletId = UserWalletIdBuilder.scanResponse(scanResponse).build()
+ val userWalletId = userWallet?.walletId ?: UserWalletIdBuilder.scanResponse(scanResponse).build()
if (backupState.hasRing && userWalletId != null) {
scope.launch {
store.inject(DaggerGraphState::walletsRepository).setHasWalletsWithRing(userWalletId = userWalletId)
@@ -209,6 +209,7 @@ private fun handleFinishBackup(scanResponse: ScanResponse) {
}
OnboardingHelper.saveWallet(
+ alreadyCreatedWallet = userWallet,
scanResponse = updatedScanResponse,
accessCode = backupState.accessCode,
backupCardsIds = backupState.backupCardIds,
@@ -580,21 +581,50 @@ private fun handleBackupAction(appState: () -> AppState?, action: BackupAction)
store.state.globalState.onboardingState.onboardingManager?.finishActivation(it)
}
backupService.discardSavedBackup()
+
+ val isOnboardingV2Enabled = store.inject(DaggerGraphState::onboardingV2FeatureToggles)
+ .isOnboardingV2Enabled
+
+ if (isOnboardingV2Enabled) {
+ val onboardingRepository = store.inject(DaggerGraphState::onboardingRepository)
+ onboardingRepository.clearUnfinishedFinalizeOnboarding()
+ }
}
}
is BackupAction.CheckForUnfinishedBackup -> {
- if (backupService.hasIncompletedBackup) {
- store.dispatch(GlobalAction.ShowDialog(BackupDialog.UnfinishedBackupFound))
+ val isOnboardingV2Enabled = store.inject(DaggerGraphState::onboardingV2FeatureToggles).isOnboardingV2Enabled
+
+ if (isOnboardingV2Enabled) {
+ val onboardingRepository = store.inject(DaggerGraphState::onboardingRepository)
+
+ mainScope.launch {
+ val onboardingScanResponse = onboardingRepository.getUnfinishedFinalizeOnboarding() ?: return@launch
+ store.dispatch(GlobalAction.ShowDialog(BackupDialog.UnfinishedBackupFound(onboardingScanResponse)))
+ }
+ } else if (backupService.hasIncompletedBackup) {
+ store.dispatch(GlobalAction.ShowDialog(BackupDialog.UnfinishedBackupFound()))
}
}
is BackupAction.ResumeFoundUnfinishedBackup -> {
- store.dispatch(
- GlobalAction.Onboarding.StartForUnfinishedBackup(
- addedBackupCardsCount = backupService.addedBackupCardsCount,
- ),
- )
+ if (action.unfinishedBackupScanResponse != null) {
+ // onboarding V2
+ store.dispatchNavigationAction {
+ push(
+ AppRoute.Onboarding(
+ scanResponse = action.unfinishedBackupScanResponse,
+ startFromBackup = false,
+ ),
+ )
+ }
+ } else {
+ store.dispatch(
+ GlobalAction.Onboarding.StartForUnfinishedBackup(
+ addedBackupCardsCount = backupService.addedBackupCardsCount,
+ ),
+ )
- store.dispatchNavigationAction { push(AppRoute.OnboardingWallet()) }
+ store.dispatchNavigationAction { push(AppRoute.OnboardingWallet()) }
+ }
}
is BackupAction.SkipBackup -> {
Analytics.send(Onboarding.Backup.Skipped())
@@ -679,7 +709,7 @@ private fun handleBackupAction(appState: () -> AppState?, action: BackupAction)
Analytics.send(Onboarding.Finished())
store.state.globalState.onboardingState.onboardingManager?.finishActivation(notActivatedCardIds)
- handleFinishBackup(requireNotNull(scanResponse))
+ handleFinishBackup(requireNotNull(scanResponse), userWallet)
delay(1000)
store.dispatchWithMain(BackupAction.BackupFinished(userWalletId = userWallet?.walletId))
}
@@ -740,6 +770,7 @@ private suspend fun createUserWallet(scanResponse: ScanResponse, backupState: Ba
return requireNotNull(
value = UserWalletBuilder(scanResponse, walletNameGenerateUseCase)
.backupCardsIds(backupState.backupCardIds.toSet())
+ .hasBackupError(backupState.hasBackupError)
.build(),
lazyMessage = { "User wallet not created" },
)
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletState.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletState.kt
index af1af41924..8d8f92f601 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletState.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletState.kt
@@ -3,6 +3,7 @@ package com.tangem.tap.features.onboarding.products.wallet.redux
import android.graphics.Bitmap
import android.net.Uri
import com.tangem.common.card.Card
+import com.tangem.domain.models.scan.ScanResponse
import com.tangem.domain.redux.StateDialog
import com.tangem.domain.wallets.models.UserWalletId
import org.rekotlin.StateType
@@ -99,22 +100,29 @@ enum class AccessCodeError {
typealias CardId = String
sealed class BackupStep {
- object InitBackup : BackupStep()
- object ScanOriginCard : BackupStep()
- object AddBackupCards : BackupStep()
- object SetAccessCode : BackupStep()
- object EnterAccessCode : BackupStep()
- object ReenterAccessCode : BackupStep()
- object WritePrimaryCard : BackupStep()
+ data object InitBackup : BackupStep()
+ data object ScanOriginCard : BackupStep()
+ data object AddBackupCards : BackupStep()
+ data object SetAccessCode : BackupStep()
+ data object EnterAccessCode : BackupStep()
+ data object ReenterAccessCode : BackupStep()
+ data object WritePrimaryCard : BackupStep()
data class WriteBackupCard(val cardNumber: Int) : BackupStep()
- object Finished : BackupStep()
+ data object Finished : BackupStep()
}
sealed class BackupDialog : StateDialog {
- object AttestationFailed : BackupDialog()
- object AddMoreBackupCards : BackupDialog()
- object BackupInProgress : BackupDialog()
- object UnfinishedBackupFound : BackupDialog()
- object ConfirmDiscardingBackup : BackupDialog()
+ data object AttestationFailed : BackupDialog()
+ data object AddMoreBackupCards : BackupDialog()
+ data object BackupInProgress : BackupDialog()
+
+ data class UnfinishedBackupFound(
+ val scanResponse: ScanResponse? = null,
+ ) : BackupDialog()
+
+ data class ConfirmDiscardingBackup(
+ val scanResponse: ScanResponse? = null,
+ ) : BackupDialog()
+
data class ResetBackupCard(val cardId: String) : BackupDialog()
}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
index b80aa53ebb..7f20094f7b 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
@@ -272,6 +272,7 @@ class OnboardingWalletFragment :
onboardingManageTokensComponent = onboardingManageTokensComponentFactory.create(
context = onboardingComponentContext,
params = OnboardingManageTokensComponent.Params(userWalletId = userWalletId),
+ onDone = {},
)
}
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/ConfirmDiscardingBackupDialog.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/ConfirmDiscardingBackupDialog.kt
index de833bc7f7..9f5257bd04 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/ConfirmDiscardingBackupDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/ConfirmDiscardingBackupDialog.kt
@@ -3,18 +3,19 @@ package com.tangem.tap.features.onboarding.products.wallet.ui.dialogs
import android.content.Context
import androidx.appcompat.app.AlertDialog
import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.tangem.domain.models.scan.ScanResponse
import com.tangem.tap.common.redux.global.GlobalAction
import com.tangem.tap.features.onboarding.products.wallet.redux.BackupAction
import com.tangem.tap.store
import com.tangem.wallet.R
object ConfirmDiscardingBackupDialog {
- fun create(context: Context): AlertDialog {
+ fun create(context: Context, unfinishedBackupScanResponse: ScanResponse? = null): AlertDialog {
return MaterialAlertDialogBuilder(context, R.style.CustomMaterialDialog).apply {
setTitle(R.string.welcome_interrupted_backup_discard_title)
setMessage(R.string.welcome_interrupted_backup_discard_message)
setPositiveButton(R.string.welcome_interrupted_backup_discard_resume) { _, _ ->
- store.dispatch(BackupAction.ResumeFoundUnfinishedBackup)
+ store.dispatch(BackupAction.ResumeFoundUnfinishedBackup(unfinishedBackupScanResponse))
}
setNegativeButton(R.string.welcome_interrupted_backup_discard_discard) { _, _ ->
store.dispatch(BackupAction.DiscardSavedBackup)
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/UnfinishedBackupFoundDialog.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/UnfinishedBackupFoundDialog.kt
index c7c4c30450..ec80c29c24 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/UnfinishedBackupFoundDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/UnfinishedBackupFoundDialog.kt
@@ -3,6 +3,9 @@ package com.tangem.tap.features.onboarding.products.wallet.ui.dialogs
import android.content.Context
import androidx.appcompat.app.AlertDialog
import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.tangem.core.analytics.Analytics
+import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.features.onboarding.v2.multiwallet.impl.analytics.OnboardingEvent
import com.tangem.tap.common.redux.global.GlobalAction
import com.tangem.tap.features.onboarding.products.wallet.redux.BackupAction
import com.tangem.tap.features.onboarding.products.wallet.redux.BackupDialog
@@ -10,17 +13,19 @@ import com.tangem.tap.store
import com.tangem.wallet.R
object UnfinishedBackupFoundDialog {
- fun create(context: Context): AlertDialog {
+ fun create(context: Context, scanResponse: ScanResponse? = null): AlertDialog {
return MaterialAlertDialogBuilder(context, R.style.CustomMaterialDialog).apply {
setTitle(R.string.common_warning)
setMessage(R.string.welcome_interrupted_backup_alert_message)
setPositiveButton(R.string.welcome_interrupted_backup_alert_resume) { _, _ ->
+ Analytics.send(OnboardingEvent.Backup.ResumeInterruptedBackup)
store.dispatch(GlobalAction.HideDialog)
- store.dispatch(BackupAction.ResumeFoundUnfinishedBackup)
+ store.dispatch(BackupAction.ResumeFoundUnfinishedBackup(scanResponse))
}
setNegativeButton(R.string.welcome_interrupted_backup_alert_discard) { _, _ ->
+ Analytics.send(OnboardingEvent.Backup.CancelInterruptedBackup)
store.dispatch(GlobalAction.HideDialog)
- store.dispatch(GlobalAction.ShowDialog(BackupDialog.ConfirmDiscardingBackup))
+ store.dispatch(GlobalAction.ShowDialog(BackupDialog.ConfirmDiscardingBackup(scanResponse)))
}
setCancelable(false)
}.create()
diff --git a/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt
index c8e093611d..2c7903ad60 100644
--- a/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt
@@ -5,11 +5,11 @@ import com.tangem.common.core.TangemSdkError
import com.tangem.common.extensions.guard
import com.tangem.common.routing.AppRoute
import com.tangem.core.analytics.Analytics
+import com.tangem.core.analytics.models.event.MainScreenAnalyticsEvent
import com.tangem.domain.wallets.builder.UserWalletBuilder
import com.tangem.domain.wallets.models.UserWallet
import com.tangem.tap.*
import com.tangem.tap.common.analytics.events.AnalyticsParam
-import com.tangem.tap.common.analytics.events.MainScreen
import com.tangem.tap.common.analytics.events.Onboarding
import com.tangem.tap.common.extensions.dispatchNavigationAction
import com.tangem.tap.common.extensions.dispatchWithMain
@@ -110,7 +110,11 @@ internal class SaveWalletMiddleware {
// TODO: Remove after onboarding refactoring
Analytics.send(Onboarding.EnableBiometrics(AnalyticsParam.OnOffState.On))
} else {
- Analytics.send(MainScreen.EnableBiometrics(AnalyticsParam.OnOffState.On))
+ Analytics.send(
+ MainScreenAnalyticsEvent.EnableBiometrics(
+ state = com.tangem.core.analytics.models.AnalyticsParam.OnOffState.On,
+ ),
+ )
}
/*
@@ -148,7 +152,11 @@ internal class SaveWalletMiddleware {
// TODO: Remove after onboarding refactoring
Analytics.send(Onboarding.EnableBiometrics(AnalyticsParam.OnOffState.Off))
} else {
- Analytics.send(MainScreen.EnableBiometrics(AnalyticsParam.OnOffState.Off))
+ Analytics.send(
+ MainScreenAnalyticsEvent.EnableBiometrics(
+ com.tangem.core.analytics.models.AnalyticsParam.OnOffState.Off,
+ ),
+ )
}
}
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt
index a21351a6b9..9edfafa699 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt
@@ -5,6 +5,7 @@ import com.tangem.blockchain.common.Blockchain
import com.tangem.common.routing.AppRoute
import com.tangem.common.routing.AppRouter
import com.tangem.core.analytics.Analytics
+import com.tangem.domain.onramp.model.OnrampSource
import com.tangem.domain.settings.usercountry.models.UserCountry
import com.tangem.domain.tokens.legacy.TradeCryptoAction
import com.tangem.domain.tokens.model.CryptoCurrency
@@ -55,11 +56,23 @@ object TradeCryptoMiddleware {
private fun proceedBuyAction(state: () -> AppState?, action: TradeCryptoAction.Buy) {
val isOnrampEnabled = store.inject(DaggerGraphState::onrampFeatureToggles).isFeatureEnabled
- if (isOnrampEnabled) proceedWithOnramp() else proceedWithLegacyBuyAction(state, action)
+ if (isOnrampEnabled) {
+ proceedWithOnramp(action.userWallet.walletId, action.cryptoCurrencyStatus.currency, action.source)
+ } else {
+ proceedWithLegacyBuyAction(state, action)
+ }
}
- private fun proceedWithOnramp() {
- store.dispatchNavigationAction { push(AppRoute.Onramp) }
+ private fun proceedWithOnramp(userWalletId: UserWalletId, cryptoCurrency: CryptoCurrency, source: OnrampSource) {
+ store.dispatchNavigationAction {
+ push(
+ AppRoute.Onramp(
+ userWalletId = userWalletId,
+ currency = cryptoCurrency,
+ source = source,
+ ),
+ )
+ }
}
private fun proceedWithLegacyBuyAction(state: () -> AppState?, action: TradeCryptoAction.Buy) {
@@ -82,7 +95,7 @@ object TradeCryptoMiddleware {
scope.launch {
val homeFeatureToggles = store.inject(DaggerGraphState::homeFeatureToggles)
-
+ val onrampFeatureToggles = store.inject(DaggerGraphState::onrampFeatureToggles)
val isRussia = if (homeFeatureToggles.isMigrateUserCountryCodeEnabled) {
val getUserCountryCodeUseCase = store.inject(DaggerGraphState::getUserCountryUseCase)
@@ -91,7 +104,7 @@ object TradeCryptoMiddleware {
state()?.globalState?.userCountryCode == RUSSIA_COUNTRY_CODE
}
- if (action.checkUserLocation && isRussia) {
+ if (action.checkUserLocation && isRussia && !onrampFeatureToggles.isFeatureEnabled) {
val dialogData = topUrl?.let {
AppDialog.RussianCardholdersWarningDialog.Data(topUpUrl = it)
}
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/CryptoCurrencyConverter.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/CryptoCurrencyConverter.kt
index 520d262847..8cf25d7f82 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/CryptoCurrencyConverter.kt
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/CryptoCurrencyConverter.kt
@@ -2,6 +2,7 @@ package com.tangem.tap.network.exchangeServices
import com.tangem.blockchain.common.Blockchain
import com.tangem.blockchain.common.Token
+import com.tangem.blockchainsdk.utils.ExcludedBlockchains
import com.tangem.data.common.currency.CryptoCurrencyFactory
import com.tangem.domain.tokens.model.CryptoCurrency
import com.tangem.tap.common.extensions.inject
@@ -10,9 +11,11 @@ import com.tangem.tap.proxy.redux.DaggerGraphState
import com.tangem.tap.store
import com.tangem.utils.converter.TwoWayConverter
-internal class CryptoCurrencyConverter : TwoWayConverter {
+internal class CryptoCurrencyConverter(
+ private val excludedBlockchains: ExcludedBlockchains,
+) : TwoWayConverter {
- private val cryptoCurrencyFactory by lazy { CryptoCurrencyFactory() }
+ private val cryptoCurrencyFactory by lazy { CryptoCurrencyFactory(excludedBlockchains) }
override fun convert(value: Currency): CryptoCurrency {
return when (value) {
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/CurrencyExchangeManager.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/CurrencyExchangeManager.kt
index 71c317e080..9c0f20075c 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/CurrencyExchangeManager.kt
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/CurrencyExchangeManager.kt
@@ -8,6 +8,8 @@ import com.tangem.blockchain.common.Blockchain
import com.tangem.blockchain.common.transaction.TransactionFee
import com.tangem.blockchain.extensions.Result
import com.tangem.domain.common.TapWorkarounds.isTangemTwins
+import com.tangem.domain.core.utils.lceContent
+import com.tangem.domain.core.utils.lceLoading
import com.tangem.domain.models.scan.CardDTO
import com.tangem.domain.models.scan.ScanResponse
import com.tangem.domain.tokens.model.CryptoCurrency
@@ -19,6 +21,8 @@ import com.tangem.tap.domain.model.Currency
import com.tangem.tap.features.demo.isDemoCard
import com.tangem.tap.proxy.redux.DaggerGraphState
import com.tangem.tap.store
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
import java.math.BigDecimal
/**
@@ -30,9 +34,22 @@ class CurrencyExchangeManager(
private val primaryRules: ExchangeRules,
) : ExchangeService {
+ override val initializationStatus: StateFlow
+ get() = _initializationStatus
+
+ private val _initializationStatus: MutableStateFlow =
+ MutableStateFlow(value = lceLoading())
+
override suspend fun update() {
- buyService.update()
+ _initializationStatus.value = lceLoading()
+
+ if (!store.inject(DaggerGraphState::onrampFeatureToggles).isFeatureEnabled) {
+ buyService.update()
+ }
+
sellService.update()
+
+ _initializationStatus.value = lceContent()
}
override fun isBuyAllowed(): Boolean = primaryRules.isBuyAllowed() && buyService.isBuyAllowed()
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/DefaultRampManager.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/DefaultRampManager.kt
index 904e22c80e..7f8f63e344 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/DefaultRampManager.kt
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/DefaultRampManager.kt
@@ -1,22 +1,164 @@
package com.tangem.tap.network.exchangeServices
+import com.tangem.blockchainsdk.utils.ExcludedBlockchains
+import com.tangem.datasource.api.express.models.TangemExpressValues.EMPTY_CONTRACT_ADDRESS_VALUE
+import com.tangem.datasource.api.express.models.response.Asset
+import com.tangem.datasource.exchangeservice.swap.ExpressServiceLoader
+import com.tangem.datasource.local.token.ExpressAssetsStore
import com.tangem.domain.exchange.RampStateManager
import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.domain.tokens.GetNetworkCoinStatusUseCase
import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.CryptoCurrencyStatus
+import com.tangem.domain.tokens.model.ScenarioUnavailabilityReason
+import com.tangem.domain.tokens.repository.CurrenciesRepository
+import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.features.onramp.OnrampFeatureToggles
+import com.tangem.utils.Provider
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import com.tangem.utils.coroutines.runCatching
+import com.tangem.utils.isNullOrZero
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.withContext
-class DefaultRampManager(private val exchangeService: ExchangeService?) : RampStateManager {
+@Suppress("LongParameterList")
+internal class DefaultRampManager(
+ private val exchangeService: ExchangeService?,
+ private val buyService: Provider,
+ private val sellService: Provider,
+ private val expressServiceLoader: ExpressServiceLoader,
+ private val currenciesRepository: CurrenciesRepository,
+ private val getNetworkCoinStatusUseCase: GetNetworkCoinStatusUseCase,
+ private val dispatchers: CoroutineDispatcherProvider,
+ private val onrampFeatureToggles: OnrampFeatureToggles,
+ private val expressAssetsStore: ExpressAssetsStore,
+ excludedBlockchains: ExcludedBlockchains,
+) : RampStateManager {
- private val cryptoCurrencyConverter = CryptoCurrencyConverter()
- override fun availableForBuy(scanResponse: ScanResponse, cryptoCurrency: CryptoCurrency): Boolean {
- return exchangeService?.availableForBuy(
- scanResponse,
- currency = cryptoCurrencyConverter.convertBack(cryptoCurrency),
- ) ?: false
+ private val cryptoCurrencyConverter = CryptoCurrencyConverter(excludedBlockchains)
+
+ override fun isSellSupportedByService(cryptoCurrency: CryptoCurrency): Boolean {
+ return runCatching {
+ exchangeService?.availableForSell(
+ currency = cryptoCurrencyConverter.convertBack(cryptoCurrency),
+ )
+ }
+ .getOrNull()
+ ?: false
}
- override fun availableForSell(cryptoCurrency: CryptoCurrency): Boolean {
- return exchangeService?.availableForSell(
- currency = cryptoCurrencyConverter.convertBack(cryptoCurrency),
- ) ?: false
+ override suspend fun availableForBuy(
+ scanResponse: ScanResponse,
+ userWalletId: UserWalletId,
+ cryptoCurrency: CryptoCurrency,
+ ): Boolean {
+ return runCatching {
+ when {
+ onrampFeatureToggles.isFeatureEnabled -> getOnrampAvailable(userWalletId, cryptoCurrency)
+ exchangeService != null -> exchangeService.availableForBuy(
+ scanResponse = scanResponse,
+ currency = cryptoCurrencyConverter.convertBack(cryptoCurrency),
+ )
+ else -> false
+ }
+ }
+ .getOrNull()
+ ?: false
+ }
+
+ override suspend fun availableForSell(userWalletId: UserWalletId, status: CryptoCurrencyStatus): Boolean {
+ return runCatching {
+ val sellSupportedByService = isSellSupportedByService(cryptoCurrency = status.currency)
+
+ if (!sellSupportedByService) return false
+
+ val reason = getSendUnavailabilityReason(userWalletId, status)
+
+ reason == ScenarioUnavailabilityReason.None
+ }
+ .getOrNull()
+ ?: false
+ }
+
+ override suspend fun availableForSwap(userWalletId: UserWalletId, cryptoCurrency: CryptoCurrency): Boolean {
+ return runCatching { getExchangeableFlag(userWalletId, cryptoCurrency) && !cryptoCurrency.isCustom }
+ .getOrNull()
+ ?: false
+ }
+
+ override fun getBuyInitializationStatus(): Flow {
+ return buyService.invoke().initializationStatus
+ }
+
+ override suspend fun fetchBuyServiceData() {
+ runCatching(dispatchers.io) {
+ buyService.invoke().update()
+ }
+ }
+
+ override fun getSellInitializationStatus(): Flow {
+ return sellService.invoke().initializationStatus
+ }
+
+ override suspend fun fetchSellServiceData() {
+ runCatching(dispatchers.io) {
+ sellService.invoke().update()
+ }
+ }
+
+ override fun getExpressInitializationStatus(userWalletId: UserWalletId): Flow {
+ return expressServiceLoader.getInitializationStatus(userWalletId)
+ }
+
+ private suspend fun getExchangeableFlag(userWalletId: UserWalletId, cryptoCurrency: CryptoCurrency): Boolean {
+ return withContext(dispatchers.io) {
+ val asset = expressServiceLoader.getInitializationStatus(userWalletId)
+ .value
+ .getOrNull()
+ ?.find { cryptoCurrency.findAssetPredicate(it) }
+
+ asset?.exchangeAvailable ?: false
+ }
+ }
+
+ private suspend fun getOnrampAvailable(userWalletId: UserWalletId, cryptoCurrency: CryptoCurrency): Boolean {
+ val asset = expressAssetsStore.getSyncOrNull(userWalletId)?.find { cryptoCurrency.findAssetPredicate(it) }
+
+ return asset?.onrampAvailable ?: false
+ }
+
+ private fun CryptoCurrency.findAssetPredicate(asset: Asset): Boolean {
+ val contractAddress = (this as? CryptoCurrency.Token)?.contractAddress ?: EMPTY_CONTRACT_ADDRESS_VALUE
+ return asset.network == network.backendId && asset.contractAddress.equals(contractAddress, ignoreCase = true)
+ }
+
+ private suspend fun getSendUnavailabilityReason(
+ userWalletId: UserWalletId,
+ cryptoCurrencyStatus: CryptoCurrencyStatus,
+ ): ScenarioUnavailabilityReason {
+ val coinStatus = getNetworkCoinStatusUseCase.invokeSync(
+ userWalletId = userWalletId,
+ networkId = cryptoCurrencyStatus.currency.network.id,
+ derivationPath = cryptoCurrencyStatus.currency.network.derivationPath,
+ isSingleWalletWithTokens = false,
+ ).getOrNull()
+
+ return when {
+ cryptoCurrencyStatus.value.amount.isNullOrZero() -> {
+ ScenarioUnavailabilityReason.EmptyBalance(ScenarioUnavailabilityReason.WithdrawalScenario.SEND)
+ }
+ currenciesRepository.isSendBlockedByPendingTransactions(
+ cryptoCurrencyStatus = cryptoCurrencyStatus,
+ coinStatus = coinStatus,
+ ) -> {
+ ScenarioUnavailabilityReason.PendingTransaction(
+ withdrawalScenario = ScenarioUnavailabilityReason.WithdrawalScenario.SEND,
+ networkName = coinStatus?.currency?.network?.name.orEmpty(),
+ )
+ }
+ else -> {
+ ScenarioUnavailabilityReason.None
+ }
+ }
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/ExchangeService.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/ExchangeService.kt
index 495bcec410..e49b386c9d 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/ExchangeService.kt
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/ExchangeService.kt
@@ -1,8 +1,14 @@
package com.tangem.tap.network.exchangeServices
+import com.tangem.domain.core.lce.Lce
+import com.tangem.domain.core.utils.lceLoading
import com.tangem.domain.models.scan.ScanResponse
import com.tangem.domain.tokens.model.CryptoCurrency
import com.tangem.tap.domain.model.Currency
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+
+typealias ExchangeServiceInitializationStatus = Lce
interface Exchanger {
fun isBuyAllowed(): Boolean
@@ -12,10 +18,17 @@ interface Exchanger {
}
interface ExchangeService : Exchanger, ExchangeUrlBuilder {
+
+ val initializationStatus: StateFlow
+
suspend fun update()
companion object {
fun dummy(): ExchangeService = object : ExchangeService {
+
+ override val initializationStatus: StateFlow =
+ MutableStateFlow(value = lceLoading())
+
override suspend fun update() {}
override fun isBuyAllowed(): Boolean = false
override fun isSellAllowed(): Boolean = false
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoBlockchainMapping.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoBlockchainMapping.kt
index 946d2afce1..5ee9a4ce7f 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoBlockchainMapping.kt
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoBlockchainMapping.kt
@@ -138,8 +138,11 @@ internal val Blockchain.mercuryoNetwork: String?
Blockchain.CasperTestnet -> null
Blockchain.Core -> null
Blockchain.CoreTestnet -> null
+ Blockchain.Chiliz -> null
+ Blockchain.ChilizTestnet -> null
Blockchain.Unknown -> null
Blockchain.Xodex -> null
Blockchain.Canxium -> null
+ Blockchain.Clore -> null
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt
index 50b558907b..bd46579044 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt
@@ -6,12 +6,19 @@ import com.tangem.common.extensions.calculateSha512
import com.tangem.common.extensions.toHexString
import com.tangem.common.services.Result
import com.tangem.common.services.performRequest
+import com.tangem.domain.core.utils.lceContent
+import com.tangem.domain.core.utils.lceError
+import com.tangem.domain.core.utils.lceLoading
import com.tangem.domain.models.scan.ScanResponse
import com.tangem.domain.tokens.model.CryptoCurrency
import com.tangem.tap.domain.model.Currency
import com.tangem.tap.network.exchangeServices.CurrencyExchangeManager
import com.tangem.tap.network.exchangeServices.ExchangeService
+import com.tangem.tap.network.exchangeServices.ExchangeServiceInitializationStatus
import com.tangem.tap.network.exchangeServices.ExchangeUrlBuilder
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import timber.log.Timber
import java.util.concurrent.CopyOnWriteArrayList
/**
@@ -19,10 +26,34 @@ import java.util.concurrent.CopyOnWriteArrayList
*/
internal class MercuryoService(private val environment: MercuryoEnvironment) : ExchangeService {
+ override val initializationStatus: StateFlow
+ get() = _initializationStatus
+
+ private val _initializationStatus: MutableStateFlow =
+ MutableStateFlow(value = lceLoading())
+
private val api: MercuryoApi = environment.mercuryoApi
private val availableMercuryoCurrencies = CopyOnWriteArrayList()
+ override suspend fun update() {
+ Timber.i("Start updating")
+ _initializationStatus.value = lceLoading()
+
+ val result = performRequest { api.currencies(environment.apiVersion) }
+ when {
+ result is Result.Success && result.data.status == RESPONSE_SUCCESS_STATUS_CODE -> {
+ handleSuccessfullyUpdatedData(data = result.data.data)
+ }
+ result is Result.Failure -> {
+ availableMercuryoCurrencies.clear()
+
+ Timber.e("Failed to load currencies", result.error)
+ _initializationStatus.value = result.error.lceError()
+ }
+ }
+ }
+
override fun isBuyAllowed(): Boolean = true
override fun isSellAllowed(): Boolean = false
@@ -42,18 +73,6 @@ internal class MercuryoService(private val environment: MercuryoEnvironment) : E
override fun availableForSell(currency: Currency): Boolean = false
- override suspend fun update() {
- val result = performRequest { api.currencies(environment.apiVersion) }
- when {
- result is Result.Success && result.data.status == RESPONSE_SUCCESS_STATUS_CODE -> {
- handleSuccessfullyUpdatedData(data = result.data.data)
- }
- result is Result.Failure -> {
- availableMercuryoCurrencies.clear()
- }
- }
- }
-
override fun getUrl(
action: CurrencyExchangeManager.Action,
cryptoCurrency: CryptoCurrency,
@@ -89,6 +108,9 @@ internal class MercuryoService(private val environment: MercuryoEnvironment) : E
private fun handleSuccessfullyUpdatedData(data: MercuryoCurrenciesResponse.Data) {
availableMercuryoCurrencies.clear()
availableMercuryoCurrencies.addAll(data.config.cryptoCurrencies)
+
+ Timber.i("Successfully updated")
+ _initializationStatus.value = lceContent()
}
private fun signature(address: String) = (address + environment.secret).calculateSha512().toHexString().lowercase()
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayService.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayService.kt
index 26b26f0b61..90011a2d77 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayService.kt
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayService.kt
@@ -7,13 +7,20 @@ import com.tangem.common.services.Result
import com.tangem.common.services.performRequest
import com.tangem.datasource.api.common.createRetrofitInstance
import com.tangem.domain.common.extensions.withIOContext
+import com.tangem.domain.core.utils.lceContent
+import com.tangem.domain.core.utils.lceError
+import com.tangem.domain.core.utils.lceLoading
import com.tangem.domain.models.scan.ScanResponse
import com.tangem.domain.tokens.model.CryptoCurrency
import com.tangem.tap.domain.model.Currency
import com.tangem.tap.network.exchangeServices.CurrencyExchangeManager
import com.tangem.tap.network.exchangeServices.ExchangeService
+import com.tangem.tap.network.exchangeServices.ExchangeServiceInitializationStatus
import com.tangem.tap.network.exchangeServices.ExchangeUrlBuilder.Companion.SCHEME
import com.tangem.tap.network.exchangeServices.moonpay.models.MoonPayAvailableCurrency
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import timber.log.Timber
import javax.crypto.Mac
import javax.crypto.spec.SecretKeySpec
@@ -23,6 +30,12 @@ class MoonPayService(
private val logEnabled: Boolean,
) : ExchangeService {
+ override val initializationStatus: StateFlow
+ get() = _initializationStatus
+
+ private val _initializationStatus: MutableStateFlow =
+ MutableStateFlow(value = lceLoading())
+
private val api: MoonPayApi by lazy {
createRetrofitInstance(
baseUrl = MoonPayApi.MOOONPAY_BASE_URL,
@@ -34,14 +47,25 @@ class MoonPayService(
override suspend fun update() {
withIOContext {
+ Timber.i("Start updating")
+ _initializationStatus.value = lceLoading()
+
performRequest {
val userStatus = when (val result = performRequest { api.getUserStatus(apiKey) }) {
- is Result.Failure -> return@performRequest
+ is Result.Failure -> {
+ Timber.e("Failed to load user status", result.error)
+ _initializationStatus.value = result.error.lceError()
+ return@performRequest
+ }
is Result.Success -> result.data
}
val currencies = when (val result = performRequest { api.getCurrencies(apiKey) }) {
- is Result.Failure -> return@performRequest
+ is Result.Failure -> {
+ Timber.e("Failed to load currencies", result.error)
+ _initializationStatus.value = result.error.lceError()
+ return@performRequest
+ }
is Result.Success -> result.data
}
@@ -58,6 +82,8 @@ class MoonPayService(
)
}
+ Timber.i("Successfully updated")
+ _initializationStatus.value = lceContent()
status = MoonPayStatus(currenciesToSell, userStatus, currencies)
}
}
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonpayBlockchainMapping.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonpayBlockchainMapping.kt
index fb01fff927..a4de7a4df9 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonpayBlockchainMapping.kt
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonpayBlockchainMapping.kt
@@ -43,6 +43,7 @@ internal val Blockchain.moonPaySupportedCurrency: MoonPaySupportedCurrency?
Filecoin -> MoonPaySupportedCurrency(networkCode = "filecoin", currencyCode = "fil")
Sui -> MoonPaySupportedCurrency(networkCode = "sui", currencyCode = "sui")
Core -> MoonPaySupportedCurrency(networkCode = "core", currencyCode = "core")
+ Chiliz -> MoonPaySupportedCurrency(networkCode = "ethereum", currencyCode = "chz")
ArbitrumTestnet -> null
AvalancheTestnet -> null
BinanceTestnet -> null
@@ -139,7 +140,9 @@ internal val Blockchain.moonPaySupportedCurrency: MoonPaySupportedCurrency?
Casper -> null
CasperTestnet -> null
CoreTestnet -> null
+ ChilizTestnet -> null
Unknown -> null
Xodex -> null
Canxium -> null
+ Clore -> null
}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/proxy/AppStateHolder.kt b/app/src/main/java/com/tangem/tap/proxy/AppStateHolder.kt
index f626aa4238..18c616034a 100644
--- a/app/src/main/java/com/tangem/tap/proxy/AppStateHolder.kt
+++ b/app/src/main/java/com/tangem/tap/proxy/AppStateHolder.kt
@@ -1,6 +1,5 @@
package com.tangem.tap.proxy
-import com.tangem.domain.models.scan.CardDTO
import com.tangem.domain.models.scan.ScanResponse
import com.tangem.domain.redux.ReduxStateHolder
import com.tangem.domain.redux.StateDialog
@@ -26,10 +25,8 @@ class AppStateHolder @Inject constructor() : ReduxStateHolder {
var mainStore: Store? = null
var tangemSdkManager: TangemSdkManager? = null
var exchangeService: ExchangeService? = null
-
- fun getActualCard(): CardDTO? {
- return scanResponse?.card
- }
+ var buyService: ExchangeService? = null
+ var sellService: ExchangeService? = null
override fun dispatch(action: Action) {
mainStore?.dispatch(action)
diff --git a/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt b/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt
index cb94b5b0cc..db70565310 100644
--- a/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt
+++ b/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt
@@ -2,6 +2,7 @@ package com.tangem.tap.proxy.redux
import com.tangem.blockchainsdk.BlockchainSDKFactory
import com.tangem.blockchainsdk.signer.TransactionSignerFactory
+import com.tangem.blockchainsdk.utils.ExcludedBlockchains
import com.tangem.common.routing.AppRouter
import com.tangem.core.navigation.share.ShareManager
import com.tangem.core.navigation.url.UrlOpener
@@ -20,6 +21,7 @@ import com.tangem.domain.feedback.GetCardInfoUseCase
import com.tangem.domain.feedback.SendFeedbackEmailUseCase
import com.tangem.domain.onboarding.SaveTwinsOnboardingShownUseCase
import com.tangem.domain.onboarding.WasTwinsOnboardingShownUseCase
+import com.tangem.domain.onboarding.repository.OnboardingRepository
import com.tangem.domain.settings.repositories.SettingsRepository
import com.tangem.domain.settings.usercountry.GetUserCountryUseCase
import com.tangem.domain.walletmanager.WalletManagersFacade
@@ -72,5 +74,7 @@ data class DaggerGraphState(
val onrampFeatureToggles: OnrampFeatureToggles? = null,
val environmentConfigStorage: EnvironmentConfigStorage? = null,
val onboardingV2FeatureToggles: OnboardingV2FeatureToggles? = null,
+ val onboardingRepository: OnboardingRepository? = null,
+ val excludedBlockchains: ExcludedBlockchains? = null,
val appPreferencesStore: AppPreferencesStore? = null,
) : StateType
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/routing/impl/DefaultRoutingComponent.kt b/app/src/main/java/com/tangem/tap/routing/impl/DefaultRoutingComponent.kt
index c3cd524d98..77283b4c75 100644
--- a/app/src/main/java/com/tangem/tap/routing/impl/DefaultRoutingComponent.kt
+++ b/app/src/main/java/com/tangem/tap/routing/impl/DefaultRoutingComponent.kt
@@ -27,7 +27,7 @@ internal class DefaultRoutingComponent @AssistedInject constructor(
override val stack: Value> = childStack(
source = navigationProvider.getOrCreateTyped(),
- serializer = AppRoute.serializer(),
+ serializer = AppRoute.serializer(), // TODO Maybe set this to null for AppRoute.Onboarding case. Need to check
initialConfiguration = getInitialRoute(),
handleBackButton = false,
childFactory = ::child,
diff --git a/app/src/main/java/com/tangem/tap/routing/utils/ChildFactory.kt b/app/src/main/java/com/tangem/tap/routing/utils/ChildFactory.kt
index b031d03e46..e59897708c 100644
--- a/app/src/main/java/com/tangem/tap/routing/utils/ChildFactory.kt
+++ b/app/src/main/java/com/tangem/tap/routing/utils/ChildFactory.kt
@@ -11,10 +11,8 @@ import com.tangem.features.disclaimer.api.components.DisclaimerComponent
import com.tangem.features.managetokens.component.ManageTokensComponent
import com.tangem.features.managetokens.component.ManageTokensSource
import com.tangem.features.markets.details.MarketsTokenDetailsComponent
-import com.tangem.features.onramp.component.BuyCryptoComponent
import com.tangem.features.onboarding.v2.entry.OnboardingEntryComponent
-import com.tangem.features.onramp.component.OnrampComponent
-import com.tangem.features.onramp.component.SellCryptoComponent
+import com.tangem.features.onramp.component.*
import com.tangem.features.pushnotifications.api.navigation.PushNotificationsRouter
import com.tangem.features.send.api.navigation.SendRouter
import com.tangem.features.staking.api.navigation.StakingRouter
@@ -51,8 +49,10 @@ internal class ChildFactory @Inject constructor(
private val manageTokensComponentFactory: ManageTokensComponent.Factory,
private val marketsTokenDetailsComponentFactory: MarketsTokenDetailsComponent.Factory,
private val onrampComponentFactory: OnrampComponent.Factory,
+ private val onrampSuccessComponentFactory: OnrampSuccessComponent.Factory,
private val buyCryptoComponentFactory: BuyCryptoComponent.Factory,
private val sellCryptoComponentFactory: SellCryptoComponent.Factory,
+ private val swapSelectTokensComponentFactory: SwapSelectTokensComponent.Factory,
private val onboardingEntryComponentFactory: OnboardingEntryComponent.Factory,
private val sendRouter: SendRouter,
private val tokenDetailsRouter: TokenDetailsRouter,
@@ -197,10 +197,21 @@ internal class ChildFactory @Inject constructor(
is AppRoute.Onramp -> {
route.asComponentChild(
contextProvider = contextProvider(route, contextFactory),
- params = OnrampComponent.Params(),
+ params = OnrampComponent.Params(
+ userWalletId = route.userWalletId,
+ cryptoCurrency = route.currency,
+ source = route.source,
+ ),
componentFactory = onrampComponentFactory,
)
}
+ is AppRoute.OnrampSuccess -> {
+ route.asComponentChild(
+ contextProvider = contextProvider(route, contextFactory),
+ params = OnrampSuccessComponent.Params(route.externalTxId),
+ componentFactory = onrampSuccessComponentFactory,
+ )
+ }
is AppRoute.BuyCrypto -> {
route.asComponentChild(
contextProvider = contextProvider(route, contextFactory),
@@ -215,10 +226,24 @@ internal class ChildFactory @Inject constructor(
componentFactory = sellCryptoComponentFactory,
)
}
+ is AppRoute.SwapCrypto -> {
+ route.asComponentChild(
+ contextProvider = contextProvider(route, contextFactory),
+ params = SwapSelectTokensComponent.Params(userWalletId = route.userWalletId),
+ componentFactory = swapSelectTokensComponentFactory,
+ )
+ }
is AppRoute.Onboarding -> {
route.asComponentChild(
contextProvider = contextProvider(route, contextFactory),
- params = OnboardingEntryComponent.Params(route.scanResponse),
+ params = OnboardingEntryComponent.Params(
+ scanResponse = route.scanResponse,
+ startBackupFlow = route.startFromBackup,
+ multiWalletMode = when (route.mode) {
+ AppRoute.Onboarding.Mode.Onboarding -> OnboardingEntryComponent.MultiWalletMode.Onboarding
+ AppRoute.Onboarding.Mode.AddBackup -> OnboardingEntryComponent.MultiWalletMode.AddBackup
+ },
+ ),
componentFactory = onboardingEntryComponentFactory,
)
}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5f2471ff8b..aa962825e1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -3,6 +3,7 @@
android:id="@+id/fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/background_primary">
+ android:background="@color/background_primary"
+ android:filterTouchesWhenObscured="true">
\ No newline at end of file
diff --git a/app/src/test/kotlin/com/tangem/tap/domain/card/CryptoCurrenciesMocks.kt b/app/src/test/kotlin/com/tangem/tap/domain/card/CryptoCurrenciesMocks.kt
index b44074274b..2f2e54876b 100644
--- a/app/src/test/kotlin/com/tangem/tap/domain/card/CryptoCurrenciesMocks.kt
+++ b/app/src/test/kotlin/com/tangem/tap/domain/card/CryptoCurrenciesMocks.kt
@@ -3,6 +3,7 @@ package com.tangem.tap.domain.card
import com.tangem.blockchain.common.Blockchain
import com.tangem.blockchain.common.FeePaidCurrency
import com.tangem.blockchain.common.Token
+import com.tangem.blockchainsdk.utils.ExcludedBlockchains
import com.tangem.blockchainsdk.utils.toNetworkId
import com.tangem.data.common.currency.CryptoCurrencyFactory
import com.tangem.data.common.currency.getNetworkDerivationPath
@@ -17,7 +18,7 @@ import com.tangem.domain.tokens.model.Network
*/
internal class CryptoCurrenciesMocks(private val scanResponse: ScanResponse) {
- private val factory = CryptoCurrencyFactory()
+ private val factory = CryptoCurrencyFactory(excludedBlockchains = ExcludedBlockchains())
val cardano by lazy { listOf(createCoin(blockchain = Blockchain.Cardano)) }
val chia by lazy { listOf(element = createCoin(Blockchain.Chia)) }
@@ -58,6 +59,7 @@ internal class CryptoCurrenciesMocks(private val scanResponse: ScanResponse) {
standardType = getNetworkStandardType(blockchain),
hasFiatFeeRate = blockchain.feePaidCurrency() !is FeePaidCurrency.FeeResource,
canHandleTokens = false,
+ transactionExtrasType = Network.TransactionExtrasType.NONE,
)
return factory.createCoin(network = network)
@@ -85,6 +87,7 @@ internal class CryptoCurrenciesMocks(private val scanResponse: ScanResponse) {
standardType = Network.StandardType.ERC20,
hasFiatFeeRate = true,
canHandleTokens = true,
+ transactionExtrasType = Network.TransactionExtrasType.NONE,
),
name = "NEVER-MIND",
symbol = "NEVER-MIND",
diff --git a/app/src/test/kotlin/com/tangem/tap/domain/card/DefaultDerivationsRepositoryTest.kt b/app/src/test/kotlin/com/tangem/tap/domain/card/DefaultDerivationsRepositoryTest.kt
index 93a58d5ba5..095156e1c2 100644
--- a/app/src/test/kotlin/com/tangem/tap/domain/card/DefaultDerivationsRepositoryTest.kt
+++ b/app/src/test/kotlin/com/tangem/tap/domain/card/DefaultDerivationsRepositoryTest.kt
@@ -2,6 +2,7 @@ package com.tangem.tap.domain.card
import android.annotation.SuppressLint
import com.google.common.truth.Truth
+import com.tangem.blockchainsdk.utils.ExcludedBlockchains
import com.tangem.common.CompletionResult
import com.tangem.datasource.local.userwallet.UserWalletsStore
import com.tangem.domain.card.ScanCardException
@@ -29,6 +30,7 @@ internal class DefaultDerivationsRepositoryTest {
tangemSdkManager = tangemSdkManager,
userWalletsStore = userWalletsStore,
dispatchers = TestingCoroutineDispatcherProvider(),
+ excludedBlockchains = ExcludedBlockchains(),
)
private val defaultUserWalletId = UserWalletId("011")
diff --git a/core/featuretoggles/.gitignore b/common/google/.gitignore
similarity index 100%
rename from core/featuretoggles/.gitignore
rename to common/google/.gitignore
diff --git a/common/google/build.gradle.kts b/common/google/build.gradle.kts
new file mode 100644
index 0000000000..f66ce5bef8
--- /dev/null
+++ b/common/google/build.gradle.kts
@@ -0,0 +1,15 @@
+plugins {
+ alias(deps.plugins.android.library)
+ alias(deps.plugins.kotlin.android)
+ id("configuration")
+}
+
+android {
+ namespace = "com.tangem.common.google"
+}
+
+dependencies {
+
+ implementation(deps.googlePlay.services.wallet)
+
+}
\ No newline at end of file
diff --git a/common/google/src/main/java/com/tangem/google/GoogleServicesHelper.kt b/common/google/src/main/java/com/tangem/google/GoogleServicesHelper.kt
new file mode 100644
index 0000000000..e81718555d
--- /dev/null
+++ b/common/google/src/main/java/com/tangem/google/GoogleServicesHelper.kt
@@ -0,0 +1,89 @@
+package com.tangem.google
+
+import android.content.Context
+import com.google.android.gms.common.ConnectionResult
+import com.google.android.gms.common.GoogleApiAvailability
+import com.google.android.gms.common.api.ApiException
+import com.google.android.gms.wallet.IsReadyToPayRequest
+import com.google.android.gms.wallet.PaymentsClient
+import com.google.android.gms.wallet.Wallet
+import org.json.JSONArray
+import org.json.JSONObject
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+
+object GoogleServicesHelper {
+
+ private val allowedCardNetworks = JSONArray(
+ listOf(
+ "AMEX",
+ "DISCOVER",
+ "INTERAC",
+ "JCB",
+ "MASTERCARD",
+ "VISA",
+ ),
+ )
+
+ private val allowedCardAuthMethods = JSONArray(
+ listOf(
+ "PAN_ONLY",
+ "CRYPTOGRAM_3DS",
+ ),
+ )
+
+ private val baseCardPaymentMethod: JSONObject = JSONObject().apply {
+ val parameters = JSONObject().apply {
+ put("allowedAuthMethods", allowedCardAuthMethods)
+ put("allowedCardNetworks", allowedCardNetworks)
+ put("billingAddressRequired", true)
+ put(
+ "billingAddressParameters",
+ JSONObject().apply {
+ put("format", "FULL")
+ },
+ )
+ }
+
+ put("type", "CARD")
+ put("parameters", parameters)
+ }
+
+ private val baseRequest = JSONObject().apply {
+ put("apiVersion", 2)
+ put("apiVersionMinor", 0)
+ }
+
+ private val availabilityRequest = baseRequest.apply {
+ put("allowedPaymentMethods", JSONArray().put(baseCardPaymentMethod))
+ }
+
+ fun createPaymentsClient(context: Context): PaymentsClient {
+ val walletOptions = Wallet.WalletOptions.Builder()
+ .build()
+ return Wallet.getPaymentsClient(context, walletOptions)
+ }
+
+ fun checkGoogleServicesAvailability(context: Context): Boolean {
+ val googleApiAvailability = GoogleApiAvailability.getInstance()
+ val status = googleApiAvailability.isGooglePlayServicesAvailable(context)
+
+ return status == ConnectionResult.SUCCESS
+ }
+
+ suspend fun checkGooglePayAvailability(paymentsClient: PaymentsClient): Boolean {
+ val request = IsReadyToPayRequest.fromJson(availabilityRequest.toString())
+ val task = paymentsClient.isReadyToPay(request)
+
+ return suspendCoroutine> { continuation ->
+ task.addOnCompleteListener { completedTask ->
+ try {
+ val result = completedTask.getResult(ApiException::class.java)
+ continuation.resume(Result.success(result))
+ } catch (exception: ApiException) {
+ continuation.resume(Result.failure(exception))
+ }
+ }
+ }.getOrElse { false }
+ }
+}
\ No newline at end of file
diff --git a/common/routing/build.gradle.kts b/common/routing/build.gradle.kts
index 71933a08b2..4fd88cfb46 100644
--- a/common/routing/build.gradle.kts
+++ b/common/routing/build.gradle.kts
@@ -20,6 +20,7 @@ dependencies {
implementation(projects.domain.wallets.models)
implementation(projects.domain.staking.models)
implementation(projects.domain.markets.models)
+ implementation(projects.domain.onramp.models)
implementation(projects.domain.appCurrency.models)
/* Libs - Other */
diff --git a/common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt b/common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt
index 6744b6c0be..bc9dae984e 100644
--- a/common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt
+++ b/common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt
@@ -8,6 +8,7 @@ import com.tangem.core.decompose.navigation.Route
import com.tangem.domain.appcurrency.model.AppCurrency
import com.tangem.domain.markets.TokenMarketParams
import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.domain.onramp.model.OnrampSource
import com.tangem.domain.qrscanning.models.SourceType
import com.tangem.domain.staking.model.stakekit.Yield
import com.tangem.domain.tokens.model.CryptoCurrency
@@ -219,16 +220,24 @@ sealed class AppRoute(val path: String) : Route {
@Serializable
data class Swap(
- val currency: CryptoCurrency,
+ val currencyFrom: CryptoCurrency,
+ val currencyTo: CryptoCurrency? = null,
val userWalletId: UserWalletId,
val isInitialReverseOrder: Boolean = false,
- ) : AppRoute(path = "/swap/${currency.id.value}/${userWalletId.stringValue}/$isInitialReverseOrder"),
+ ) : AppRoute(
+ path = "/swap" +
+ "/${currencyFrom.id.value}" +
+ "/${currencyTo?.id?.value}" +
+ "/${userWalletId.stringValue}" +
+ "/$isInitialReverseOrder",
+ ),
RouteBundleParams {
override fun getBundle(): Bundle = bundle(serializer())
companion object {
- const val CURRENCY_BUNDLE_KEY = "currency"
+ const val CURRENCY_FROM_KEY = "currencyFrom"
+ const val CURRENCY_TO_KEY = "currencyTo"
const val USER_WALLET_ID_KEY = "userWalletId"
const val IS_INITIAL_REVERSE_ORDER = "isInitialReverseOrder"
}
@@ -287,7 +296,20 @@ sealed class AppRoute(val path: String) : Route {
}
@Serializable
- data object Onramp : AppRoute(path = "/onramp")
+ data class Onramp(
+ val source: OnrampSource,
+ val userWalletId: UserWalletId,
+ val currency: CryptoCurrency,
+ ) : AppRoute(path = "/onramp/${userWalletId.stringValue}/${currency.symbol}"), RouteBundleParams {
+ override fun getBundle(): Bundle = bundle(serializer())
+ }
+
+ @Serializable
+ data class OnrampSuccess(
+ val externalTxId: String,
+ ) : AppRoute(path = "/onramp/success/$externalTxId"), RouteBundleParams {
+ override fun getBundle(): Bundle = bundle(serializer())
+ }
@Serializable
data class BuyCrypto(
@@ -299,6 +321,22 @@ sealed class AppRoute(val path: String) : Route {
val userWalletId: UserWalletId,
) : AppRoute(path = "/sell_crypto/${userWalletId.stringValue}")
+ @Serializable
+ data class SwapCrypto(
+ val userWalletId: UserWalletId,
+ ) : AppRoute(path = "/swap_crypto/${userWalletId.stringValue}")
+
// Onboarding V2
- data class Onboarding(val scanResponse: ScanResponse) : AppRoute(path = "/onboarding_v2")
+ @Serializable
+ data class Onboarding(
+ val scanResponse: ScanResponse,
+ val startFromBackup: Boolean,
+ val mode: Mode = Mode.Onboarding,
+ ) : AppRoute(path = "/onboarding_v2${if (startFromBackup) "/backup" else ""}") {
+
+ enum class Mode {
+ Onboarding, // general Mode
+ AddBackup, // continue backup process for existing wallet 1
+ }
+ }
}
\ No newline at end of file
diff --git a/common/ui/src/main/java/com/tangem/common/ui/bottomsheet/permission/GiveTxPermisssionBottomSheet.kt b/common/ui/src/main/java/com/tangem/common/ui/bottomsheet/permission/GiveTxPermisssionBottomSheet.kt
index 5d8b37fd46..4f4e74d559 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/bottomsheet/permission/GiveTxPermisssionBottomSheet.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/bottomsheet/permission/GiveTxPermisssionBottomSheet.kt
@@ -31,10 +31,7 @@ import com.tangem.core.ui.components.bottomsheets.TangemBottomSheet
import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
import com.tangem.core.ui.components.containers.FooterContainer
import com.tangem.core.ui.components.inputrow.InputRowDefault
-import com.tangem.core.ui.extensions.TextReference
-import com.tangem.core.ui.extensions.resolveReference
-import com.tangem.core.ui.extensions.resourceReference
-import com.tangem.core.ui.extensions.wrappedList
+import com.tangem.core.ui.extensions.*
import com.tangem.core.ui.res.TangemTheme
import com.tangem.core.ui.res.TangemThemePreview
import kotlinx.collections.immutable.ImmutableList
@@ -118,7 +115,7 @@ private fun GiveTxPermissionBottomSheetContent(content: GiveTxPermissionBottomSh
@Composable
private fun ApprovalBottomSheetInfo(data: GiveTxPermissionState.ReadyForRequest) {
FooterContainer(
- footer = stringResource(id = R.string.give_permission_policy_type_footer),
+ footer = resourceReference(R.string.give_permission_policy_type_footer),
modifier = Modifier.padding(horizontal = TangemTheme.dimens.spacing16),
) {
AmountItem(
@@ -130,7 +127,7 @@ private fun ApprovalBottomSheetInfo(data: GiveTxPermissionState.ReadyForRequest)
}
SpacerH16()
FooterContainer(
- footer = data.footerText.resolveReference(),
+ footer = data.footerText,
modifier = Modifier.padding(horizontal = TangemTheme.dimens.spacing16),
) {
FeeItem(fee = data.fee)
diff --git a/common/ui/src/main/java/com/tangem/common/ui/expressStatus/ExpressStatusBlock.kt b/common/ui/src/main/java/com/tangem/common/ui/expressStatus/ExpressStatusBlock.kt
new file mode 100644
index 0000000000..cdf3f1f8fb
--- /dev/null
+++ b/common/ui/src/main/java/com/tangem/common/ui/expressStatus/ExpressStatusBlock.kt
@@ -0,0 +1,228 @@
+package com.tangem.common.ui.expressStatus
+
+import androidx.annotation.DrawableRes
+import androidx.compose.animation.*
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.tooling.preview.Preview
+import com.tangem.common.ui.R
+import com.tangem.common.ui.expressStatus.state.ExpressLinkUM
+import com.tangem.common.ui.expressStatus.state.ExpressStatusItemState
+import com.tangem.common.ui.expressStatus.state.ExpressStatusItemUM
+import com.tangem.common.ui.expressStatus.state.ExpressStatusUM
+import com.tangem.core.ui.components.SpacerWMax
+import com.tangem.core.ui.extensions.resolveReference
+import com.tangem.core.ui.extensions.resourceReference
+import com.tangem.core.ui.extensions.stringReference
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemThemePreview
+import kotlinx.collections.immutable.persistentListOf
+
+/**
+ * Block with express statuses
+ *
+ * @param state ui holder
+ * @param modifier modifier
+ * @see [Figma](https://www.figma.com/design/Vs6SkVsFnUPsSCNwlnVf5U/Android-%E2%80%93-UI?node-id=18459-26521&t=4jox7bfqUiXnm2h1-4)
+ */
+@Composable
+fun ExpressStatusBlock(state: ExpressStatusUM, modifier: Modifier = Modifier) {
+ Column(
+ modifier = modifier
+ .clip(TangemTheme.shapes.roundedCornersXMedium)
+ .background(TangemTheme.colors.background.action)
+ .padding(
+ vertical = TangemTheme.dimens.spacing14,
+ horizontal = TangemTheme.dimens.spacing12,
+ ),
+ ) {
+ Row(
+ verticalAlignment = Alignment.CenterVertically,
+ modifier = Modifier
+ .padding(bottom = TangemTheme.dimens.spacing16),
+ ) {
+ Text(
+ text = state.title.resolveReference(),
+ style = TangemTheme.typography.subtitle2,
+ color = TangemTheme.colors.text.tertiary,
+ )
+ SpacerWMax()
+ AnimatedVisibility(visible = state.link is ExpressLinkUM.Content) {
+ val link = remember(this) { state.link as ExpressLinkUM.Content }
+ Row(
+ modifier = Modifier.clickable { link.onClick() },
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ Icon(
+ painter = painterResource(id = link.icon),
+ contentDescription = null,
+ tint = TangemTheme.colors.icon.informative,
+ modifier = Modifier
+ .size(TangemTheme.dimens.spacing16)
+ .padding(end = TangemTheme.dimens.spacing2),
+ )
+ Text(
+ text = link.text.resolveReference(),
+ style = TangemTheme.typography.body2,
+ color = TangemTheme.colors.text.tertiary,
+ )
+ }
+ }
+ }
+
+ Column {
+ state.statuses.forEachIndexed { index, item ->
+ ExpressStatusStep(item, index == state.statuses.lastIndex)
+ }
+ }
+ }
+}
+
+@Composable
+private fun ExpressStatusStep(status: ExpressStatusItemUM, isLast: Boolean) {
+ AnimatedContent(
+ targetState = status,
+ label = "Exchange Step Change Success",
+ transitionSpec = {
+ fadeIn(tween(durationMillis = 220)) togetherWith
+ fadeOut(tween(durationMillis = 220))
+ },
+ ) { content ->
+ Row {
+ Column(
+ horizontalAlignment = Alignment.CenterHorizontally,
+ ) {
+ when (content.state) {
+ ExpressStatusItemState.Active -> StepInProgress()
+ ExpressStatusItemState.Default -> StepDefault()
+ ExpressStatusItemState.Done -> Step(
+ iconRes = R.drawable.ic_check_24,
+ iconColor = TangemTheme.colors.icon.primary1,
+ borderColor = TangemTheme.colors.field.focused,
+ )
+ ExpressStatusItemState.Error -> Step(
+ iconRes = R.drawable.ic_close_24,
+ iconColor = TangemTheme.colors.icon.warning,
+ )
+ ExpressStatusItemState.Warning -> Step(
+ iconRes = R.drawable.ic_close_24,
+ iconColor = TangemTheme.colors.icon.attention,
+ )
+ }
+ if (!isLast) {
+ StepSeparator()
+ }
+ }
+ val textColor = when (status.state) {
+ ExpressStatusItemState.Active -> TangemTheme.colors.text.primary1
+ ExpressStatusItemState.Default -> TangemTheme.colors.text.disabled
+ ExpressStatusItemState.Done -> TangemTheme.colors.text.primary1
+ ExpressStatusItemState.Error -> TangemTheme.colors.text.warning
+ ExpressStatusItemState.Warning -> TangemTheme.colors.text.attention
+ }
+ Text(
+ text = content.text.resolveReference(),
+ style = TangemTheme.typography.body2,
+ color = textColor,
+ modifier = Modifier
+ .padding(start = TangemTheme.dimens.spacing12),
+ )
+ }
+ }
+}
+
+@Composable
+private fun StepDefault() {
+ Box(
+ modifier = Modifier
+ .size(TangemTheme.dimens.size20)
+ .border(
+ width = TangemTheme.dimens.size1_5,
+ color = TangemTheme.colors.field.focused,
+ shape = CircleShape,
+ )
+ .padding(TangemTheme.dimens.spacing2),
+ )
+}
+
+@Composable
+private fun Step(iconColor: Color, @DrawableRes iconRes: Int, borderColor: Color = iconColor) {
+ Icon(
+ painter = painterResource(id = iconRes),
+ contentDescription = null,
+ tint = iconColor,
+ modifier = Modifier
+ .size(TangemTheme.dimens.size20)
+ .border(
+ width = TangemTheme.dimens.size1_5,
+ color = borderColor,
+ shape = CircleShape,
+ )
+ .padding(TangemTheme.dimens.spacing2),
+ )
+}
+
+@Composable
+private fun StepInProgress() {
+ CircularProgressIndicator(
+ color = TangemTheme.colors.icon.primary1,
+ strokeWidth = TangemTheme.dimens.size2,
+ modifier = Modifier
+ .padding(TangemTheme.dimens.spacing2)
+ .size(TangemTheme.dimens.size14),
+ )
+}
+
+@Composable
+private fun StepSeparator() {
+ Box(
+ modifier = Modifier
+ .padding(vertical = TangemTheme.dimens.spacing2)
+ .size(
+ width = TangemTheme.dimens.size1_5,
+ height = TangemTheme.dimens.size10,
+ )
+ .background(
+ color = TangemTheme.colors.field.focused,
+ shape = CircleShape,
+ ),
+ )
+}
+
+@Preview
+@Composable
+private fun Preview_ExchangeStatusBlock() {
+ val state = ExpressStatusUM(
+ title = resourceReference(R.string.express_exchange_status_title),
+ link = ExpressLinkUM.Content(
+ icon = R.drawable.ic_alert_24,
+ text = resourceReference(R.string.common_go_to_provider),
+ onClick = {},
+ ),
+ statuses = persistentListOf(
+ ExpressStatusItemUM(text = stringReference("Done"), state = ExpressStatusItemState.Done),
+ ExpressStatusItemUM(text = stringReference("Active"), state = ExpressStatusItemState.Active),
+ ExpressStatusItemUM(text = stringReference("Warning"), state = ExpressStatusItemState.Warning),
+ ExpressStatusItemUM(text = stringReference("Error"), state = ExpressStatusItemState.Error),
+ ExpressStatusItemUM(text = stringReference("Default"), state = ExpressStatusItemState.Default),
+ ),
+ )
+
+ TangemThemePreview {
+ ExpressStatusBlock(state = state)
+ }
+}
\ No newline at end of file
diff --git a/common/ui/src/main/java/com/tangem/common/ui/expressStatus/ExpressStatusNotificationBlock.kt b/common/ui/src/main/java/com/tangem/common/ui/expressStatus/ExpressStatusNotificationBlock.kt
new file mode 100644
index 0000000000..58693f2e00
--- /dev/null
+++ b/common/ui/src/main/java/com/tangem/common/ui/expressStatus/ExpressStatusNotificationBlock.kt
@@ -0,0 +1,32 @@
+package com.tangem.common.ui.expressStatus
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.tangem.common.ui.notifications.ExpressNotificationsUM
+import com.tangem.common.ui.notifications.NotificationUM
+import com.tangem.core.ui.components.notifications.Notification
+import com.tangem.core.ui.res.TangemTheme
+
+@Composable
+fun ExpressStatusNotificationBlock(state: NotificationUM?) {
+ AnimatedVisibility(
+ visible = state?.config != null,
+ modifier = Modifier.padding(top = 12.dp),
+ label = "Express Status Notification Change",
+ ) {
+ val wrappedNotification = remember(this) { requireNotNull(state?.config) }
+ Notification(
+ config = wrappedNotification,
+ iconTint = when (state) {
+ is ExpressNotificationsUM.NeedVerification -> TangemTheme.colors.icon.attention
+ is ExpressNotificationsUM.FailedByProvider -> TangemTheme.colors.icon.warning
+ else -> null
+ },
+ containerColor = TangemTheme.colors.background.action,
+ )
+ }
+}
\ No newline at end of file
diff --git a/common/ui/src/main/java/com/tangem/common/ui/expressStatus/state/ExpressStatusUM.kt b/common/ui/src/main/java/com/tangem/common/ui/expressStatus/state/ExpressStatusUM.kt
new file mode 100644
index 0000000000..6fcb02cc30
--- /dev/null
+++ b/common/ui/src/main/java/com/tangem/common/ui/expressStatus/state/ExpressStatusUM.kt
@@ -0,0 +1,54 @@
+package com.tangem.common.ui.expressStatus.state
+
+import androidx.annotation.DrawableRes
+import androidx.compose.runtime.Stable
+import com.tangem.core.ui.extensions.TextReference
+import kotlinx.collections.immutable.ImmutableList
+
+/**
+ * UI data holder for express status block
+ *
+ * @property title block title
+ * @property link provider web link
+ * @property statuses list of possible and active statuses
+ */
+data class ExpressStatusUM(
+ val title: TextReference,
+ val link: ExpressLinkUM,
+ val statuses: ImmutableList,
+)
+
+/**
+ * Provider web link for express status block.
+ * [Empty] if no link needed
+ * [Content] if link is provided and displayed
+ */
+@Stable
+sealed class ExpressLinkUM {
+ data object Empty : ExpressLinkUM()
+ data class Content(
+ @DrawableRes val icon: Int,
+ val text: TextReference,
+ val onClick: () -> Unit,
+ ) : ExpressLinkUM()
+}
+
+/**
+ * Single status item in express status block
+ */
+data class ExpressStatusItemUM(
+ val text: TextReference,
+ val state: ExpressStatusItemState,
+)
+
+/**
+ * Available status states for express status block
+ */
+enum class ExpressStatusItemState {
+ Active,
+ Default,
+ Done,
+ Warning,
+ Error,
+ ;
+}
\ No newline at end of file
diff --git a/common/ui/src/main/java/com/tangem/common/ui/notifications/ExpressNotificationsUM.kt b/common/ui/src/main/java/com/tangem/common/ui/notifications/ExpressNotificationsUM.kt
new file mode 100644
index 0000000000..09c66ed8c8
--- /dev/null
+++ b/common/ui/src/main/java/com/tangem/common/ui/notifications/ExpressNotificationsUM.kt
@@ -0,0 +1,28 @@
+package com.tangem.common.ui.notifications
+
+import com.tangem.common.ui.R
+import com.tangem.core.ui.components.notifications.NotificationConfig
+import com.tangem.core.ui.extensions.resourceReference
+
+object ExpressNotificationsUM {
+
+ data class NeedVerification(val onGoToProviderClick: () -> Unit) : NotificationUM.Warning(
+ title = resourceReference(R.string.express_exchange_notification_verification_title),
+ subtitle = resourceReference(R.string.express_exchange_notification_verification_text),
+ iconResId = R.drawable.ic_alert_triangle_20,
+ buttonsState = NotificationConfig.ButtonsState.SecondaryButtonConfig(
+ text = resourceReference(R.string.common_go_to_provider),
+ onClick = onGoToProviderClick,
+ ),
+ )
+
+ data class FailedByProvider(val onGoToProviderClick: () -> Unit) : NotificationUM.Error(
+ title = resourceReference(R.string.express_exchange_notification_failed_title),
+ subtitle = resourceReference(R.string.express_exchange_notification_failed_text),
+ iconResId = R.drawable.ic_alert_circle_24,
+ buttonState = NotificationConfig.ButtonsState.SecondaryButtonConfig(
+ text = resourceReference(R.string.common_go_to_provider),
+ onClick = onGoToProviderClick,
+ ),
+ )
+}
\ No newline at end of file
diff --git a/common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationUM.kt b/common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationUM.kt
index 858fdccb46..9f5bf56e7d 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationUM.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationUM.kt
@@ -9,6 +9,7 @@ import com.tangem.core.ui.extensions.wrappedList
import com.tangem.core.ui.format.bigdecimal.crypto
import com.tangem.core.ui.format.bigdecimal.format
import com.tangem.core.ui.format.bigdecimal.shorted
+import com.tangem.domain.tokens.model.warnings.CryptoCurrencyWarning
import java.math.BigDecimal
sealed class NotificationUM(val config: NotificationConfig) {
@@ -226,6 +227,24 @@ sealed class NotificationUM(val config: NotificationConfig) {
wrappedList(cryptoAmount, fiatAmount),
),
)
+
+ data class OnrampErrorNotification(val errorCode: String?, val onRefresh: () -> Unit) : Warning(
+ title = resourceReference(R.string.common_error),
+ subtitle = if (errorCode != null) {
+ resourceReference(R.string.express_error_code, wrappedList(errorCode))
+ } else {
+ resourceReference(R.string.common_unknown_error)
+ },
+ buttonsState = NotificationConfig.ButtonsState.SecondaryButtonConfig(
+ text = resourceReference(R.string.warning_button_refresh),
+ onClick = onRefresh,
+ ),
+ )
+
+ data object SwapNoAvailablePair : Warning(
+ title = resourceReference(id = R.string.action_buttons_swap_no_available_pair_notification_title),
+ subtitle = resourceReference(id = R.string.action_buttons_swap_no_available_pair_notification_message),
+ )
}
open class Info(
@@ -307,4 +326,17 @@ sealed class NotificationUM(val config: NotificationConfig) {
),
)
}
+
+ sealed interface Solana {
+
+ data class RentInfo(
+ private val rentInfo: CryptoCurrencyWarning.Rent,
+ ) : Error(
+ title = TextReference.Res(R.string.send_notification_invalid_amount_title),
+ subtitle = TextReference.Res(
+ id = R.string.send_notification_invalid_amount_rent_fee,
+ formatArgs = wrappedList(rentInfo.exemptionAmount),
+ ),
+ )
+ }
}
\ No newline at end of file
diff --git a/common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationsFactory.kt b/common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationsFactory.kt
index 13b0c42b88..adf9f08d85 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationsFactory.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationsFactory.kt
@@ -42,6 +42,41 @@ object NotificationsFactory {
}
}
+ fun MutableList.addFeeUnreachableNotification(
+ tokenStatus: CryptoCurrencyStatus,
+ coinStatus: CryptoCurrencyStatus,
+ feeError: GetFeeError?,
+ onReload: () -> Unit,
+ onClick: (currency: CryptoCurrency) -> Unit,
+ ) {
+ when (feeError) {
+ is GetFeeError.BlockchainErrors.TronActivationError -> add(
+ NotificationUM.Warning.TronAccountNotActivated(coinStatus.currency.name),
+ )
+ is GetFeeError.BlockchainErrors.KaspaZeroUtxo -> add(
+ NotificationUM.Error.TokenExceedsBalance(
+ networkIconId = coinStatus.currency.networkIconResId,
+ networkName = coinStatus.currency.name,
+ currencyName = tokenStatus.currency.name,
+ feeName = coinStatus.currency.name,
+ feeSymbol = coinStatus.currency.symbol,
+ mergeFeeNetworkName = false,
+ onClick = {
+ onClick(coinStatus.currency)
+ },
+ ),
+ )
+ is GetFeeError.DataError,
+ is GetFeeError.UnknownError,
+ -> add(
+ NotificationUM.Warning.NetworkFeeUnreachable(onReload),
+ )
+ else -> {
+ /* do nothing */
+ }
+ }
+ }
+
fun MutableList.addExceedBalanceNotification(
feeAmount: BigDecimal,
sendingAmount: BigDecimal,
@@ -185,7 +220,7 @@ object NotificationsFactory {
if (dustValue == null) return
val isExceedsLimit = checkDustLimits(
feeAmount = feeValue,
- receivedAmount = sendingAmount,
+ sendingAmount = sendingAmount,
dustValue = dustValue,
cryptoCurrencyStatus = cryptoCurrencyStatus,
feeCurrencyStatus = feeCurrencyStatus,
@@ -345,9 +380,14 @@ object NotificationsFactory {
}
}
+ fun MutableList.addRentExemptionNotification(rentWarning: CryptoCurrencyWarning.Rent?) {
+ if (rentWarning == null) return
+ add(NotificationUM.Solana.RentInfo(rentWarning))
+ }
+
private fun checkDustLimits(
feeAmount: BigDecimal,
- receivedAmount: BigDecimal,
+ sendingAmount: BigDecimal,
dustValue: BigDecimal,
cryptoCurrencyStatus: CryptoCurrencyStatus,
feeCurrencyStatus: CryptoCurrencyStatus?,
@@ -355,7 +395,7 @@ object NotificationsFactory {
val change = when (cryptoCurrencyStatus.currency) {
is CryptoCurrency.Coin -> {
val balance = cryptoCurrencyStatus.value.amount ?: BigDecimal.ZERO
- balance - (feeAmount + receivedAmount)
+ balance - (feeAmount + sendingAmount)
}
is CryptoCurrency.Token -> {
val balance = feeCurrencyStatus?.value?.amount ?: BigDecimal.ZERO
@@ -364,6 +404,9 @@ object NotificationsFactory {
}
val isChangeLowerThanDust = change < dustValue && change > BigDecimal.ZERO
- return receivedAmount < dustValue || isChangeLowerThanDust
+ return when (cryptoCurrencyStatus.currency) {
+ is CryptoCurrency.Coin -> sendingAmount < dustValue || isChangeLowerThanDust
+ is CryptoCurrency.Token -> isChangeLowerThanDust
+ }
}
}
\ No newline at end of file
diff --git a/common/ui/src/main/java/com/tangem/common/ui/tokens/TokenItemStateConverter.kt b/common/ui/src/main/java/com/tangem/common/ui/tokens/TokenItemStateConverter.kt
index ae4993d6ce..97f2be4e26 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/tokens/TokenItemStateConverter.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/tokens/TokenItemStateConverter.kt
@@ -5,10 +5,11 @@ import com.tangem.core.ui.components.currency.icon.converter.CryptoCurrencyToIco
import com.tangem.core.ui.components.marketprice.PriceChangeType
import com.tangem.core.ui.components.marketprice.utils.PriceChangeConverter
import com.tangem.core.ui.components.token.state.TokenItemState
+import com.tangem.core.ui.extensions.stringReference
import com.tangem.core.ui.format.bigdecimal.crypto
+import com.tangem.core.ui.format.bigdecimal.fiat
import com.tangem.core.ui.format.bigdecimal.format
import com.tangem.core.ui.format.bigdecimal.percent
-import com.tangem.core.ui.utils.BigDecimalFormatter
import com.tangem.domain.appcurrency.model.AppCurrency
import com.tangem.domain.staking.model.stakekit.YieldBalance
import com.tangem.domain.tokens.model.CryptoCurrencyStatus
@@ -36,11 +37,14 @@ class TokenItemStateConverter(
private val subtitleStateProvider: (CryptoCurrencyStatus) -> TokenItemState.SubtitleState? = {
createSubtitleState(it, appCurrency)
},
- private val fiatAmountStateProvider: (CryptoCurrencyStatus) -> TokenItemState.FiatAmountState? = {
- createFiatAmountState(it, appCurrency)
+ private val subtitle2StateProvider: (CryptoCurrencyStatus) -> TokenItemState.Subtitle2State? = {
+ createSubtitle2State(currencyStatus = it)
},
- private val onItemClick: (CryptoCurrencyStatus) -> Unit,
- private val onItemLongClick: ((CryptoCurrencyStatus) -> Unit)? = null,
+ private val fiatAmountStateProvider: (CryptoCurrencyStatus) -> TokenItemState.FiatAmountState? = {
+ createFiatAmountState(status = it, appCurrency = appCurrency)
+ },
+ private val onItemClick: ((TokenItemState, CryptoCurrencyStatus) -> Unit)? = null,
+ private val onItemLongClick: ((TokenItemState, CryptoCurrencyStatus) -> Unit)? = null,
) : Converter {
override fun convert(value: CryptoCurrencyStatus): TokenItemState {
@@ -74,29 +78,27 @@ class TokenItemStateConverter(
titleState = titleStateProvider(this),
subtitleState = requireNotNull(subtitleStateProvider(this)),
fiatAmountState = requireNotNull(fiatAmountStateProvider(this)),
- subtitle2State = TokenItemState.Subtitle2State.TextContent(text = getFormattedAmount()),
- onItemClick = { onItemClick(this) },
- onItemLongClick = onItemLongClick?.let {
- { it(this) }
+ subtitle2State = requireNotNull(subtitle2StateProvider(this)),
+ onItemClick = onItemClick?.let { onItemClick ->
+ { onItemClick(it, this) }
+ },
+ onItemLongClick = onItemLongClick?.let { onItemLongClick ->
+ { onItemLongClick(it, this) }
},
)
}
- private fun CryptoCurrencyStatus.getFormattedAmount(): String {
- val amount = value.amount?.plus(getStakedBalance()) ?: return DASH_SIGN
-
- return amount.format { crypto(currency) }
- }
-
private fun CryptoCurrencyStatus.mapToUnreachableTokenItemState(): TokenItemState.Unreachable {
return TokenItemState.Unreachable(
id = currency.id.value,
iconState = iconStateProvider(this),
titleState = titleStateProvider(this),
subtitleState = subtitleStateProvider(this),
- onItemClick = { onItemClick(this) },
- onItemLongClick = onItemLongClick?.let {
- { it(this) }
+ onItemClick = onItemClick?.let { onItemClick ->
+ { onItemClick(it, this) }
+ },
+ onItemLongClick = onItemLongClick?.let { onItemLongClick ->
+ { onItemLongClick(it, this) }
},
)
}
@@ -107,14 +109,45 @@ class TokenItemStateConverter(
iconState = iconStateProvider(this),
titleState = titleStateProvider(this),
subtitleState = subtitleStateProvider(this),
- onItemLongClick = onItemLongClick?.let {
- { it(this) }
+ onItemLongClick = onItemLongClick?.let { onItemLongClick ->
+ { onItemLongClick(it, this) }
},
)
}
companion object {
+ fun CryptoCurrencyStatus.getFormattedFiatAmount(appCurrency: AppCurrency, includeStaking: Boolean): String {
+ val fiatAmount = value.fiatAmount ?: return DASH_SIGN
+
+ val totalAmount = if (includeStaking) {
+ val fiatYieldBalance = value.fiatRate?.times(getStakedBalance()).orZero()
+
+ fiatAmount.plus(fiatYieldBalance)
+ } else {
+ fiatAmount
+ }
+
+ return totalAmount.format {
+ fiat(fiatCurrencyCode = appCurrency.code, fiatCurrencySymbol = appCurrency.symbol)
+ }
+ }
+
+ fun CryptoCurrencyStatus.getFormattedCryptoAmount(includeStaking: Boolean): String {
+ val cryptoAmount = value.amount ?: return DASH_SIGN
+
+ val totalAmount = if (includeStaking) {
+ cryptoAmount.plus(getStakedBalance())
+ } else {
+ cryptoAmount
+ }
+
+ return totalAmount.format { crypto(currency) }
+ }
+
+ fun CryptoCurrencyStatus.getStakedBalance() =
+ (value.yieldBalance as? YieldBalance.Data)?.getTotalWithRewardsStakingBalance().orZero()
+
private fun createTitleState(currencyStatus: CryptoCurrencyStatus): TokenItemState.TitleState {
return when (val value = currencyStatus.value) {
is CryptoCurrencyStatus.Loading,
@@ -122,7 +155,7 @@ class TokenItemStateConverter(
is CryptoCurrencyStatus.Unreachable,
is CryptoCurrencyStatus.NoAmount,
-> {
- TokenItemState.TitleState.Content(text = currencyStatus.currency.name)
+ TokenItemState.TitleState.Content(text = stringReference(currencyStatus.currency.name))
}
is CryptoCurrencyStatus.Loaded,
is CryptoCurrencyStatus.Custom,
@@ -130,7 +163,7 @@ class TokenItemStateConverter(
is CryptoCurrencyStatus.NoAccount,
-> {
TokenItemState.TitleState.Content(
- text = currencyStatus.currency.name,
+ text = stringReference(currencyStatus.currency.name),
hasPending = value.hasCurrentNetworkTransactions,
)
}
@@ -155,6 +188,25 @@ class TokenItemStateConverter(
}
}
+ private fun createSubtitle2State(currencyStatus: CryptoCurrencyStatus): TokenItemState.Subtitle2State? {
+ return when (currencyStatus.value) {
+ is CryptoCurrencyStatus.Loaded,
+ is CryptoCurrencyStatus.Custom,
+ is CryptoCurrencyStatus.NoQuote,
+ is CryptoCurrencyStatus.NoAccount,
+ -> {
+ TokenItemState.Subtitle2State.TextContent(
+ text = currencyStatus.getFormattedCryptoAmount(includeStaking = true),
+ )
+ }
+ is CryptoCurrencyStatus.Loading,
+ is CryptoCurrencyStatus.MissedDerivation,
+ is CryptoCurrencyStatus.Unreachable,
+ is CryptoCurrencyStatus.NoAmount,
+ -> null
+ }
+ }
+
private fun createFiatAmountState(
status: CryptoCurrencyStatus,
appCurrency: AppCurrency,
@@ -166,7 +218,7 @@ class TokenItemStateConverter(
is CryptoCurrencyStatus.NoAccount,
-> {
TokenItemState.FiatAmountState.Content(
- text = status.getFormattedFiatAmount(appCurrency),
+ text = status.getFormattedFiatAmount(appCurrency = appCurrency, includeStaking = true),
hasStaked = !status.getStakedBalance().isZero(),
)
}
@@ -194,25 +246,13 @@ class TokenItemStateConverter(
}
private fun BigDecimal.getFormattedCryptoPrice(appCurrency: AppCurrency): String {
- return BigDecimalFormatter.formatFiatAmountUncapped(
- fiatAmount = this,
- fiatCurrencyCode = appCurrency.code,
- fiatCurrencySymbol = appCurrency.symbol,
- )
+ return format {
+ fiat(fiatCurrencyCode = appCurrency.code, fiatCurrencySymbol = appCurrency.symbol)
+ }
}
private fun BigDecimal.getPriceChangeType(): PriceChangeType {
return PriceChangeConverter.fromBigDecimal(value = this)
}
-
- fun CryptoCurrencyStatus.getFormattedFiatAmount(appCurrency: AppCurrency): String {
- val fiatYieldBalance = value.fiatRate?.times(getStakedBalance()).orZero()
- val fiatAmount = value.fiatAmount?.plus(fiatYieldBalance) ?: return DASH_SIGN
-
- return BigDecimalFormatter.formatFiatAmount(fiatAmount, appCurrency.code, appCurrency.symbol)
- }
-
- private fun CryptoCurrencyStatus.getStakedBalance() =
- (value.yieldBalance as? YieldBalance.Data)?.getTotalWithRewardsStakingBalance().orZero()
}
}
\ No newline at end of file
diff --git a/core/analytics/models/src/main/java/com/tangem/core/analytics/models/AnalyticsParam.kt b/core/analytics/models/src/main/java/com/tangem/core/analytics/models/AnalyticsParam.kt
index b646142403..723451acf5 100644
--- a/core/analytics/models/src/main/java/com/tangem/core/analytics/models/AnalyticsParam.kt
+++ b/core/analytics/models/src/main/java/com/tangem/core/analytics/models/AnalyticsParam.kt
@@ -76,6 +76,9 @@ sealed class AnalyticsParam {
data object MyWallets : ScreensSources("My Wallets")
data object Token : ScreensSources("Token")
data object Stories : ScreensSources("Stories")
+ data object Buy : ScreensSources("Buy")
+ data object Swap : ScreensSources("Swap")
+ data object Sell : ScreensSources("Sell")
}
sealed class TxSentFrom(val value: String) {
@@ -161,11 +164,18 @@ sealed class AnalyticsParam {
}
}
+ enum class Status(val value: String) {
+ Success(value = "Success"),
+ Error(value = "Error"),
+ Pending(value = "Pending"),
+ }
+
companion object Key {
const val BLOCKCHAIN = "blockchain"
const val TOKEN_PARAM = "Token"
const val SOURCE = "Source"
const val BALANCE = "Balance"
+ const val TOKENS_COUNT = "Tokens Count"
const val STATE = "State"
const val BATCH = "Batch"
const val TYPE = "Type"
@@ -190,12 +200,10 @@ sealed class AnalyticsParam {
const val INPUT = "Input"
const val COUNT = "Count"
const val DERIVATION = "Derivation"
-
- // region swap
- const val TOKEN_CATEGORY = "Token"
const val STATUS = "Status"
const val PROVIDER = "Provider"
const val PLACE = "Place"
- //
+ const val RESIDENCE = "Residence"
+ const val PAYMENT_METHOD = "Payment Method"
}
}
\ No newline at end of file
diff --git a/core/analytics/models/src/main/java/com/tangem/core/analytics/models/event/MainScreenAnalyticsEvent.kt b/core/analytics/models/src/main/java/com/tangem/core/analytics/models/event/MainScreenAnalyticsEvent.kt
new file mode 100644
index 0000000000..02c1a6d4c0
--- /dev/null
+++ b/core/analytics/models/src/main/java/com/tangem/core/analytics/models/event/MainScreenAnalyticsEvent.kt
@@ -0,0 +1,75 @@
+package com.tangem.core.analytics.models.event
+
+import com.tangem.core.analytics.models.AnalyticsEvent
+import com.tangem.core.analytics.models.AnalyticsParam
+import com.tangem.core.analytics.models.AnalyticsParam.Key.TOKEN_PARAM
+
+/**
+ * Main screen analytics event
+ *
+ * @param event event name
+ * @param params params
+ */
+sealed class MainScreenAnalyticsEvent(
+ event: String,
+ params: Map = mapOf(),
+) : AnalyticsEvent(category = "Main Screen", event = event, params = params) {
+
+ class EnableBiometrics(state: AnalyticsParam.OnOffState) : MainScreenAnalyticsEvent(
+ event = "Enable Biometric",
+ params = mapOf("State" to state.value),
+ )
+
+ // region Action Buttons feature
+ data class ButtonBuy(val status: AnalyticsParam.Status) : MainScreenAnalyticsEvent(
+ event = "Button - Buy",
+ params = mapOf(AnalyticsParam.STATUS to status.value),
+ )
+
+ data class ButtonSwap(val status: AnalyticsParam.Status) : MainScreenAnalyticsEvent(
+ event = "Button - Swap",
+ params = mapOf(AnalyticsParam.STATUS to status.value),
+ )
+
+ data class ButtonSell(val status: AnalyticsParam.Status) : MainScreenAnalyticsEvent(
+ event = "Button - Sell",
+ params = mapOf(AnalyticsParam.STATUS to status.value),
+ )
+
+ data object BuyScreenOpened : MainScreenAnalyticsEvent(event = "Buy Screen Opened")
+
+ data object SwapScreenOpened : MainScreenAnalyticsEvent(event = "Swap Screen Opened")
+
+ data object SellScreenOpened : MainScreenAnalyticsEvent(event = "Sell Screen Opened")
+
+ data class BuyTokenClicked(val currencySymbol: String) : MainScreenAnalyticsEvent(
+ event = "Buy Token Clicked",
+ params = mapOf(TOKEN_PARAM to currencySymbol),
+ )
+
+ data class SellTokenClicked(val currencySymbol: String) : MainScreenAnalyticsEvent(
+ event = "Sell Token Clicked",
+ params = mapOf(TOKEN_PARAM to currencySymbol),
+ )
+
+ data class SwapTokenClicked(val currencySymbol: String) : MainScreenAnalyticsEvent(
+ event = "Swap Token Clicked",
+ params = mapOf(TOKEN_PARAM to currencySymbol),
+ )
+
+ data class ReceiveTokenClicked(val currencySymbol: String) : MainScreenAnalyticsEvent(
+ event = "Receive Token Clicked",
+ params = mapOf(TOKEN_PARAM to currencySymbol),
+ )
+
+ data class RemoveTokenClicked(val currencySymbol: String) : MainScreenAnalyticsEvent(
+ event = "Remove Button Clicked",
+ params = mapOf(TOKEN_PARAM to currencySymbol),
+ )
+
+ data class ButtonClose(val source: AnalyticsParam.ScreensSources) : MainScreenAnalyticsEvent(
+ event = "Button - Close",
+ params = mapOf(AnalyticsParam.SOURCE to source.value),
+ )
+ // endregion
+}
\ No newline at end of file
diff --git a/core/config-toggles/.gitignore b/core/config-toggles/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/core/config-toggles/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/core/featuretoggles/build.gradle.kts b/core/config-toggles/build.gradle.kts
similarity index 94%
rename from core/featuretoggles/build.gradle.kts
rename to core/config-toggles/build.gradle.kts
index 410ef17d0e..0a7bc83fdc 100644
--- a/core/featuretoggles/build.gradle.kts
+++ b/core/config-toggles/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
}
android {
- namespace = "com.tangem.core.featuretoggles"
+ namespace = "com.tangem.core.configtoggle"
}
dependencies {
diff --git a/core/config-toggles/src/main/assets/configs/excluded_blockchains_config.json b/core/config-toggles/src/main/assets/configs/excluded_blockchains_config.json
new file mode 100644
index 0000000000..8d520b49a3
--- /dev/null
+++ b/core/config-toggles/src/main/assets/configs/excluded_blockchains_config.json
@@ -0,0 +1,14 @@
+[
+ {
+ "name": "",
+ "version": "undefined"
+ },
+ {
+ "name": "NEXA",
+ "version": "undefined"
+ },
+ {
+ "name": "clore-ai",
+ "version": "undefined"
+ }
+]
\ No newline at end of file
diff --git a/core/featuretoggles/src/main/assets/configs/feature_toggles_config.json b/core/config-toggles/src/main/assets/configs/feature_toggles_config.json
similarity index 80%
rename from core/featuretoggles/src/main/assets/configs/feature_toggles_config.json
rename to core/config-toggles/src/main/assets/configs/feature_toggles_config.json
index 2751047561..c4feab6dbf 100644
--- a/core/featuretoggles/src/main/assets/configs/feature_toggles_config.json
+++ b/core/config-toggles/src/main/assets/configs/feature_toggles_config.json
@@ -7,10 +7,6 @@
"name": "WC_SOLANA_TX_SIGN_ENABLED",
"version": "5.18.0"
},
- {
- "name": "STAKING_ENABLED",
- "version": "5.15.0"
- },
{
"name": "IS_ETHEREUM_EIP_1559_ENABLED",
"version": "5.17.0"
@@ -21,11 +17,11 @@
},
{
"name": "ONRAMP_ENABLED",
- "version": "undefined"
+ "version": "5.19.0"
},
{
"name": "MAIN_ACTION_BUTTONS_ENABLED",
- "version": "undefined"
+ "version": "5.19.0"
},
{
"name": "ONBOARDING_CODE_REFACTORING_ENABLED",
diff --git a/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/blockchain/ExcludedBlockchainsManager.kt b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/blockchain/ExcludedBlockchainsManager.kt
new file mode 100644
index 0000000000..f5db3637b9
--- /dev/null
+++ b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/blockchain/ExcludedBlockchainsManager.kt
@@ -0,0 +1,8 @@
+package com.tangem.core.configtoggle.blockchain
+
+interface ExcludedBlockchainsManager {
+
+ val excludedBlockchainsIds: Set
+
+ suspend fun init()
+}
\ No newline at end of file
diff --git a/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/blockchain/MutableExcludedBlockchainsManager.kt b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/blockchain/MutableExcludedBlockchainsManager.kt
new file mode 100644
index 0000000000..1f7fcf4dc0
--- /dev/null
+++ b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/blockchain/MutableExcludedBlockchainsManager.kt
@@ -0,0 +1,10 @@
+package com.tangem.core.configtoggle.blockchain
+
+interface MutableExcludedBlockchainsManager : ExcludedBlockchainsManager {
+
+ suspend fun excludeBlockchain(mainnetId: String, isExcluded: Boolean)
+
+ fun isMatchLocalConfig(): Boolean
+
+ suspend fun recoverLocalConfig()
+}
\ No newline at end of file
diff --git a/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/blockchain/impl/DefaultExcludedBlockchainsManager.kt b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/blockchain/impl/DefaultExcludedBlockchainsManager.kt
new file mode 100644
index 0000000000..8c208bae34
--- /dev/null
+++ b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/blockchain/impl/DefaultExcludedBlockchainsManager.kt
@@ -0,0 +1,78 @@
+package com.tangem.core.configtoggle.blockchain.impl
+
+import com.tangem.core.configtoggle.blockchain.MutableExcludedBlockchainsManager
+import com.tangem.core.configtoggle.storage.TogglesStorage
+import com.tangem.core.configtoggle.utils.associateToggles
+import com.tangem.core.configtoggle.version.VersionProvider
+import com.tangem.datasource.local.preferences.AppPreferencesStore
+import com.tangem.datasource.local.preferences.PreferencesKeys
+import com.tangem.datasource.local.preferences.utils.getSyncOrDefault
+import com.tangem.datasource.local.preferences.utils.store
+
+internal class DefaultExcludedBlockchainsManager(
+ private val localTogglesStorage: TogglesStorage,
+ private val appPreferencesStore: AppPreferencesStore,
+ private val versionProvider: VersionProvider,
+) : MutableExcludedBlockchainsManager {
+
+ private var isInitialized: Boolean = false
+
+ private lateinit var currentExcludedBlockchainsIds: Set
+ private lateinit var localExcludedBlockchainsIds: Set
+
+ override val excludedBlockchainsIds: Set
+ get() {
+ if (!isInitialized) error("ExcludedBlockchainsManager is not initialized")
+
+ return currentExcludedBlockchainsIds
+ }
+
+ override suspend fun init() {
+ localTogglesStorage.populate(path = "configs/excluded_blockchains_config")
+
+ val storedExcludedBlockchainsIds = appPreferencesStore.getSyncOrDefault(
+ key = PreferencesKeys.EXCLUDED_BLOCKCHAINS_KEY,
+ default = emptySet(),
+ )
+
+ localExcludedBlockchainsIds = localTogglesStorage.toggles
+ .associateToggles(currentVersion = versionProvider.get().orEmpty())
+ .filterValues { isIncluded -> !isIncluded }
+ .keys
+
+ if (storedExcludedBlockchainsIds.isEmpty()) {
+ recoverLocalConfig()
+ } else {
+ currentExcludedBlockchainsIds = storedExcludedBlockchainsIds
+ }
+
+ isInitialized = true
+ }
+
+ override suspend fun excludeBlockchain(mainnetId: String, isExcluded: Boolean) {
+ if (isExcluded) {
+ currentExcludedBlockchainsIds += mainnetId
+ } else {
+ currentExcludedBlockchainsIds -= mainnetId
+ }
+
+ storeCurrent()
+ }
+
+ override fun isMatchLocalConfig(): Boolean {
+ return currentExcludedBlockchainsIds == localExcludedBlockchainsIds
+ }
+
+ override suspend fun recoverLocalConfig() {
+ currentExcludedBlockchainsIds = localExcludedBlockchainsIds
+
+ storeCurrent()
+ }
+
+ private suspend fun storeCurrent() {
+ appPreferencesStore.store(
+ PreferencesKeys.EXCLUDED_BLOCKCHAINS_KEY,
+ currentExcludedBlockchainsIds,
+ )
+ }
+}
\ No newline at end of file
diff --git a/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/di/ExcludedBlockchainsManagerModule.kt b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/di/ExcludedBlockchainsManagerModule.kt
new file mode 100644
index 0000000000..2e4fcddac5
--- /dev/null
+++ b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/di/ExcludedBlockchainsManagerModule.kt
@@ -0,0 +1,49 @@
+package com.tangem.core.configtoggle.di
+
+import android.content.Context
+import com.tangem.core.configtoggle.BuildConfig
+import com.tangem.core.configtoggle.blockchain.ExcludedBlockchainsManager
+import com.tangem.core.configtoggle.blockchain.MutableExcludedBlockchainsManager
+import com.tangem.core.configtoggle.blockchain.impl.DefaultExcludedBlockchainsManager
+import com.tangem.core.configtoggle.storage.LocalTogglesStorage
+import com.tangem.core.configtoggle.version.DefaultVersionProvider
+import com.tangem.datasource.asset.loader.AssetLoader
+import com.tangem.datasource.local.preferences.AppPreferencesStore
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal object ExcludedBlockchainsManagerModule {
+
+ @Provides
+ @Singleton
+ fun provideExcludedBlockchainsManager(
+ @ApplicationContext context: Context,
+ assetLoader: AssetLoader,
+ appPreferencesStore: AppPreferencesStore,
+ ): ExcludedBlockchainsManager {
+ val localTogglesStorage = LocalTogglesStorage(assetLoader)
+ val versionProvider = DefaultVersionProvider(context)
+
+ return DefaultExcludedBlockchainsManager(
+ localTogglesStorage,
+ appPreferencesStore,
+ versionProvider,
+ )
+ }
+
+ @Provides
+ @Singleton
+ fun provideMutableExcludedBlockchainsManager(
+ manager: ExcludedBlockchainsManager,
+ ): MutableExcludedBlockchainsManager? {
+ if (!BuildConfig.TESTER_MENU_ENABLED) return null
+
+ return manager as MutableExcludedBlockchainsManager
+ }
+}
\ No newline at end of file
diff --git a/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/di/FeatureTogglesManagerModule.kt b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/di/FeatureTogglesManagerModule.kt
similarity index 62%
rename from core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/di/FeatureTogglesManagerModule.kt
rename to core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/di/FeatureTogglesManagerModule.kt
index ca45c78a6b..8346378b52 100644
--- a/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/di/FeatureTogglesManagerModule.kt
+++ b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/di/FeatureTogglesManagerModule.kt
@@ -1,12 +1,12 @@
-package com.tangem.core.featuretoggle.di
+package com.tangem.core.configtoggle.di
import android.content.Context
-import com.tangem.core.featuretoggle.manager.DevFeatureTogglesManager
-import com.tangem.core.featuretoggle.manager.FeatureTogglesManager
-import com.tangem.core.featuretoggle.manager.ProdFeatureTogglesManager
-import com.tangem.core.featuretoggle.storage.LocalFeatureTogglesStorage
-import com.tangem.core.featuretoggle.version.DefaultVersionProvider
-import com.tangem.core.featuretoggles.BuildConfig
+import com.tangem.core.configtoggle.BuildConfig
+import com.tangem.core.configtoggle.feature.FeatureTogglesManager
+import com.tangem.core.configtoggle.feature.impl.DevFeatureTogglesManager
+import com.tangem.core.configtoggle.feature.impl.ProdFeatureTogglesManager
+import com.tangem.core.configtoggle.storage.LocalTogglesStorage
+import com.tangem.core.configtoggle.version.DefaultVersionProvider
import com.tangem.datasource.asset.loader.AssetLoader
import com.tangem.datasource.local.preferences.AppPreferencesStore
import dagger.Module
@@ -27,18 +27,18 @@ internal object FeatureTogglesManagerModule {
assetLoader: AssetLoader,
appPreferencesStore: AppPreferencesStore,
): FeatureTogglesManager {
- val localFeatureTogglesStorage = LocalFeatureTogglesStorage(assetLoader)
+ val localTogglesStorage = LocalTogglesStorage(assetLoader)
val versionProvider = DefaultVersionProvider(context)
return if (BuildConfig.TESTER_MENU_ENABLED) {
DevFeatureTogglesManager(
- localFeatureTogglesStorage = localFeatureTogglesStorage,
+ localTogglesStorage = localTogglesStorage,
appPreferencesStore = appPreferencesStore,
versionProvider = versionProvider,
)
} else {
ProdFeatureTogglesManager(
- localFeatureTogglesStorage = localFeatureTogglesStorage,
+ localTogglesStorage = localTogglesStorage,
versionProvider = versionProvider,
)
}
diff --git a/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/manager/FeatureTogglesManager.kt b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/feature/FeatureTogglesManager.kt
similarity index 86%
rename from core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/manager/FeatureTogglesManager.kt
rename to core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/feature/FeatureTogglesManager.kt
index 6111e7f73b..86a027924c 100644
--- a/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/manager/FeatureTogglesManager.kt
+++ b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/feature/FeatureTogglesManager.kt
@@ -1,4 +1,4 @@
-package com.tangem.core.featuretoggle.manager
+package com.tangem.core.configtoggle.feature
/**
* Component for getting information about the availability of feature toggles
diff --git a/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/manager/MutableFeatureTogglesManager.kt b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/feature/MutableFeatureTogglesManager.kt
similarity index 92%
rename from core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/manager/MutableFeatureTogglesManager.kt
rename to core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/feature/MutableFeatureTogglesManager.kt
index f04b423f4f..d1d09ced03 100644
--- a/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/manager/MutableFeatureTogglesManager.kt
+++ b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/feature/MutableFeatureTogglesManager.kt
@@ -1,4 +1,4 @@
-package com.tangem.core.featuretoggle.manager
+package com.tangem.core.configtoggle.feature
/**
* Component for change information about the availability of feature toggles
diff --git a/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/manager/DevFeatureTogglesManager.kt b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/feature/impl/DevFeatureTogglesManager.kt
similarity index 81%
rename from core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/manager/DevFeatureTogglesManager.kt
rename to core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/feature/impl/DevFeatureTogglesManager.kt
index 303dce3c7b..750dbada43 100644
--- a/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/manager/DevFeatureTogglesManager.kt
+++ b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/feature/impl/DevFeatureTogglesManager.kt
@@ -1,9 +1,10 @@
-package com.tangem.core.featuretoggle.manager
+package com.tangem.core.configtoggle.feature.impl
import androidx.annotation.VisibleForTesting
-import com.tangem.core.featuretoggle.storage.FeatureTogglesStorage
-import com.tangem.core.featuretoggle.utils.associateToggles
-import com.tangem.core.featuretoggle.version.VersionProvider
+import com.tangem.core.configtoggle.feature.MutableFeatureTogglesManager
+import com.tangem.core.configtoggle.storage.TogglesStorage
+import com.tangem.core.configtoggle.utils.associateToggles
+import com.tangem.core.configtoggle.version.VersionProvider
import com.tangem.datasource.local.preferences.AppPreferencesStore
import com.tangem.datasource.local.preferences.PreferencesKeys
import com.tangem.datasource.local.preferences.utils.getObjectSyncOrNull
@@ -13,12 +14,12 @@ import kotlin.properties.Delegates
/**
* Feature toggles manager implementation in DEV build
*
- * @property localFeatureTogglesStorage local feature toggles storage
+ * @property localTogglesStorage local feature toggles storage
* @property appPreferencesStore application local store
* @property versionProvider application version provider
*/
internal class DevFeatureTogglesManager(
- private val localFeatureTogglesStorage: FeatureTogglesStorage,
+ private val localTogglesStorage: TogglesStorage,
private val appPreferencesStore: AppPreferencesStore,
private val versionProvider: VersionProvider,
) : MutableFeatureTogglesManager {
@@ -27,13 +28,13 @@ internal class DevFeatureTogglesManager(
private var localFeatureTogglesMap: Map by Delegates.notNull()
override suspend fun init() {
- localFeatureTogglesStorage.init()
+ localTogglesStorage.populate(FeatureTogglesConstants.LOCAL_CONFIG_PATH)
val savedFeatureToggles = appPreferencesStore.getObjectSyncOrNull>(
key = PreferencesKeys.FEATURE_TOGGLES_KEY,
) ?: emptyMap()
- val localFeatureToggles = localFeatureTogglesStorage.featureToggles
+ val localFeatureToggles = localTogglesStorage.toggles
.associateToggles(currentVersion = versionProvider.get().orEmpty())
localFeatureTogglesMap = localFeatureToggles
diff --git a/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/feature/impl/FeatureTogglesConstants.kt b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/feature/impl/FeatureTogglesConstants.kt
new file mode 100644
index 0000000000..63087a2e90
--- /dev/null
+++ b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/feature/impl/FeatureTogglesConstants.kt
@@ -0,0 +1,6 @@
+package com.tangem.core.configtoggle.feature.impl
+
+internal object FeatureTogglesConstants {
+
+ const val LOCAL_CONFIG_PATH: String = "configs/feature_toggles_config"
+}
\ No newline at end of file
diff --git a/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/manager/ProdFeatureTogglesManager.kt b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/feature/impl/ProdFeatureTogglesManager.kt
similarity index 62%
rename from core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/manager/ProdFeatureTogglesManager.kt
rename to core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/feature/impl/ProdFeatureTogglesManager.kt
index 0f88c3791c..d723297a45 100644
--- a/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/manager/ProdFeatureTogglesManager.kt
+++ b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/feature/impl/ProdFeatureTogglesManager.kt
@@ -1,27 +1,28 @@
-package com.tangem.core.featuretoggle.manager
+package com.tangem.core.configtoggle.feature.impl
import androidx.annotation.VisibleForTesting
-import com.tangem.core.featuretoggle.storage.FeatureTogglesStorage
-import com.tangem.core.featuretoggle.utils.associateToggles
-import com.tangem.core.featuretoggle.version.VersionProvider
+import com.tangem.core.configtoggle.feature.FeatureTogglesManager
+import com.tangem.core.configtoggle.storage.TogglesStorage
+import com.tangem.core.configtoggle.utils.associateToggles
+import com.tangem.core.configtoggle.version.VersionProvider
import kotlin.properties.Delegates
/**
* Feature toggles manager implementation in PROD build
*
- * @property localFeatureTogglesStorage local feature toggles storage
+ * @property localTogglesStorage local feature toggles storage
* @property versionProvider application version provider
*/
internal class ProdFeatureTogglesManager(
- private val localFeatureTogglesStorage: FeatureTogglesStorage,
+ private val localTogglesStorage: TogglesStorage,
private val versionProvider: VersionProvider,
) : FeatureTogglesManager {
private var featureToggles: Map by Delegates.notNull()
override suspend fun init() {
- localFeatureTogglesStorage.init()
- featureToggles = localFeatureTogglesStorage.featureToggles
+ localTogglesStorage.populate(FeatureTogglesConstants.LOCAL_CONFIG_PATH)
+ featureToggles = localTogglesStorage.toggles
.associateToggles(currentVersion = versionProvider.get() ?: "")
}
diff --git a/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/storage/ConfigToggle.kt b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/storage/ConfigToggle.kt
new file mode 100644
index 0000000000..6078eea70a
--- /dev/null
+++ b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/storage/ConfigToggle.kt
@@ -0,0 +1,20 @@
+package com.tangem.core.configtoggle.storage
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * Data model with information about config toggle
+ *
+ * @property name toggle name
+ * @property version version in which the toggle will be enabled
+ *
+ * IMPORTANT: if the version is "undefined", it means that toggle is disabled!
+ *
+[REDACTED_AUTHOR]
+ */
+@JsonClass(generateAdapter = true)
+internal data class ConfigToggle(
+ @Json(name = "name") val name: String,
+ @Json(name = "version") val version: String,
+)
\ No newline at end of file
diff --git a/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/storage/LocalTogglesStorage.kt b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/storage/LocalTogglesStorage.kt
new file mode 100644
index 0000000000..59086d9658
--- /dev/null
+++ b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/storage/LocalTogglesStorage.kt
@@ -0,0 +1,24 @@
+package com.tangem.core.configtoggle.storage
+
+import com.tangem.datasource.asset.loader.AssetLoader
+import kotlin.properties.Delegates
+
+/**
+ * Storage implementation for storing local feature toggles.
+ * Feature toggles are declared in file [LOCAL_CONFIG_PATH].
+ *
+ * @property assetLoader asset loader
+ *
+[REDACTED_AUTHOR]
+ */
+internal class LocalTogglesStorage(
+ private val assetLoader: AssetLoader,
+) : TogglesStorage {
+
+ override var toggles: List by Delegates.notNull()
+ private set
+
+ override suspend fun populate(path: String) {
+ toggles = assetLoader.loadList(path)
+ }
+}
\ No newline at end of file
diff --git a/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/storage/TogglesStorage.kt b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/storage/TogglesStorage.kt
new file mode 100644
index 0000000000..39fa7b2f68
--- /dev/null
+++ b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/storage/TogglesStorage.kt
@@ -0,0 +1,15 @@
+package com.tangem.core.configtoggle.storage
+
+/**
+ * Component that initializes and stores a list of feature toggles
+ *
+[REDACTED_AUTHOR]
+ */
+internal interface TogglesStorage {
+
+ /** List of feature toggles */
+ val toggles: List
+
+ /** Populate the storage with toggles */
+ suspend fun populate(path: String)
+}
\ No newline at end of file
diff --git a/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/utils/CollectionExt.kt b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/utils/CollectionExt.kt
new file mode 100644
index 0000000000..68ee66b88c
--- /dev/null
+++ b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/utils/CollectionExt.kt
@@ -0,0 +1,13 @@
+package com.tangem.core.configtoggle.utils
+
+import com.tangem.core.configtoggle.storage.ConfigToggle
+import com.tangem.core.configtoggle.version.VersionAvailabilityContract
+
+internal fun List.associateToggles(currentVersion: String): Map {
+ return associate { localToggle ->
+ Pair(
+ first = localToggle.name,
+ second = VersionAvailabilityContract(currentVersion, localToggle.version),
+ )
+ }
+}
\ No newline at end of file
diff --git a/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/version/DefaultVersionProvider.kt b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/version/DefaultVersionProvider.kt
similarity index 96%
rename from core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/version/DefaultVersionProvider.kt
rename to core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/version/DefaultVersionProvider.kt
index c602be463f..b55e9637c3 100644
--- a/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/version/DefaultVersionProvider.kt
+++ b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/version/DefaultVersionProvider.kt
@@ -1,4 +1,4 @@
-package com.tangem.core.featuretoggle.version
+package com.tangem.core.configtoggle.version
import android.content.Context
import android.content.pm.PackageManager
diff --git a/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/contract/Version.kt b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/version/Version.kt
similarity index 98%
rename from core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/contract/Version.kt
rename to core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/version/Version.kt
index b506d80ec4..0822cec520 100644
--- a/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/contract/Version.kt
+++ b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/version/Version.kt
@@ -1,4 +1,4 @@
-package com.tangem.core.featuretoggle.contract
+package com.tangem.core.configtoggle.version
import androidx.annotation.VisibleForTesting
import timber.log.Timber
diff --git a/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/contract/VersionAvailabilityContract.kt b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/version/VersionAvailabilityContract.kt
similarity index 93%
rename from core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/contract/VersionAvailabilityContract.kt
rename to core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/version/VersionAvailabilityContract.kt
index 2ee5c72e14..2360052af4 100644
--- a/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/contract/VersionAvailabilityContract.kt
+++ b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/version/VersionAvailabilityContract.kt
@@ -1,4 +1,4 @@
-package com.tangem.core.featuretoggle.contract
+package com.tangem.core.configtoggle.version
/**
* Version contract to evaluate availability of feature toggle
diff --git a/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/version/VersionProvider.kt b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/version/VersionProvider.kt
similarity index 74%
rename from core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/version/VersionProvider.kt
rename to core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/version/VersionProvider.kt
index 585caf85b8..27913b7dce 100644
--- a/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/version/VersionProvider.kt
+++ b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/version/VersionProvider.kt
@@ -1,4 +1,4 @@
-package com.tangem.core.featuretoggle.version
+package com.tangem.core.configtoggle.version
/** Application version provider */
internal interface VersionProvider {
diff --git a/core/featuretoggles/src/test/kotlin/com/tangem/core/featuretoggle/contract/VersionAvailabilityContractTest.kt b/core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/contract/VersionAvailabilityContractTest.kt
similarity index 93%
rename from core/featuretoggles/src/test/kotlin/com/tangem/core/featuretoggle/contract/VersionAvailabilityContractTest.kt
rename to core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/contract/VersionAvailabilityContractTest.kt
index 476c967367..ba641dfd04 100644
--- a/core/featuretoggles/src/test/kotlin/com/tangem/core/featuretoggle/contract/VersionAvailabilityContractTest.kt
+++ b/core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/contract/VersionAvailabilityContractTest.kt
@@ -1,6 +1,7 @@
-package com.tangem.core.featuretoggle.contract
+package com.tangem.core.configtoggle.contract
import com.google.common.truth.Truth
+import com.tangem.core.configtoggle.version.VersionAvailabilityContract
import org.junit.Test
/**
diff --git a/core/featuretoggles/src/test/kotlin/com/tangem/core/featuretoggle/contract/VersionTest.kt b/core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/contract/VersionTest.kt
similarity index 97%
rename from core/featuretoggles/src/test/kotlin/com/tangem/core/featuretoggle/contract/VersionTest.kt
rename to core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/contract/VersionTest.kt
index f8763c6a00..e61ace5722 100644
--- a/core/featuretoggles/src/test/kotlin/com/tangem/core/featuretoggle/contract/VersionTest.kt
+++ b/core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/contract/VersionTest.kt
@@ -1,6 +1,7 @@
-package com.tangem.core.featuretoggle.contract
+package com.tangem.core.configtoggle.contract
import com.google.common.truth.Truth
+import com.tangem.core.configtoggle.version.Version
import org.junit.Test
/**
diff --git a/core/featuretoggles/src/test/kotlin/com/tangem/core/featuretoggle/manager/DevFeatureTogglesManagerTest.kt b/core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/manager/DevTogglesManagerTest.kt
similarity index 78%
rename from core/featuretoggles/src/test/kotlin/com/tangem/core/featuretoggle/manager/DevFeatureTogglesManagerTest.kt
rename to core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/manager/DevTogglesManagerTest.kt
index e0e8fbef2f..b1822c84d9 100644
--- a/core/featuretoggles/src/test/kotlin/com/tangem/core/featuretoggle/manager/DevFeatureTogglesManagerTest.kt
+++ b/core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/manager/DevTogglesManagerTest.kt
@@ -1,11 +1,13 @@
-package com.tangem.core.featuretoggle.manager
+package com.tangem.core.configtoggle.manager
import android.annotation.SuppressLint
import com.google.common.truth.Truth
-import com.tangem.core.featuretoggle.storage.FeatureToggle
-import com.tangem.core.featuretoggle.storage.FeatureTogglesStorage
-import com.tangem.core.featuretoggle.utils.associateToggles
-import com.tangem.core.featuretoggle.version.VersionProvider
+import com.tangem.core.configtoggle.feature.impl.DevFeatureTogglesManager
+import com.tangem.core.configtoggle.feature.impl.FeatureTogglesConstants
+import com.tangem.core.configtoggle.storage.ConfigToggle
+import com.tangem.core.configtoggle.storage.TogglesStorage
+import com.tangem.core.configtoggle.utils.associateToggles
+import com.tangem.core.configtoggle.version.VersionProvider
import com.tangem.datasource.local.preferences.AppPreferencesStore
import com.tangem.datasource.local.preferences.PreferencesKeys
import com.tangem.datasource.local.preferences.utils.getObjectSyncOrNull
@@ -19,13 +21,13 @@ import kotlin.collections.set
[REDACTED_AUTHOR]
*/
@SuppressLint("CheckResult")
-internal class DevFeatureTogglesManagerTest {
+internal class DevTogglesManagerTest {
- private val localFeatureTogglesStorage = mockk()
+ private val localTogglesStorage = mockk()
private val appPreferenceStore = mockk(relaxed = true)
private val versionProvider = mockk()
private val manager = DevFeatureTogglesManager(
- localFeatureTogglesStorage = localFeatureTogglesStorage,
+ localTogglesStorage = localTogglesStorage,
appPreferencesStore = appPreferenceStore,
versionProvider = versionProvider,
)
@@ -34,17 +36,17 @@ internal class DevFeatureTogglesManagerTest {
fun `successfully initialize storage if shared prefs kept feature toggles`() = runTest {
val currentVersion = "0.1.0"
- coEvery { localFeatureTogglesStorage.init() } just Runs
+ coEvery { localTogglesStorage.populate(FeatureTogglesConstants.LOCAL_CONFIG_PATH) } just Runs
coEvery {
appPreferenceStore.getObjectSyncOrNull>(PreferencesKeys.FEATURE_TOGGLES_KEY)
} returns savedFeatureTogglesMap
- coEvery { localFeatureTogglesStorage.featureToggles } returns localFeatureToggles
+ coEvery { localTogglesStorage.toggles } returns localFeatureToggles
coEvery { versionProvider.get() } returns currentVersion
manager.init()
coVerifyOrder {
- localFeatureTogglesStorage.init()
+ localTogglesStorage.populate(FeatureTogglesConstants.LOCAL_CONFIG_PATH)
versionProvider.get()
}
@@ -61,17 +63,17 @@ internal class DevFeatureTogglesManagerTest {
fun `successfully initialize storage if shared prefs kept empty list`() = runTest {
val currentVersion = "0.1.0"
- coEvery { localFeatureTogglesStorage.init() } just Runs
+ coEvery { localTogglesStorage.populate(FeatureTogglesConstants.LOCAL_CONFIG_PATH) } just Runs
coEvery {
appPreferenceStore.getObjectSyncOrNull>(PreferencesKeys.FEATURE_TOGGLES_KEY)
} returns emptyMap()
- coEvery { localFeatureTogglesStorage.featureToggles } returns localFeatureToggles
+ coEvery { localTogglesStorage.toggles } returns localFeatureToggles
coEvery { versionProvider.get() } returns currentVersion
manager.init()
coVerifyOrder {
- localFeatureTogglesStorage.init()
+ localTogglesStorage.populate(FeatureTogglesConstants.LOCAL_CONFIG_PATH)
versionProvider.get()
}
@@ -88,17 +90,17 @@ internal class DevFeatureTogglesManagerTest {
fun `successfully initialize storage if shared prefs didn't keep feature toggles`() = runTest {
val currentVersion = "0.1.0"
- coEvery { localFeatureTogglesStorage.init() } just Runs
+ coEvery { localTogglesStorage.populate(FeatureTogglesConstants.LOCAL_CONFIG_PATH) } just Runs
coEvery {
appPreferenceStore.getObjectSyncOrNull>(PreferencesKeys.FEATURE_TOGGLES_KEY)
} returns null
- coEvery { localFeatureTogglesStorage.featureToggles } returns localFeatureToggles
+ coEvery { localTogglesStorage.toggles } returns localFeatureToggles
coEvery { versionProvider.get() } returns currentVersion
manager.init()
coVerifyOrder {
- localFeatureTogglesStorage.init()
+ localTogglesStorage.populate(FeatureTogglesConstants.LOCAL_CONFIG_PATH)
versionProvider.get()
}
@@ -111,15 +113,15 @@ internal class DevFeatureTogglesManagerTest {
@Test
fun `successfully initialize storage if versionProvider returns null`() = runTest {
- coEvery { localFeatureTogglesStorage.init() } just Runs
+ coEvery { localTogglesStorage.populate(FeatureTogglesConstants.LOCAL_CONFIG_PATH) } just Runs
coEvery { appPreferenceStore.getSyncOrNull(PreferencesKeys.FEATURE_TOGGLES_KEY) } returns savedFeatureToggles
- coEvery { localFeatureTogglesStorage.featureToggles } returns localFeatureToggles
+ coEvery { localTogglesStorage.toggles } returns localFeatureToggles
coEvery { versionProvider.get() } returns null
manager.init()
coVerifyOrder {
- localFeatureTogglesStorage.init()
+ localTogglesStorage.populate(FeatureTogglesConstants.LOCAL_CONFIG_PATH)
versionProvider.get()
}
@@ -222,8 +224,8 @@ internal class DevFeatureTogglesManagerTest {
)
val localFeatureToggles = listOf(
- FeatureToggle(name = "INACTIVE_TEST_FEATURE_ENABLED", version = "undefined"),
- FeatureToggle(name = "ACTIVE2_TEST_FEATURE_ENABLED", version = "1.0.0"),
+ ConfigToggle(name = "INACTIVE_TEST_FEATURE_ENABLED", version = "undefined"),
+ ConfigToggle(name = "ACTIVE2_TEST_FEATURE_ENABLED", version = "1.0.0"),
)
}
}
\ No newline at end of file
diff --git a/core/featuretoggles/src/test/kotlin/com/tangem/core/featuretoggle/manager/ProdFeatureTogglesManagerTest.kt b/core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/manager/ProdTogglesManagerTest.kt
similarity index 64%
rename from core/featuretoggles/src/test/kotlin/com/tangem/core/featuretoggle/manager/ProdFeatureTogglesManagerTest.kt
rename to core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/manager/ProdTogglesManagerTest.kt
index 35af42ae54..6453d3eb4d 100644
--- a/core/featuretoggles/src/test/kotlin/com/tangem/core/featuretoggle/manager/ProdFeatureTogglesManagerTest.kt
+++ b/core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/manager/ProdTogglesManagerTest.kt
@@ -1,11 +1,13 @@
-package com.tangem.core.featuretoggle.manager
+package com.tangem.core.configtoggle.manager
import android.content.pm.PackageManager
import com.google.common.truth.Truth
-import com.tangem.core.featuretoggle.storage.FeatureToggle
-import com.tangem.core.featuretoggle.storage.FeatureTogglesStorage
-import com.tangem.core.featuretoggle.utils.associateToggles
-import com.tangem.core.featuretoggle.version.VersionProvider
+import com.tangem.core.configtoggle.feature.impl.FeatureTogglesConstants
+import com.tangem.core.configtoggle.feature.impl.ProdFeatureTogglesManager
+import com.tangem.core.configtoggle.storage.ConfigToggle
+import com.tangem.core.configtoggle.storage.TogglesStorage
+import com.tangem.core.configtoggle.utils.associateToggles
+import com.tangem.core.configtoggle.version.VersionProvider
import io.mockk.*
import kotlinx.coroutines.test.runTest
import org.junit.Test
@@ -13,24 +15,24 @@ import org.junit.Test
/**
[REDACTED_AUTHOR]
*/
-internal class ProdFeatureTogglesManagerTest {
+internal class ProdTogglesManagerTest {
- private val localFeatureTogglesStorage = mockk()
+ private val localTogglesStorage = mockk()
private val versionProvider = mockk()
- private val manager = ProdFeatureTogglesManager(localFeatureTogglesStorage, versionProvider)
+ private val manager = ProdFeatureTogglesManager(localTogglesStorage, versionProvider)
@Test
fun `successfully initialize storage`() = runTest {
val currentVersion = "1.0.0"
- coEvery { localFeatureTogglesStorage.init() } just Runs
- every { localFeatureTogglesStorage.featureToggles } returns localFeatureToggles
+ coEvery { localTogglesStorage.populate(FeatureTogglesConstants.LOCAL_CONFIG_PATH) } just Runs
+ every { localTogglesStorage.toggles } returns localFeatureToggles
every { versionProvider.get() } returns currentVersion
manager.init()
coVerifyOrder {
- localFeatureTogglesStorage.init()
+ localTogglesStorage.populate(FeatureTogglesConstants.LOCAL_CONFIG_PATH)
versionProvider.get()
}
@@ -40,14 +42,14 @@ internal class ProdFeatureTogglesManagerTest {
@Test
fun `successfully initialize storage if versionProvider returns null`() = runTest {
- coEvery { localFeatureTogglesStorage.init() } just Runs
- every { localFeatureTogglesStorage.featureToggles } returns localFeatureToggles
+ coEvery { localTogglesStorage.populate(FeatureTogglesConstants.LOCAL_CONFIG_PATH) } just Runs
+ every { localTogglesStorage.toggles } returns localFeatureToggles
every { versionProvider.get() } returns null
manager.init()
coVerifyOrder {
- localFeatureTogglesStorage.init()
+ localTogglesStorage.populate(FeatureTogglesConstants.LOCAL_CONFIG_PATH)
versionProvider.get()
}
@@ -56,8 +58,8 @@ internal class ProdFeatureTogglesManagerTest {
@Test
fun `failure initialize storage if localFeatureTogglesStorage throws exception`() = runTest {
- coEvery { localFeatureTogglesStorage.init() } just Runs
- every { localFeatureTogglesStorage.featureToggles } throws IllegalStateException(
+ coEvery { localTogglesStorage.populate(FeatureTogglesConstants.LOCAL_CONFIG_PATH) } just Runs
+ every { localTogglesStorage.toggles } throws IllegalStateException(
"Property featureToggles should be initialized before get.",
)
@@ -72,14 +74,14 @@ internal class ProdFeatureTogglesManagerTest {
Truth.assertThat(it).isInstanceOf(IllegalStateException::class.java)
}
- coVerifyOrder { localFeatureTogglesStorage.init() }
+ coVerifyOrder { localTogglesStorage.populate(FeatureTogglesConstants.LOCAL_CONFIG_PATH) }
verifyAll(inverse = true) { versionProvider.get() }
}
@Test
fun `failure initialize storage if versionProvider throws exception`() = runTest {
- coEvery { localFeatureTogglesStorage.init() } just Runs
- every { localFeatureTogglesStorage.featureToggles } returns localFeatureToggles
+ coEvery { localTogglesStorage.populate(FeatureTogglesConstants.LOCAL_CONFIG_PATH) } just Runs
+ every { localTogglesStorage.toggles } returns localFeatureToggles
every { versionProvider.get() } throws PackageManager.NameNotFoundException()
runCatching { manager.init() }
@@ -89,7 +91,7 @@ internal class ProdFeatureTogglesManagerTest {
}
coVerifyOrder {
- localFeatureTogglesStorage.init()
+ localTogglesStorage.populate(FeatureTogglesConstants.LOCAL_CONFIG_PATH)
versionProvider.get()
}
}
@@ -122,8 +124,8 @@ internal class ProdFeatureTogglesManagerTest {
private companion object {
val localFeatureToggles = listOf(
- FeatureToggle(name = "INACTIVE_TEST_FEATURE_ENABLED", version = "undefined"),
- FeatureToggle(name = "ACTIVE2_TEST_FEATURE_ENABLED", version = "1.0.0"),
+ ConfigToggle(name = "INACTIVE_TEST_FEATURE_ENABLED", version = "undefined"),
+ ConfigToggle(name = "ACTIVE2_TEST_FEATURE_ENABLED", version = "1.0.0"),
)
val disabledFeatureToggles = mapOf(
diff --git a/core/featuretoggles/src/test/kotlin/com/tangem/core/featuretoggle/storage/LocalFeatureTogglesStorageTest.kt b/core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/storage/LocalTogglesStorageTest.kt
similarity index 71%
rename from core/featuretoggles/src/test/kotlin/com/tangem/core/featuretoggle/storage/LocalFeatureTogglesStorageTest.kt
rename to core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/storage/LocalTogglesStorageTest.kt
index 3950e2c649..4a8e6550b8 100644
--- a/core/featuretoggles/src/test/kotlin/com/tangem/core/featuretoggle/storage/LocalFeatureTogglesStorageTest.kt
+++ b/core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/storage/LocalTogglesStorageTest.kt
@@ -1,10 +1,11 @@
-package com.tangem.core.featuretoggle.storage
+package com.tangem.core.configtoggle.storage
import android.annotation.SuppressLint
import com.google.common.truth.Truth
import com.squareup.moshi.JsonAdapter
import com.squareup.moshi.Moshi
import com.squareup.moshi.Types
+import com.tangem.core.configtoggle.feature.impl.FeatureTogglesConstants
import com.tangem.datasource.asset.loader.AssetLoader
import com.tangem.datasource.asset.reader.AssetReader
import io.mockk.*
@@ -16,16 +17,16 @@ import java.io.IOException
[REDACTED_AUTHOR]
*/
@SuppressLint("CheckResult")
-internal class LocalFeatureTogglesStorageTest {
+internal class LocalTogglesStorageTest {
private val assetReader = mockk()
private val moshi = mockk()
- private val jsonAdapter = mockk>>()
+ private val jsonAdapter = mockk>>()
// Impossible to mockk AssetLoader because it implement inline functions
private val assetLoader = AssetLoader(assetReader = assetReader, moshi = moshi)
- private val storage = LocalFeatureTogglesStorage(assetLoader)
+ private val storage = LocalTogglesStorage(assetLoader)
@Test
fun `successfully initialize storage`() = runTest {
@@ -33,14 +34,14 @@ internal class LocalFeatureTogglesStorageTest {
everyCreatingMoshiAdapter() returns jsonAdapter
everyMappingJson() returns featureToggles
- storage.init()
+ storage.populate(FeatureTogglesConstants.LOCAL_CONFIG_PATH)
coVerifyOrder {
assetReader.read(CONFIG_FILE_NAME)
jsonAdapter.fromJson(json)
}
- Truth.assertThat(storage.featureToggles).containsExactlyElementsIn(featureToggles)
+ Truth.assertThat(storage.toggles).containsExactlyElementsIn(featureToggles)
}
@Test
@@ -49,33 +50,33 @@ internal class LocalFeatureTogglesStorageTest {
everyCreatingMoshiAdapter() returns jsonAdapter
everyMappingJson() throws IOException()
- storage.init()
+ storage.populate(FeatureTogglesConstants.LOCAL_CONFIG_PATH)
coVerifyOrder {
assetReader.read(CONFIG_FILE_NAME)
jsonAdapter.fromJson(json)
}
- Truth.assertThat(storage.featureToggles).containsExactlyElementsIn(emptyList())
+ Truth.assertThat(storage.toggles).containsExactlyElementsIn(emptyList())
}
@Test
fun `failure initialize storage if jsonAdapter throws exception`() = runTest {
everyReadingJson() throws IOException()
- storage.init()
+ storage.populate(FeatureTogglesConstants.LOCAL_CONFIG_PATH)
coVerifyOrder { assetReader.read(CONFIG_FILE_NAME) }
verifyAll(inverse = true) { jsonAdapter.fromJson(any()) }
- Truth.assertThat(storage.featureToggles).containsExactlyElementsIn(emptyList())
+ Truth.assertThat(storage.toggles).containsExactlyElementsIn(emptyList())
}
private fun everyReadingJson() = coEvery { assetReader.read(CONFIG_FILE_NAME) }
private fun everyCreatingMoshiAdapter() = every {
- val types = Types.newParameterizedType(List::class.java, FeatureToggle::class.java)
- moshi.adapter>(types)
+ val types = Types.newParameterizedType(List::class.java, ConfigToggle::class.java)
+ moshi.adapter>(types)
}
private fun everyMappingJson() = every { jsonAdapter.fromJson(json) }
@@ -97,8 +98,8 @@ internal class LocalFeatureTogglesStorageTest {
""".trimIndent()
val featureToggles = listOf(
- FeatureToggle(name = "INACTIVE_TEST_FEATURE_ENABLED", version = "undefined"),
- FeatureToggle(name = "ACTIVE2_TEST_FEATURE_ENABLED", version = "1.0.0"),
+ ConfigToggle(name = "INACTIVE_TEST_FEATURE_ENABLED", version = "undefined"),
+ ConfigToggle(name = "ACTIVE2_TEST_FEATURE_ENABLED", version = "1.0.0"),
)
}
}
\ No newline at end of file
diff --git a/core/datasource/build.gradle.kts b/core/datasource/build.gradle.kts
index 494f2c12e6..3570cea973 100644
--- a/core/datasource/build.gradle.kts
+++ b/core/datasource/build.gradle.kts
@@ -21,11 +21,14 @@ dependencies {
implementation(projects.core.utils)
implementation(projects.libs.auth)
implementation(projects.domain.appTheme.models)
+ implementation(projects.domain.core)
implementation(projects.domain.tokens.models)
implementation(projects.domain.wallets.models)
implementation(projects.domain.balanceHiding.models)
implementation(projects.domain.txhistory.models)
implementation(projects.domain.staking.models)
+ implementation(projects.domain.onramp.models)
+ implementation(projects.domain.models)
/** Tangem libraries */
implementation(deps.tangem.blockchain)
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/adapter/DateTimeAdapter.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/adapter/DateTimeAdapter.kt
index 5e637ed8c8..4149bf22f8 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/common/adapter/DateTimeAdapter.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/adapter/DateTimeAdapter.kt
@@ -7,9 +7,12 @@ internal class DateTimeAdapter : JsonAdapter() {
@FromJson
override fun fromJson(reader: JsonReader): DateTime? {
- val dateString = reader.nextString() ?: return null
-
- return DateTime.parse(dateString)
+ return if (reader.peek() == JsonReader.Token.NULL) {
+ reader.nextNull()
+ } else {
+ val dateString = reader.nextString()
+ DateTime.parse(dateString)
+ }
}
@ToJson
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/adapter/LocalDateAdapter.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/adapter/LocalDateAdapter.kt
index 6a7cd420c6..d87504268b 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/common/adapter/LocalDateAdapter.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/adapter/LocalDateAdapter.kt
@@ -10,8 +10,12 @@ internal class LocalDateAdapter : JsonAdapter() {
@FromJson
override fun fromJson(reader: JsonReader): LocalDate? {
- val dateString = reader.nextString()
- return LocalDate.parse(dateString, formatter)
+ return if (reader.peek() == JsonReader.Token.NULL) {
+ reader.nextNull()
+ } else {
+ val dateString = reader.nextString()
+ return LocalDate.parse(dateString, formatter)
+ }
}
@ToJson
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/express/models/response/Asset.kt b/core/datasource/src/main/java/com/tangem/datasource/api/express/models/response/Asset.kt
index 87f83ea98f..a4de3fcb40 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/express/models/response/Asset.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/express/models/response/Asset.kt
@@ -11,4 +11,7 @@ data class Asset(
@Json(name = "exchangeAvailable")
val exchangeAvailable: Boolean,
+
+ @Json(name = "onrampAvailable")
+ val onrampAvailable: Boolean?,
)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/express/models/response/ExchangeProvider.kt b/core/datasource/src/main/java/com/tangem/datasource/api/express/models/response/ExchangeProvider.kt
index 453d1e99c0..2c962257ca 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/express/models/response/ExchangeProvider.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/express/models/response/ExchangeProvider.kt
@@ -41,4 +41,7 @@ enum class ExchangeProviderType {
@Json(name = "dex-bridge")
DEX_BRIDGE,
+
+ @Json(name = "onramp")
+ ONRAMP,
}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/markets/models/response/TokenMarketInfoResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/markets/models/response/TokenMarketInfoResponse.kt
index 64b168072f..e18e222fd9 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/markets/models/response/TokenMarketInfoResponse.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/markets/models/response/TokenMarketInfoResponse.kt
@@ -2,6 +2,7 @@ package com.tangem.datasource.api.markets.models.response
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
+import org.joda.time.DateTime
import java.math.BigDecimal
@JsonClass(generateAdapter = true)
@@ -26,6 +27,8 @@ data class TokenMarketInfoResponse(
val insights: Insights?,
@Json(name = "metrics")
val metrics: Metrics?,
+ @Json(name = "security_data")
+ val securityData: SecurityData?,
@Json(name = "links")
val links: Links?,
@Json(name = "price_performance")
@@ -144,6 +147,28 @@ data class TokenMarketInfoResponse(
val allTime: Range?,
)
+ @JsonClass(generateAdapter = true)
+ data class SecurityData(
+ @Json(name = "total_security_score")
+ val totalSecurityScore: Float,
+ @Json(name = "provider_data")
+ val providerData: List,
+ )
+
+ @JsonClass(generateAdapter = true)
+ data class ProviderData(
+ @Json(name = "provider_id")
+ val providerId: String,
+ @Json(name = "provider_name")
+ val providerName: String,
+ @Json(name = "link")
+ val link: String?,
+ @Json(name = "security_score")
+ val securityScore: Float,
+ @Json(name = "last_audit_date")
+ val lastAuditDate: DateTime?,
+ )
+
@JsonClass(generateAdapter = true)
data class Range(
@Json(name = "low_price")
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/onramp/MockedOnrampApi.kt b/core/datasource/src/main/java/com/tangem/datasource/api/onramp/MockedOnrampApi.kt
deleted file mode 100644
index a960766de8..0000000000
--- a/core/datasource/src/main/java/com/tangem/datasource/api/onramp/MockedOnrampApi.kt
+++ /dev/null
@@ -1,178 +0,0 @@
-package com.tangem.datasource.api.onramp
-
-import com.tangem.datasource.api.common.response.ApiResponse
-import com.tangem.datasource.api.onramp.models.common.OnrampDestinationDTO
-import com.tangem.datasource.api.onramp.models.request.OnrampPairsRequest
-import com.tangem.datasource.api.onramp.models.response.OnrampDataResponse
-import com.tangem.datasource.api.onramp.models.response.OnrampQuoteResponse
-import com.tangem.datasource.api.onramp.models.response.OnrampStatusResponse
-import com.tangem.datasource.api.onramp.models.response.model.OnrampCountryDTO
-import com.tangem.datasource.api.onramp.models.response.model.OnrampCurrencyDTO
-import com.tangem.datasource.api.onramp.models.response.model.OnrampPairDTO
-import com.tangem.datasource.api.onramp.models.response.model.PaymentMethodDTO
-
-internal class MockedOnrampApi : OnrampApi {
- override suspend fun getCurrencies(): ApiResponse> = ApiResponse.Success(
- COUNTRIES.map(OnrampCountryDTO::defaultCurrency),
- )
-
- override suspend fun getCountries(): ApiResponse> = ApiResponse.Success(COUNTRIES + RUSSIA)
-
- override suspend fun getCountryByIp(): ApiResponse = ApiResponse.Success(RUSSIA)
-
- override suspend fun getPaymentMethods(): ApiResponse> = ApiResponse.Success(
- listOf(
- PaymentMethodDTO(id = "google", name = "Google Play", image = ""),
- PaymentMethodDTO(id = "apple", name = "Apple Pay", image = ""),
- PaymentMethodDTO(id = "card", name = "Card", image = ""),
- ),
- )
-
- override suspend fun getPairs(body: OnrampPairsRequest): ApiResponse> = ApiResponse.Success(
- listOf(
- OnrampPairDTO(
- fromCurrencyCode = "USD",
- to = OnrampDestinationDTO(contractAddress = "0xcontract_address", network = "ethereum"),
- providers = listOf(),
- ),
- ),
- )
-
- override suspend fun getQuote(
- fromCurrencyCode: String,
- toContractAddress: String,
- toNetwork: String,
- paymentMethod: String,
- countryCode: String,
- fromAmount: String,
- toDecimals: Int,
- providerId: String,
- ): ApiResponse {
- TODO("Not yet implemented")
- }
-
- override suspend fun getData(
- fromCurrencyCode: String,
- toContractAddress: String,
- toNetwork: String,
- paymentMethod: String,
- countryCode: String,
- fromAmount: String,
- toDecimals: Int,
- providerId: String,
- toAddress: String,
- redirectUrl: String,
- language: String?,
- theme: String?,
- requestId: String,
- ): ApiResponse {
- TODO("Not yet implemented")
- }
-
- override suspend fun getStatus(txId: String): ApiResponse {
- TODO("Not yet implemented")
- }
-
- private companion object {
- private val RUSSIA = OnrampCountryDTO(
- name = "Russia",
- code = "RU",
- image = "https://hatscripts.github.io/circle-flags/flags/ru.svg",
- alpha3 = "RUS",
- continent = "",
- defaultCurrency = OnrampCurrencyDTO(
- name = "Russian ruble",
- code = "RUB",
- image = "https://hatscripts.github.io/circle-flags/flags/ru.svg",
- precision = 2,
- ),
- onrampAvailable = false,
- )
- private val COUNTRIES = listOf(
- OnrampCountryDTO(
- name = "United States of America",
- code = "USA",
- image = "https://hatscripts.github.io/circle-flags/flags/us.svg",
- alpha3 = "USA",
- continent = "",
- defaultCurrency = OnrampCurrencyDTO(
- name = "US Dollar",
- code = "USD",
- image = "https://hatscripts.github.io/circle-flags/flags/us.svg",
- precision = 2,
- ),
- onrampAvailable = true,
- ),
- OnrampCountryDTO(
- name = "Europe Union",
- code = "EU",
- image = "https://hatscripts.github.io/circle-flags/flags/eu.svg",
- alpha3 = "EUR",
- continent = "",
- defaultCurrency = OnrampCurrencyDTO(
- name = "Euro",
- code = "EUR",
- image = "https://hatscripts.github.io/circle-flags/flags/eu.svg",
- precision = 2,
- ),
- onrampAvailable = true,
- ),
- OnrampCountryDTO(
- name = "Great Britain",
- code = "GB",
- image = "https://hatscripts.github.io/circle-flags/flags/gb.svg",
- alpha3 = "GB",
- continent = "",
- defaultCurrency = OnrampCurrencyDTO(
- name = "British Pound Sterling",
- code = "GBP",
- image = "https://hatscripts.github.io/circle-flags/flags/gb.svg",
- precision = 2,
- ),
- onrampAvailable = true,
- ),
- OnrampCountryDTO(
- name = "CANADA",
- code = "CA",
- image = "https://hatscripts.github.io/circle-flags/flags/ca.svg",
- alpha3 = "CA",
- continent = "",
- defaultCurrency = OnrampCurrencyDTO(
- name = "Canadian Dollar",
- code = "CAD",
- image = "https://hatscripts.github.io/circle-flags/flags/ca.svg",
- precision = 2,
- ),
- onrampAvailable = true,
- ),
- OnrampCountryDTO(
- name = "Hon Kong",
- code = "HK",
- image = "https://hatscripts.github.io/circle-flags/flags/hk.svg",
- alpha3 = "HK",
- continent = "",
- defaultCurrency = OnrampCurrencyDTO(
- name = "Hon Kong Dollar",
- code = "HKD",
- image = "https://hatscripts.github.io/circle-flags/flags/hk.svg",
- precision = 2,
- ),
- onrampAvailable = true,
- ),
- OnrampCountryDTO(
- name = "Australia",
- code = "AU",
- image = "https://hatscripts.github.io/circle-flags/flags/au.svg",
- alpha3 = "AU",
- continent = "",
- defaultCurrency = OnrampCurrencyDTO(
- name = "Australian Dollar",
- code = "AUD",
- image = "https://hatscripts.github.io/circle-flags/flags/au.svg",
- precision = 2,
- ),
- onrampAvailable = true,
- ),
- )
- }
-}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/onramp/OnrampApi.kt b/core/datasource/src/main/java/com/tangem/datasource/api/onramp/OnrampApi.kt
index e50542a463..2a8034b8b1 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/onramp/OnrampApi.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/onramp/OnrampApi.kt
@@ -35,6 +35,7 @@ interface OnrampApi {
@GET("onramp-quote")
suspend fun getQuote(
@Query("fromCurrencyCode") fromCurrencyCode: String,
+ @Query("fromPrecision") fromPrecision: Int,
@Query("toContractAddress") toContractAddress: String,
@Query("toNetwork") toNetwork: String,
@Query("paymentMethod") paymentMethod: String,
@@ -47,6 +48,7 @@ interface OnrampApi {
@GET("onramp-data")
suspend fun getData(
@Query("fromCurrencyCode") fromCurrencyCode: String,
+ @Query("fromPrecision") fromPrecision: Int,
@Query("toContractAddress") toContractAddress: String,
@Query("toNetwork") toNetwork: String,
@Query("paymentMethod") paymentMethod: String,
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/onramp/models/response/OnrampDataResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/onramp/models/response/OnrampDataResponse.kt
index 3b27e36068..e558fdd934 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/onramp/models/response/OnrampDataResponse.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/onramp/models/response/OnrampDataResponse.kt
@@ -20,6 +20,21 @@ data class OnrampDataResponse(
val signature: String,
)
+@JsonClass(generateAdapter = true)
+data class OnrampDataJson(
+ @Json(name = "widgetUrl")
+ val widgetUrl: String,
+
+ @Json(name = "requestId")
+ val requestId: String,
+
+ @Json(name = "externalTxId")
+ val externalTxId: String,
+
+ @Json(name = "externalTxUrl")
+ val externalTxUrl: String?,
+)
+
@JsonClass(generateAdapter = true)
data class OnrampTxDetails(
@Json(name = "fromCurrencyCode")
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/onramp/models/response/OnrampQuoteResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/onramp/models/response/OnrampQuoteResponse.kt
index 509352375a..46ca99bbb6 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/onramp/models/response/OnrampQuoteResponse.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/onramp/models/response/OnrampQuoteResponse.kt
@@ -39,8 +39,8 @@ data class OnrampQuoteResponse(
val maxFromAmount: String,
@Json(name = "minToAmount")
- val minToAmount: String,
+ val minToAmount: String?,
@Json(name = "maxToAmount")
- val maxToAmount: String,
+ val maxToAmount: String?,
)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/onramp/models/response/OnrampStatusResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/onramp/models/response/OnrampStatusResponse.kt
index 6ef0416464..301fd2421f 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/onramp/models/response/OnrampStatusResponse.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/onramp/models/response/OnrampStatusResponse.kt
@@ -14,8 +14,8 @@ data class OnrampStatusResponse(
@Json(name = "payoutAddress")
val payoutAddress: String,
- // @Json(name = "status")
- // val status: ???
+ @Json(name = "status")
+ val status: Status,
@Json(name = "failReason")
val failReason: String?,
@@ -48,14 +48,46 @@ data class OnrampStatusResponse(
val toDecimals: String,
@Json(name = "toAmount")
- val toAmount: String,
+ val toAmount: String?,
@Json(name = "toActualAmount")
- val toActualAmount: String,
+ val toActualAmount: String?,
@Json(name = "paymentMethod")
val paymentMethod: String,
@Json(name = "countryCode")
val countryCode: String,
-)
\ No newline at end of file
+)
+
+enum class Status {
+ @Json(name = "created")
+ Created,
+
+ @Json(name = "expired")
+ Expired,
+
+ @Json(name = "waiting-for-payment")
+ WaitingForPayment,
+
+ @Json(name = "payment-processing")
+ PaymentProcessing,
+
+ @Json(name = "verifying")
+ Verifying,
+
+ @Json(name = "failed")
+ Failed,
+
+ @Json(name = "paid")
+ Paid,
+
+ @Json(name = "sending")
+ Sending,
+
+ @Json(name = "finished")
+ Finished,
+
+ @Json(name = "paused")
+ Paused,
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/onramp/models/response/model/OnrampCurrencyDTO.kt b/core/datasource/src/main/java/com/tangem/datasource/api/onramp/models/response/model/OnrampCurrencyDTO.kt
index 480626a016..7dbb49bbdf 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/onramp/models/response/model/OnrampCurrencyDTO.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/onramp/models/response/model/OnrampCurrencyDTO.kt
@@ -16,4 +16,7 @@ data class OnrampCurrencyDTO(
@Json(name = "precision")
val precision: Int,
+
+ @Json(name = "unit")
+ val unit: String?,
)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/MoshiModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/MoshiModule.kt
index 1e4d5836d3..0a3b4fef73 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/di/MoshiModule.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/MoshiModule.kt
@@ -9,6 +9,7 @@ import com.tangem.datasource.api.common.adapter.DateTimeAdapter
import com.tangem.datasource.api.common.adapter.LocalDateAdapter
import com.tangem.datasource.api.common.adapter.addStakeKitEnumFallbackAdapters
import com.tangem.datasource.local.config.providers.models.ProviderModel
+import com.tangem.domain.models.scan.serialization.*
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
@@ -49,7 +50,16 @@ class MoshiModule {
@Singleton
fun provideSdkMoshiConverter(): MoshiJsonConverter {
return MoshiJsonConverter(
- adapters = listOf(BigDecimalAdapter()) + MoshiJsonConverter.getTangemSdkAdapters(),
+ adapters = MoshiJsonConverter.getTangemSdkAdapters() +
+ listOf(
+ BigDecimalAdapter(),
+ WalletDerivedKeysMapAdapter(),
+ ScanResponseDerivedKeysMapAdapter(),
+ ByteArrayKeyAdapter(),
+ ExtendedPublicKeysMapAdapter(),
+ CardBackupStatusAdapter(),
+ DerivationPathAdapterWithMigration(),
+ ),
typedAdapters = MoshiJsonConverter.getTangemSdkTypedAdapters(),
)
}
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt
index 720e14ac0b..8b38ca983a 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt
@@ -11,7 +11,6 @@ import com.tangem.datasource.api.common.config.managers.ProdApiConfigsManager
import com.tangem.datasource.api.common.response.ApiResponseCallAdapterFactory
import com.tangem.datasource.api.express.TangemExpressApi
import com.tangem.datasource.api.markets.TangemTechMarketsApi
-import com.tangem.datasource.api.onramp.MockedOnrampApi
import com.tangem.datasource.api.onramp.OnrampApi
import com.tangem.datasource.api.stakekit.StakeKitApi
import com.tangem.datasource.api.tangemTech.TangemTechApi
@@ -99,24 +98,22 @@ internal object NetworkModule {
@Provides
@Singleton
fun provideOnrampApi(
- // @NetworkMoshi moshi: Moshi,
- // @ApplicationContext context: Context,
- // apiConfigsManager: ApiConfigsManager,
- // appLogsStore: AppLogsStore,
+ @NetworkMoshi moshi: Moshi,
+ @ApplicationContext context: Context,
+ apiConfigsManager: ApiConfigsManager,
+ appLogsStore: AppLogsStore,
): OnrampApi {
- // TODO: Remove when backend will be ready - [REDACTED_TASK_KEY]
- return MockedOnrampApi()
- // return createApi(
- // id = ApiConfig.ID.Express,
- // moshi = moshi,
- // context = context,
- // apiConfigsManager = apiConfigsManager,
- // clientBuilder = {
- // addInterceptor(
- // NetworkLogsSaveInterceptor(appLogsStore),
- // )
- // },
- // )
+ return createApi(
+ id = ApiConfig.ID.Express,
+ moshi = moshi,
+ context = context,
+ apiConfigsManager = apiConfigsManager,
+ clientBuilder = {
+ addInterceptor(
+ NetworkLogsSaveInterceptor(appLogsStore),
+ )
+ },
+ )
}
@Provides
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/OnrampStoreModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/OnrampStoreModule.kt
new file mode 100644
index 0000000000..e786b22f21
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/OnrampStoreModule.kt
@@ -0,0 +1,53 @@
+package com.tangem.datasource.di
+
+import com.tangem.datasource.local.datastore.RuntimeDataStore
+import com.tangem.datasource.local.onramp.countries.DefaultOnrampCountriesStore
+import com.tangem.datasource.local.onramp.countries.OnrampCountriesStore
+import com.tangem.datasource.local.onramp.currencies.DefaultOnrampCurrenciesStore
+import com.tangem.datasource.local.onramp.currencies.OnrampCurrenciesStore
+import com.tangem.datasource.local.onramp.pairs.DefaultOnrampPairsStore
+import com.tangem.datasource.local.onramp.pairs.OnrampPairsStore
+import com.tangem.datasource.local.onramp.paymentmethods.DefaultOnrampPaymentMethodsStore
+import com.tangem.datasource.local.onramp.paymentmethods.OnrampPaymentMethodsStore
+import com.tangem.datasource.local.onramp.quotes.DefaultOnrampQuotesStore
+import com.tangem.datasource.local.onramp.quotes.OnrampQuotesStore
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal object OnrampStoreModule {
+
+ @Provides
+ @Singleton
+ fun provideOnrampPaymentMethodsStore(): OnrampPaymentMethodsStore {
+ return DefaultOnrampPaymentMethodsStore(dataStore = RuntimeDataStore())
+ }
+
+ @Provides
+ @Singleton
+ fun provideOnrampPairsStore(): OnrampPairsStore {
+ return DefaultOnrampPairsStore(dataStore = RuntimeDataStore())
+ }
+
+ @Provides
+ @Singleton
+ fun provideOnrampQuotesStore(): OnrampQuotesStore {
+ return DefaultOnrampQuotesStore(dataStore = RuntimeDataStore())
+ }
+
+ @Provides
+ @Singleton
+ fun provideOnrampCountriesStore(): OnrampCountriesStore {
+ return DefaultOnrampCountriesStore(dataStore = RuntimeDataStore())
+ }
+
+ @Provides
+ @Singleton
+ fun provideOnrampCurrencies(): OnrampCurrenciesStore {
+ return DefaultOnrampCurrenciesStore(dataStore = RuntimeDataStore())
+ }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/exchangeservice/ExchangeServiceLoaderModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/exchangeservice/ExchangeServiceLoaderModule.kt
new file mode 100644
index 0000000000..d9ae44675f
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/exchangeservice/ExchangeServiceLoaderModule.kt
@@ -0,0 +1,18 @@
+package com.tangem.datasource.di.exchangeservice
+
+import com.tangem.datasource.exchangeservice.swap.DefaultExpressServiceLoader
+import com.tangem.datasource.exchangeservice.swap.ExpressServiceLoader
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal interface ExchangeServiceLoaderModule {
+
+ @Binds
+ @Singleton
+ fun bindExpressServiceLoader(defaultExpressServiceLoader: DefaultExpressServiceLoader): ExpressServiceLoader
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/exchangeservice/swap/DefaultExpressServiceLoader.kt b/core/datasource/src/main/java/com/tangem/datasource/exchangeservice/swap/DefaultExpressServiceLoader.kt
new file mode 100644
index 0000000000..c2818ecd87
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/exchangeservice/swap/DefaultExpressServiceLoader.kt
@@ -0,0 +1,82 @@
+package com.tangem.datasource.exchangeservice.swap
+
+import com.tangem.datasource.api.common.response.getOrThrow
+import com.tangem.datasource.api.express.TangemExpressApi
+import com.tangem.datasource.api.express.models.request.AssetsRequestBody
+import com.tangem.datasource.api.express.models.request.LeastTokenInfo
+import com.tangem.datasource.api.express.models.response.Asset
+import com.tangem.datasource.local.token.ExpressAssetsStore
+import com.tangem.domain.core.lce.Lce
+import com.tangem.domain.core.utils.lceContent
+import com.tangem.domain.core.utils.lceError
+import com.tangem.domain.core.utils.lceLoading
+import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import javax.inject.Inject
+
+typealias InitializationStatusFlow = MutableStateFlow>>
+
+/**
+ * Default implementation of [ExpressServiceLoader]
+ *
+ * @property tangemExpressApi express api
+ * @property expressAssetsStore local storage
+ *
+[REDACTED_AUTHOR]
+ */
+internal class DefaultExpressServiceLoader @Inject constructor(
+ private val tangemExpressApi: TangemExpressApi,
+ private val expressAssetsStore: ExpressAssetsStore,
+ private val dispatchers: CoroutineDispatcherProvider,
+) : ExpressServiceLoader {
+
+ private val initializationStatuses =
+ MutableStateFlow>(value = emptyMap())
+
+ override suspend fun update(userWalletId: UserWalletId, userTokens: List) {
+ withContext(dispatchers.io) {
+ val initializationStatus = getInitializationStatusInternal(userWalletId)
+
+ initializationStatus.update { lceLoading() }
+
+ try {
+ if (userTokens.isNotEmpty()) {
+ val response = tangemExpressApi.getAssets(
+ body = AssetsRequestBody(tokensList = userTokens),
+ ).getOrThrow()
+
+ expressAssetsStore.store(userWalletId, response)
+
+ initializationStatus.update { response.lceContent() }
+ }
+ } catch (e: Throwable) {
+ initializationStatus.update { e.lceError() }
+ Timber.e(e, "Unable to fetch assets for: ${userWalletId.stringValue}")
+ }
+ }
+ }
+
+ override fun getInitializationStatus(userWalletId: UserWalletId): InitializationStatusFlow {
+ return getInitializationStatusInternal(userWalletId)
+ }
+
+ private fun getInitializationStatusInternal(userWalletId: UserWalletId): InitializationStatusFlow {
+ val initializationStatus = initializationStatuses.value.get(key = userWalletId)
+
+ if (initializationStatus != null) return initializationStatus
+
+ val default: InitializationStatusFlow = MutableStateFlow(value = lceLoading())
+
+ initializationStatuses.update {
+ it.toMutableMap().apply {
+ put(key = userWalletId, value = default)
+ }
+ }
+
+ return default
+ }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/exchangeservice/swap/ExpressServiceLoader.kt b/core/datasource/src/main/java/com/tangem/datasource/exchangeservice/swap/ExpressServiceLoader.kt
new file mode 100644
index 0000000000..72e59dba3a
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/exchangeservice/swap/ExpressServiceLoader.kt
@@ -0,0 +1,21 @@
+package com.tangem.datasource.exchangeservice.swap
+
+import com.tangem.datasource.api.express.models.request.LeastTokenInfo
+import com.tangem.datasource.api.express.models.response.Asset
+import com.tangem.domain.core.lce.Lce
+import com.tangem.domain.wallets.models.UserWalletId
+import kotlinx.coroutines.flow.StateFlow
+
+/**
+ * Express service loader
+ *
+[REDACTED_AUTHOR]
+ */
+interface ExpressServiceLoader {
+
+ /** Update service using [userWalletId] and [userTokens] */
+ suspend fun update(userWalletId: UserWalletId, userTokens: List)
+
+ /** Get initialization status by [userWalletId] */
+ fun getInitializationStatus(userWalletId: UserWalletId): StateFlow>>
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/onramp/countries/DefaultOnrampCountriesStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/onramp/countries/DefaultOnrampCountriesStore.kt
new file mode 100644
index 0000000000..8a532d8284
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/onramp/countries/DefaultOnrampCountriesStore.kt
@@ -0,0 +1,11 @@
+package com.tangem.datasource.local.onramp.countries
+
+import com.tangem.datasource.local.datastore.core.StringKeyDataStore
+import com.tangem.datasource.local.datastore.core.StringKeyDataStoreDecorator
+import com.tangem.domain.onramp.model.OnrampCountry
+
+internal class DefaultOnrampCountriesStore(
+ dataStore: StringKeyDataStore>,
+) : OnrampCountriesStore, StringKeyDataStoreDecorator>(dataStore) {
+ override fun provideStringKey(key: String): String = key
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/onramp/countries/OnrampCountriesStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/onramp/countries/OnrampCountriesStore.kt
new file mode 100644
index 0000000000..cd6fad266e
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/onramp/countries/OnrampCountriesStore.kt
@@ -0,0 +1,11 @@
+package com.tangem.datasource.local.onramp.countries
+
+import com.tangem.domain.onramp.model.OnrampCountry
+import kotlinx.coroutines.flow.Flow
+
+interface OnrampCountriesStore {
+ suspend fun getSyncOrNull(key: String): List?
+ fun get(key: String): Flow>
+ suspend fun store(key: String, value: List)
+ suspend fun clear()
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/onramp/currencies/DefaultOnrampCurrenciesStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/onramp/currencies/DefaultOnrampCurrenciesStore.kt
new file mode 100644
index 0000000000..d24195590d
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/onramp/currencies/DefaultOnrampCurrenciesStore.kt
@@ -0,0 +1,11 @@
+package com.tangem.datasource.local.onramp.currencies
+
+import com.tangem.datasource.local.datastore.core.StringKeyDataStore
+import com.tangem.datasource.local.datastore.core.StringKeyDataStoreDecorator
+import com.tangem.domain.onramp.model.OnrampCurrency
+
+internal class DefaultOnrampCurrenciesStore(
+ dataStore: StringKeyDataStore>,
+) : OnrampCurrenciesStore, StringKeyDataStoreDecorator>(dataStore) {
+ override fun provideStringKey(key: String): String = key
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/onramp/currencies/OnrampCurrenciesStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/onramp/currencies/OnrampCurrenciesStore.kt
new file mode 100644
index 0000000000..38bea3c404
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/onramp/currencies/OnrampCurrenciesStore.kt
@@ -0,0 +1,11 @@
+package com.tangem.datasource.local.onramp.currencies
+
+import com.tangem.domain.onramp.model.OnrampCurrency
+import kotlinx.coroutines.flow.Flow
+
+interface OnrampCurrenciesStore {
+ suspend fun getSyncOrNull(key: String): List?
+ fun get(key: String): Flow>
+ suspend fun store(key: String, value: List)
+ suspend fun clear()
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/onramp/pairs/DefaultOnrampPairsStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/onramp/pairs/DefaultOnrampPairsStore.kt
new file mode 100644
index 0000000000..ff997be404
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/onramp/pairs/DefaultOnrampPairsStore.kt
@@ -0,0 +1,11 @@
+package com.tangem.datasource.local.onramp.pairs
+
+import com.tangem.datasource.local.datastore.core.StringKeyDataStore
+import com.tangem.datasource.local.datastore.core.StringKeyDataStoreDecorator
+import com.tangem.domain.onramp.model.OnrampPair
+
+internal class DefaultOnrampPairsStore(
+ dataStore: StringKeyDataStore>,
+) : OnrampPairsStore, StringKeyDataStoreDecorator>(dataStore) {
+ override fun provideStringKey(key: String): String = key
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/onramp/pairs/OnrampPairsStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/onramp/pairs/OnrampPairsStore.kt
new file mode 100644
index 0000000000..0396549be9
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/onramp/pairs/OnrampPairsStore.kt
@@ -0,0 +1,9 @@
+package com.tangem.datasource.local.onramp.pairs
+
+import com.tangem.domain.onramp.model.OnrampPair
+
+interface OnrampPairsStore {
+ suspend fun getSyncOrNull(key: String): List?
+ suspend fun store(key: String, value: List)
+ suspend fun clear()
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/onramp/paymentmethods/DefaultOnrampPaymentMethodsStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/onramp/paymentmethods/DefaultOnrampPaymentMethodsStore.kt
new file mode 100644
index 0000000000..1dacddfbc0
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/onramp/paymentmethods/DefaultOnrampPaymentMethodsStore.kt
@@ -0,0 +1,12 @@
+package com.tangem.datasource.local.onramp.paymentmethods
+
+import com.tangem.datasource.api.onramp.models.response.model.PaymentMethodDTO
+import com.tangem.datasource.local.datastore.core.StringKeyDataStore
+import com.tangem.datasource.local.datastore.core.StringKeyDataStoreDecorator
+
+internal class DefaultOnrampPaymentMethodsStore(
+ dataStore: StringKeyDataStore>,
+) : OnrampPaymentMethodsStore, StringKeyDataStoreDecorator>(dataStore) {
+
+ override fun provideStringKey(key: String): String = key
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/onramp/paymentmethods/OnrampPaymentMethodsStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/onramp/paymentmethods/OnrampPaymentMethodsStore.kt
new file mode 100644
index 0000000000..6626726313
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/onramp/paymentmethods/OnrampPaymentMethodsStore.kt
@@ -0,0 +1,17 @@
+package com.tangem.datasource.local.onramp.paymentmethods
+
+import com.tangem.datasource.api.onramp.models.response.model.PaymentMethodDTO
+import kotlinx.coroutines.flow.Flow
+
+interface OnrampPaymentMethodsStore {
+
+ suspend fun getSyncOrNull(key: String): List?
+
+ fun get(key: String): Flow>
+
+ suspend fun store(key: String, value: List)
+
+ suspend fun contains(key: String): Boolean
+
+ suspend fun clear()
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/onramp/quotes/DefaultOnrampQuotesStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/onramp/quotes/DefaultOnrampQuotesStore.kt
new file mode 100644
index 0000000000..0bd7a609b6
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/onramp/quotes/DefaultOnrampQuotesStore.kt
@@ -0,0 +1,11 @@
+package com.tangem.datasource.local.onramp.quotes
+
+import com.tangem.datasource.local.datastore.core.StringKeyDataStore
+import com.tangem.datasource.local.datastore.core.StringKeyDataStoreDecorator
+import com.tangem.domain.onramp.model.OnrampQuote
+
+internal class DefaultOnrampQuotesStore(
+ dataStore: StringKeyDataStore>,
+) : OnrampQuotesStore, StringKeyDataStoreDecorator>(dataStore) {
+ override fun provideStringKey(key: String): String = key
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/onramp/quotes/OnrampQuotesStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/onramp/quotes/OnrampQuotesStore.kt
new file mode 100644
index 0000000000..cad798ee3f
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/onramp/quotes/OnrampQuotesStore.kt
@@ -0,0 +1,11 @@
+package com.tangem.datasource.local.onramp.quotes
+
+import com.tangem.domain.onramp.model.OnrampQuote
+import kotlinx.coroutines.flow.Flow
+
+interface OnrampQuotesStore {
+ suspend fun getSyncOrNull(key: String): List?
+ fun get(key: String): Flow>
+ suspend fun store(key: String, value: List)
+ suspend fun clear()
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/preferences/PreferencesKeys.kt b/core/datasource/src/main/java/com/tangem/datasource/local/preferences/PreferencesKeys.kt
index 10f76c5e66..df2f985c7d 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/preferences/PreferencesKeys.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/preferences/PreferencesKeys.kt
@@ -53,12 +53,10 @@ object PreferencesKeys {
val LAST_SWAPPED_CRYPTOCURRENCY_ID_KEY by lazy { stringPreferencesKey(name = "lastSwappedCryptoCurrency") }
- val IS_WALLET_TRAVALA_PROMO_SHOWN_KEY by lazy {
- booleanPreferencesKey(name = "isWalletTravalaPromoShown")
- }
-
val FEATURE_TOGGLES_KEY by lazy { stringPreferencesKey(name = "featureToggles") }
+ val EXCLUDED_BLOCKCHAINS_KEY by lazy { stringSetPreferencesKey(name = "excludedBlockchains") }
+
val WAS_TWINS_ONBOARDING_SHOWN by lazy { booleanPreferencesKey(name = "twinsOnboardingShown") }
val IS_TANGEM_TOS_ACCEPTED_KEY by lazy { booleanPreferencesKey(name = "tangem_tos_accepted") }
@@ -103,6 +101,16 @@ object PreferencesKeys {
val SHOULD_SHOW_RING_PROMO_KEY by lazy { booleanPreferencesKey(name = "shouldShowRingPromo") }
+ val ONRAMP_DEFAULT_COUNTRY by lazy { stringPreferencesKey(name = "onrampDefaultCountry") }
+
+ val ONRAMP_TRANSACTIONS_STATUSES_KEY by lazy { stringPreferencesKey(name = "onrampTransactionsStatuses") }
+
+ val ONBOARDING_FINALIZE_SCAN_RESPONSE_KEY by lazy { stringPreferencesKey(name = "onboardingFinalizeScanResponse") }
+
+ val IS_GOOGLE_SERVICES_AVAILABLE_KEY by lazy { booleanPreferencesKey(name = "isGoogleServicesAvailable") }
+
+ val IS_GOOGLE_PAY_AVAILABLE_KEY by lazy { booleanPreferencesKey(name = "isGooglePayAvailable") }
+
// region Permission
fun getShouldShowPermission(permission: String) = booleanPreferencesKey("shouldShowPushPermission_$permission")
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/preferences/utils/AppPreferencesStoreExt.kt b/core/datasource/src/main/java/com/tangem/datasource/local/preferences/utils/AppPreferencesStoreExt.kt
index a7fd3cafef..0369cf22cd 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/preferences/utils/AppPreferencesStoreExt.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/preferences/utils/AppPreferencesStoreExt.kt
@@ -150,4 +150,12 @@ suspend inline fun AppPreferencesStore.getObjectSetSync(key: Prefere
?.get(key)
?.let(adapter::fromJson)
.orEmpty()
+}
+
+/** Get flow of set of [T] by string [key], or empty if data is not found */
+inline fun AppPreferencesStore.getObjectSet(key: Preferences.Key): Flow> {
+ val adapter = moshi.adapter>(Types.newParameterizedType(Set::class.java, T::class.java))
+ return data.map {
+ it[key]?.let(adapter::fromJson) ?: emptySet()
+ }
}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/swaptx/DefaultSwapTransactionStatusStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/swaptx/DefaultSwapTransactionStatusStore.kt
index 50b4f08c9d..bb094d028f 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/swaptx/DefaultSwapTransactionStatusStore.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/swaptx/DefaultSwapTransactionStatusStore.kt
@@ -3,10 +3,10 @@ package com.tangem.datasource.local.swaptx
import com.tangem.datasource.local.datastore.core.StringKeyDataStore
internal class DefaultSwapTransactionStatusStore(
- private val dataStore: StringKeyDataStore,
-) : SwapTransactionStatusStore, StringKeyDataStore by dataStore {
+ private val dataStore: StringKeyDataStore,
+) : SwapTransactionStatusStore, StringKeyDataStore by dataStore {
override suspend fun getTransactionStatus(txId: String) = getSyncOrNull(txId)
- override suspend fun setTransactionStatus(txId: String, status: ExchangeAnalyticsStatus) = store(txId, status)
+ override suspend fun setTransactionStatus(txId: String, status: ExpressAnalyticsStatus) = store(txId, status)
}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/swaptx/SwapTransactionStatusStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/swaptx/SwapTransactionStatusStore.kt
index cf99b7c4ac..033f71b6ac 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/swaptx/SwapTransactionStatusStore.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/swaptx/SwapTransactionStatusStore.kt
@@ -4,12 +4,12 @@ package com.tangem.datasource.local.swaptx
* Runtime cache for storing swap transactions statuses sent to analytics
*/
interface SwapTransactionStatusStore {
- suspend fun getTransactionStatus(txId: String): ExchangeAnalyticsStatus?
+ suspend fun getTransactionStatus(txId: String): ExpressAnalyticsStatus?
- suspend fun setTransactionStatus(txId: String, status: ExchangeAnalyticsStatus)
+ suspend fun setTransactionStatus(txId: String, status: ExpressAnalyticsStatus)
}
-enum class ExchangeAnalyticsStatus(val value: String) {
+enum class ExpressAnalyticsStatus(val value: String) {
WaitingTxHash("Waiting tx hash"),
InProgress("In Progress"),
Done("Done"),
diff --git a/core/datasource/src/test/kotlin/com/tangem/datasource/asset/loader/AssetLoaderTest.kt b/core/datasource/src/test/kotlin/com/tangem/datasource/asset/loader/AssetLoaderTest.kt
index 529f1271a9..49924b9fe8 100644
--- a/core/datasource/src/test/kotlin/com/tangem/datasource/asset/loader/AssetLoaderTest.kt
+++ b/core/datasource/src/test/kotlin/com/tangem/datasource/asset/loader/AssetLoaderTest.kt
@@ -90,6 +90,7 @@ class AssetLoaderTest {
contractAddress = "0x0000000000000000000000000000000000000000",
network = "Network",
exchangeAvailable = true,
+ onrampAvailable = true,
)
val assetList = listOf(assetObject, assetObject)
@@ -100,7 +101,8 @@ class AssetLoaderTest {
{
"contractAddress": "${assetObject.contractAddress}",
"network": "${assetObject.network}",
- "exchangeAvailable": ${assetObject.exchangeAvailable}
+ "exchangeAvailable": ${assetObject.exchangeAvailable},
+ "onrampAvailable": ${assetObject.onrampAvailable}
}
""".trimIndent()
diff --git a/core/deep-links/global/src/main/kotlin/com/tangem/core/deeplink/global/BuyCurrencyDeepLink.kt b/core/deep-links/global/src/main/kotlin/com/tangem/core/deeplink/global/BuyCurrencyDeepLink.kt
index 3c31ec55a7..b9427aee10 100644
--- a/core/deep-links/global/src/main/kotlin/com/tangem/core/deeplink/global/BuyCurrencyDeepLink.kt
+++ b/core/deep-links/global/src/main/kotlin/com/tangem/core/deeplink/global/BuyCurrencyDeepLink.kt
@@ -2,11 +2,25 @@ package com.tangem.core.deeplink.global
import com.tangem.core.deeplink.DeepLink
-class BuyCurrencyDeepLink(val onReceive: () -> Unit) : DeepLink {
+class BuyCurrencyDeepLink(
+ isOnrampFeatureEnabled: Boolean,
+ val onReceive: (externalTxId: String) -> Unit,
+) : DeepLink {
- override val uri: String = "tangem://redirect?action=dismissBrowser"
+ override val uri: String = if (isOnrampFeatureEnabled) {
+ ONRAMP_REDIRECT_DEEPLINK
+ } else {
+ BUY_REDIRECT_DEEPLINK
+ }
override fun onReceive(params: Map) {
- onReceive()
+ onReceive(
+ params["merchant_transaction_id"] ?: return,
+ )
+ }
+
+ companion object {
+ const val ONRAMP_REDIRECT_DEEPLINK = "tangem://onramp-success?"
+ private const val BUY_REDIRECT_DEEPLINK = "tangem://redirect?action=dismissBrowser"
}
}
\ No newline at end of file
diff --git a/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/storage/FeatureToggle.kt b/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/storage/FeatureToggle.kt
deleted file mode 100644
index b019bfc810..0000000000
--- a/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/storage/FeatureToggle.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.tangem.core.featuretoggle.storage
-
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-
-/**
- * Data model with information about feature toggle
- *
- * @property name feature toggle name
- * @property version version number in which the feature will be included
- *
- * IMPORTANT: if the version is "undefined", it means that feature toggle is disabled!
- *
-[REDACTED_AUTHOR]
- */
-@JsonClass(generateAdapter = true)
-internal data class FeatureToggle(
- @Json(name = "name") val name: String,
- @Json(name = "version") val version: String,
-)
\ No newline at end of file
diff --git a/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/storage/FeatureTogglesStorage.kt b/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/storage/FeatureTogglesStorage.kt
deleted file mode 100644
index dd788efacb..0000000000
--- a/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/storage/FeatureTogglesStorage.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.tangem.core.featuretoggle.storage
-
-/**
- * Component that initializes and stores a list of feature toggles
- *
-[REDACTED_AUTHOR]
- */
-internal interface FeatureTogglesStorage {
-
- /** List of feature toggles */
- val featureToggles: List
-
- /** Initialize storage */
- suspend fun init()
-}
\ No newline at end of file
diff --git a/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/storage/LocalFeatureTogglesStorage.kt b/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/storage/LocalFeatureTogglesStorage.kt
deleted file mode 100644
index dbd92dee48..0000000000
--- a/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/storage/LocalFeatureTogglesStorage.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.tangem.core.featuretoggle.storage
-
-import com.tangem.core.featuretoggle.storage.LocalFeatureTogglesStorage.Companion.LOCAL_CONFIG_PATH
-import com.tangem.datasource.asset.loader.AssetLoader
-import kotlin.properties.Delegates
-
-/**
- * Storage implementation for storing local feature toggles.
- * Feature toggles are declared in file [LOCAL_CONFIG_PATH].
- *
- * @property assetLoader asset loader
- *
-[REDACTED_AUTHOR]
- */
-internal class LocalFeatureTogglesStorage(
- private val assetLoader: AssetLoader,
-) : FeatureTogglesStorage {
-
- override var featureToggles: List by Delegates.notNull()
- private set
-
- override suspend fun init() {
- featureToggles = assetLoader.loadList(LOCAL_CONFIG_PATH)
- }
-
- private companion object {
- const val LOCAL_CONFIG_PATH: String = "configs/feature_toggles_config"
- }
-}
\ No newline at end of file
diff --git a/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/utils/CollectionExt.kt b/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/utils/CollectionExt.kt
deleted file mode 100644
index 990f95cf18..0000000000
--- a/core/featuretoggles/src/main/kotlin/com/tangem/core/featuretoggle/utils/CollectionExt.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.tangem.core.featuretoggle.utils
-
-import com.tangem.core.featuretoggle.contract.VersionAvailabilityContract
-import com.tangem.core.featuretoggle.storage.FeatureToggle
-
-internal fun List.associateToggles(currentVersion: String): Map {
- return associate { localToggle ->
- Pair(
- first = localToggle.name,
- second = VersionAvailabilityContract(currentVersion, localToggle.version),
- )
- }
-}
\ No newline at end of file
diff --git a/core/res/src/main/res/values-de/strings.xml b/core/res/src/main/res/values-de/strings.xml
index 45027a8620..3cc2368a82 100644
--- a/core/res/src/main/res/values-de/strings.xml
+++ b/core/res/src/main/res/values-de/strings.xml
@@ -1,11 +1,22 @@
- Token nicht in Deinem Portfolio gefunden? Überprüfe die Märkte, um es zu finden und zum Kauf hinzuzufügen
- Token nicht in Deinem Portfolio gefunden? Überprüfe die Märkte, um es zu finden und zum Verkauf hinzuzufügen
+ Du kannst Deinen Token nicht finden? Gehe zum Bereich „Markt“ auf der Hauptseite und fügen diesen zum kaufen im Portfolio hinzu.
+ Du kannst Deinen Token nicht finden? Gehe zum Bereich „Markt“ auf der Hauptseite und fügen diesen zum verkaufen im Portfolio hinzu.
+ Verkaufen
+ Einige Netzwerke sind derzeit nicht erreichbar. Bitte versuche es später erneut.
+ Die Daten wurden noch nicht geladen.
+ Die Aktion ist derzeit nicht verfügbar. Bitte versuche es später erneut oder aktualisiere die Daten, indem Du auf dem Bildschirm nach unten wischst.
+ Schaltfläche ist nicht verfügbar
Wähle den Token
- Token nicht in Deinem Portfolio gefunden? Überprüfe die Märkte, um es für Swaps zu finden und hinzuzufügen
+ Du kannst Deinen Token nicht finden? Gehe zum Bereich „Markt“ auf der Hauptseite und fügen diesen zum tauschen im Portfolio hinzu.
Es gibt keine verfügbaren Token, die mit dem ausgewählten Token getauscht werden können. Bitte wähle einen anderen.
Kein verfügbares Paar
+ Um die Tauschfunktion zu nutzen, muss Dein Portfolio mindestens 2 Token enthalten.
+ Token hinzufügen
+ Du hast Deinem Portfolio nur 1 Token hinzugefügt. Um die Tauschfunktion zu verwenden, musst Du mindestens 2 Token hinzufügen.
+ Token hinzufügen
+ Wähle den Token aus, den Du erhalten möchtest
+ Wähle den Token, den Du tauschen möchtest
Netzwerk wählen
Token anlegen
Token verwalten
@@ -124,7 +135,7 @@
Markt
Langsam
Gebühren
- Adressen abrufen
+ Adressen synchronisieren
Zum Anbieter gehen
Zum Token
stunde
@@ -247,8 +258,9 @@
Bereitgestellt von
Status
Tangem bietet Token-Swaps über Drittanbieter gemäß den jeweiligen Bedingungen des jeweiligen Anbieters an.
- Anbieter wählen
+ Anbieter
Es ist ein Fehler aufgetreten. Code: %s
+ Fehler %1$s. Der ausgewählte Anbieter kann die angegebene Transaktion nicht verarbeiten. Bitte runde den Wert auf %2$s auf oder änder diesen.
Der gewählte Anbieter ist im Moment nicht verfügbar. Bitte versuche es später noch einmal. (Code: %s)
Swaps sind im Moment nicht verfügbar. Bitte versuche es später noch einmal. (Code: %s)
Geschätzter Betrag
@@ -259,6 +271,9 @@
Der Betrag wurde in %1$s (%2$s Netzwerk) zurückerstattet.
Besuche die Website des Anbieters zur Überprüfung
KYC-Überprüfung durch den Anbieter erforderlich
+ Gekauft
+ Einkaufen
+ Einkaufen...
Abgebrochen
Bestätigt
Bestätigen
@@ -304,6 +319,7 @@
Bitte sag uns, welche Karte oder Ring du hast
Hallo Support-Team,
Bitte erzähle uns mehr über dein Problem. Jedes kleine Detail kann helfen.
+ Zuvor aktivierte Wallet
Meine Vorschläge
Kann eine Karte oder Ring nicht scannen
Rückmeldung
@@ -563,22 +579,27 @@
Zugangscode wiederherstellen
Identische Karten oder Ring
Zugangscode
+ Verfügbar mit %s
+ Der Kauf von Kryptowährungen bei Tangem wird von Drittanbietern zu deren Bedingungen durchgeführt.
Suche nach Land
Nicht verfügbar
Suche nach Währung
+ Durch die Nutzung der Onramp-Funktionalität stimmst Du den %1$s und %2$s des Anbieters zu.
Der Kaufbetrag sollte nicht höher sein als %s
Der zu kaufende Betrag muss mindestens %s betragen
Keine verfügbaren Anbieter für diese Währung
Bezahlen mit
+ Verfügbar bis zu %s
+ Erhältlich bei %s
Du kannst Deine Transaktion beim Drittanbieter %s abschließen.
Umleitung auf %s…
Unsere Dienstleistungen sind in diesem Land nicht verfügbar
- Änder oder bestätige bitte
Dein Wohnsitz wurde identifiziert als
Residenz
Bitte wähle das richtige Land aus, um korrekte Zahlungsoptionen und Dienstleistungen zu gewährleisten.
Einstellungen
- Du kannst den Transaktionsstatus auf der Token-Seite überprüfen.
+ Du kannst diesen Bildschirm schließen und den Transaktionsstatus auf dem Bildschirm mit den Token-Details überprüfen.
+ Du kannst diesen Bildschirm schließen und den Transaktionsstatus auf dem Bildschirm mit den Token-Details überprüfen.
Über
Gruppe erstellen
Nach Guthaben
@@ -592,7 +613,7 @@
%1$s ( %2$s ) im %3$s Netzwerk
Das Senden einer anderen Währung führt zu deren irreversiblem Verlust.
Sende nur %s an diese Adresse. Der Versand einer anderen Währung führt zu ihrem unwiderruflichen Verlust.
- Sende nur %s an diese Adresse.
+ Senden nur %1$s im Netzwerk %2$s
Überweise Geld von einem anderen Wallet oder einer anderen Börse
Teilnehmen
Die Informationen zum Empfehlungsprogramm konnten nicht geladen werden. Bitte versuche es später noch einmal.
@@ -644,6 +665,11 @@
Karte oder Ring scannen
Scanne die Karte oder Ring, um ihre Einstellungen zu ändern. Die Änderungen wirken sich nur auf die von dir gescannte Karte oder Ring aus und haben keine Auswirkungen auf andere mit deiner Wallet verknüpften Geräte.
Halte deine Karte oder Ring bereit!
+ Sicherheitswarnung
+ Dein Konto verfügt nicht über ausreichend Guthaben, um Kryptowährungen zu verkaufen. Bitte zahle den gewünschten Vermögenswert ein, um fortzufahren.
+ Unzureichendes Guthaben
+ Der Verkauf von Kryptowährung ist in Deiner Region derzeit nicht möglich. Wir arbeiten aktiv daran, Ihnen diese Option bald anzubieten – bleib dran!
+ Regionale Einschränkung
Bereits in der eingegebenen Adresse enthalten
Der Provisionsbetrag ist %s mal der empfohlene Betrag. Stelle sicher, dass die benutzerdefinierten Einstellungen korrekt sind.
Du hast eine Kommission angegeben, die unter dem empfohlenen Betrag liegt, was zu einer Verzögerung Ihrer Transaktion führen könnte. Weiter?
@@ -684,6 +710,7 @@
Die individuelle Gebühr ist hoch
Aufgrund der Besonderheiten des Netzes %1$s ist die Gebühr für die Überweisung des gesamten Guthabens höher. Um die Kommission zu reduzieren, Kannst du %2$s verlassen.
Die Gebühr ist höher
+ Dein Kontostand darf nicht niedriger sein als die Miete. Bitte halte mindestens %1$s auf Deinem Konto oder ziehe den gesamten Betrag ab.
Die enthaltene Kommission übersteigt den Überweisungsbetrag, was zu einem negativen Wert führt
Ungültige Menge
Der Mindestbetrag für den Versand beträgt %1$s. Bitte stell sicher, dass der Restbetrag nach dem Versand nicht unter %2$s liegt.
@@ -856,6 +883,7 @@
Du erhältst
Token auswählen
Nicht verfügbar
+ Das ist meine Wallet
Guthaben versteckt
Angezeigte Salden
Rückgängig machen
@@ -885,6 +913,7 @@
Nicht verfügbar zum Kauf
Nicht zum Verkauf verfügbar
Nicht verfügbar für Tausch von %s
+ Nicht zum Tausch verfügbar
Vertrag: %s
Du hast noch keine Transaktionen
Der Transaktionsverlauf konnte nicht geladen werden.\nKlicke auf die Schaltfläche Neu laden, um die Informationen zu aktualisieren.
@@ -924,6 +953,7 @@
Alle mit %s freischalten
Blockchain ist nicht erreichbar. Versuche es später nochmal
Karte oder Ring scannen
+ Diese Wallet wurde bereits früher aktiviert.\nWenn es nicht von Dir durchgeführt wurde, wende Dich bitte an den Support.\nTangem verkauft niemals Wallets zusammen mit dem vorgenerierten Zugangscode.
Aufforderung zum Signieren einer Nachricht. \n\n %s
Dapp %1$s, mit der Bitte um\nBNB-Transaktion zu unterzeichnen.\n\n%2$s
Handelsauftrag für %1$s\n Preis: %2$s\n Zu erhaltender Betrag: %3$s\n Zu zahlender Betrag: %4$s
@@ -1005,12 +1035,12 @@
Bei dieser Karte oder Ring kann es sich um ein Produktionsmuster oder eine Fälschung handeln
Echtheitsprüfung fehlgeschlagen
zuordnen
- Dieser Token muss mit Ihrem Hedera-Konto verbunden sein, bevor du diesen erhalten kannst. Zuordnungsgebühr ~%1$s %2$s
+ Dieser Token muss mit Ihrem Hedera-Konto verbunden sein, bevor du diesen erhalten kannst. Zuordnungsgebühr ~%1$s %2$s
Dieses Token muss mit deinem Hedera-Konto verknüpft sein, bevor du ihn erhalten kannst.
Verknüpfe deinen Token
Nicht genug %s. Lade dein Hedera-Konto auf, um dieses Token zuzuordnen
Bist Du sicher, dass Du die Transaktion stornieren willst? Du kannst die Transaktion nicht erneut starten.
- Deine Transaktion mit einem Betrag von %1$s %2$s wurde nicht abgeschlossen. Du kannst versuchen, diese erneut abzuschließen.
+ Deine Transaktion mit einem Betrag von %1$s %2$s wurde nicht abgeschlossen. Du kannst versuchen, diese erneut abzuschließen.
Du hast eine nicht abgeschlossene Transaktion
Auf dieser Karte oder Ring sind nur noch %s Unterschriften übrig. Du musst dein gesamtes Guthaben abheben.
Geringe Anzahl von Unterschriften
diff --git a/core/res/src/main/res/values-es/strings.xml b/core/res/src/main/res/values-es/strings.xml
index c8f0b34c4c..683983950c 100644
--- a/core/res/src/main/res/values-es/strings.xml
+++ b/core/res/src/main/res/values-es/strings.xml
@@ -2,10 +2,16 @@
¿No encuentra el token en su billetera? Consulte los mercados para encontrarlo y añadirlo a la compra
¿No encuentra el token en su billetera? Consulte los mercados para encontrarlo y añadirlo a la venta
+ Vender
+ Esto puede tardar unos segundos. Inténtelo de nuevo más tarde.
+ Los datos aún no se han cargado.
+ La acción no está disponible actualmente. Inténtalo de nuevo más tarde o actualiza los datos deslizando el dedo hacia abajo en la pantalla.
Elige el token
¿No encuentras el token en tu billetera? Consulte los mercados para encontrarlo y agregarlo al intercambio
No hay tokens disponibles para intercambiar con el token seleccionado. Por favor elige otro.
No hay par disponible
+ Seleccione el token que desea recibir
+ Seleccione el token que desea intercambiar
Elige red
Agregue un token personalizado
Gestionar tokens
@@ -124,7 +130,7 @@
Mercado
Lento
Velocidad y tarifa
- Obtener direcciones
+ Sincronizar direcciones
Ir al proveedor
Ir al token
hora
@@ -173,7 +179,7 @@
Enviar
Con éxito
Soporte
- Intercambiar
+ Swap
términos y condiciones
Condiciones de uso
Hoy
@@ -249,6 +255,7 @@
Tangem ofrece swaps de tokens a través de proveedores externos según los términos de cada proveedor
Elige un proveedor
Ha ocurrido un error. Código: %s
+ Error %1$s. El proveedor seleccionado no puede procesar la transacción especificada. Por favor, redondee el valor a %2$s o cámbielo
El proveedor seleccionado no está disponible actualmente. Inténtelo de nuevo más tarde. (Código: %s)
Los cambios no están disponibles en este momento. Inténtelo de nuevo más tarde. (Código: %s)
Cantidad estimada
@@ -304,6 +311,7 @@
Por favor, díganos qué tarjeta tiene
Hola equipo de soporte,
Por favor, cuéntenos más sobre tu problema. Cada pequeño detalle puede ayudar.
+ Billetera previamente activada
Mis recomendaciones
No se puede escanear una tarjeta
Comentarios
@@ -563,21 +571,25 @@
Restaurar código de acceso
Tarjetas idénticas
Código de acceso
+ Disponible con %s
Buscar por país
Indisponible
Buscar por moneda
+ Al utilizar la funcionalidad onramp, acepta %1$s y %2$s del proveedor.
El monto de la compra no debe ser mayor a %s
La cantidad a comprar debe ser como mínimo %s
No hay proveedores disponibles para esta moneda
Pagar con
+ Disponible hasta %s
+ Disponible desde %s
Podrá completar su transacción en el proveedor externo, %s
Redirigiendo a %s...
Nuestros servicios no están disponibles en este país
- Cámbielo o confírmelo
Su residencia ha sido identificada como
Residencia
Seleccione el país correcto para garantizar opciones de pago y servicios precisos.
Ajustes
+ Puede comprobar el estado de la transacción desde la página del token.
Puede comprobar el estado de la transacción desde la página del token
Vía
Agrupar
@@ -588,7 +600,9 @@
Ajustes
No ha dado acceso a su cámara
Acceso a la cámara denegado
+ No se requiere nota
%1$s (%2$s) en la red %3$s
+ El envío de cualquier otra moneda supondrá una pérdida irreversible.
Envíe solo %s a esta dirección. Enviar cualquier otra moneda resultará en su pérdida irreversible.
Transfiera fondos desde otra billetera o intercambio
Participar
@@ -641,6 +655,11 @@
Escanee su tarjeta
Escanee la tarjeta para cambiar sus ajustes. Los cambios afectarán solo a la tarjeta que has escaneado y no afectarán a otras tarjetas vinculadas a su billetera.
¡Prepare su tarjeta!
+ Alerta de seguridad
+ No tiene fondos suficientes en su saldo para vender esta criptomoneda. Deposite el activo deseado para continuar.
+ Saldo insuficiente
+ La venta de criptomonedas no está disponible en su región en este momento. Estamos trabajando activamente para ofrecerle esta opción pronto. ¡Manténgase conectado!
+ Restricción Regional
Ya incluido en la dirección ingresada
El monto de la comisión es %s veces el monto recomendado. Asegúrese de que la configuración personalizada sea correcta.
Ha especificado una comisión inferior a la cantidad recomendada, lo que podría provocar un retraso en su transacción. ¿Continuar?
@@ -681,6 +700,7 @@
Los aranceles aduaneros son altos
Debido a las peculiaridades de la red %1$s, la tarifa por transferir el saldo completo es más alta. Para reducir la comisión, puedes dejar %2$s.
La tarifa es más alta
+ Su saldo no puede ser inferior al monto del alquiler. Mantenga al menos %1$s en su cuenta o retire todos los fondos.
La comisión incluida excede el monto de la transferencia, lo que resulta en un valor negativo
Cantidad no válida
La cantidad mínima de envío es %1$s. Asegúrate de que el saldo restante después del envío no sea menor que %2$s.
@@ -853,6 +873,7 @@
Usted recibe
Elige token
no disponible
+ Esta es mi billetera
Saldos ocultos
Saldos mostrados
Cancelar
@@ -882,6 +903,7 @@
No disponible para compra
No disponible para vender
No disponible para cambio desde %s
+ No disponible para intercambio
contacto: %s
Aún no tiene ninguna transacción
Error al cargar el historial de transacciones.\nHaga clic en el botón de recarga para actualizar la información.
@@ -921,6 +943,7 @@
Desbloquear todo con %s
La blockchain está Inaccesible. Inténtelo más tarde
Escanee la tarjeta o el anillo
+ Esta billetera ya ha sido activada anteriormente.\nSi no fue usted quien lo hizo, comuníquese con el servicio de asistencia.\nTangem nunca vende billeteras junto con el código de acceso generado previamente.
Solicitud para firmar un mensaje.\n\n%s
Dapp %1$s, solicitando\nfirmar transacción BNB.\n\n%2$s
Orden de intercambio por %1$s\nPrecio: %2$s\nCantidad a recibir: %3$s\nCantidad a pagar: %4$s
@@ -1002,12 +1025,12 @@
Esta tarjeta podría ser una muestra de producción o una falsificación
La verificación de autenticidad falló
Asociar
- Este token debe estar asociado a tu cuenta de Hedera antes de que pueda recibirlo. Tarifa de asociación ~%1$s %2$s
+ Este token debe estar asociado a tu cuenta de Hedera antes de que pueda recibirlo. Tarifa de asociación ~%1$s %2$s
Este token debe estar asociado con su cuenta de Hedera antes de poder recibirlo.
Asocie su token
No hay suficiente %s. Recargue su cuenta de Hedera para asociar este token
¿Está seguro(a) de que desea cancelar la transacción? No podrá volver a intentar realizarla.
- Su transacción con un importe de %1$s %2$s no se ha completado. Puede volver a intentarlo para completarla.
+ Su transacción con un importe de %1$s %2$s no se ha completado. Puede volver a intentarlo para completarla.
Tiene una transacción sin terminar
Solo quedan %s firmas en esta tarjeta. Deba retirar todos sus fondos.
Recuento de firmas bajo
diff --git a/core/res/src/main/res/values-fr/strings.xml b/core/res/src/main/res/values-fr/strings.xml
index 646463f8cc..55d428f3d3 100644
--- a/core/res/src/main/res/values-fr/strings.xml
+++ b/core/res/src/main/res/values-fr/strings.xml
@@ -2,10 +2,21 @@
Jeton non trouvé dans votre portefeuille ? Consultez les marchés pour le trouver et l\'ajouter à l\'achat
Jeton non trouvé dans votre portefeuille ? Consultez les marchés pour le trouver et l\'ajouter à la vente
+ Vendre
+ Cela peut prendre quelques secondes. Veuillez réessayer plus tard.
+ Les données n\'ont pas encore été chargées.
+ Cette action n\'est pas disponible actuellement. Veuillez réessayer plus tard ou actualiser les données en faisant glisser votre doigt vers le bas sur l\'écran.
+ Le bouton n\'est pas disponible
Choisissez le jeton
Jeton non trouvé dans votre portefeuille ? Consultez les marchés pour le trouver et l\'ajouter à l\'échange
Il n\'y a pas de token disponible pour échanger avec le token sélectionné. Veuillez en choisir un autre.
Aucune paire disponible
+ Pour utiliser la fonction d\'échange, votre portefeuille doit contenir au moins 2 jetons.
+ Ajouter des jetons
+ Vous n\'avez qu\'un seul token ajouté à votre portefeuille. Pour utiliser la fonction d\'échange, vous devez ajouter au moins 2 tokens.
+ Ajouter des jetons
+ Sélectionnez le jeton que vous souhaitez recevoir
+ Sélectionnez le jeton que vous souhaitez échanger
Choisissez le réseau
Ajouter un jeton personnalisé
Gérer les jetons
@@ -124,7 +135,7 @@
Marché
Lent
Vitesse et frais
- Obtenir des adresses
+ Synchroniser les adresses
Aller au fournisseur
Aller au jeton
heure
@@ -247,8 +258,9 @@
Fourni par
Statut
Tangem propose des échanges de jetons via des fournisseurs tiers selon les conditions de chaque fournisseur
- Choisissez un fournisseur
+ Fournisseur
Une erreur s\'est produite. Code : %s
+ Erreur %1$s. Le fournisseur sélectionné ne peut pas traiter la transaction spécifiée. Veuillez arrondir la valeur à %2$s ou la modifier
Le fournisseur sélectionné n\'est pas disponible pour le moment. Veuillez réessayer plus tard. (Code : %s)
Les échanges ne sont pas disponibles pour le moment. Veuillez réessayer plus tard. (Code : %s)
Montant estimé
@@ -259,6 +271,9 @@
Le montant a été remboursé en %1$s (réseau %2$s)
Visitez le site Web du fournisseur pour la vérification
Vérification KYC requise par le fournisseur
+ Acheté
+ Achat
+ En cours d\'achat
Annulé
Confirmé
En attente de confirmation
@@ -304,6 +319,7 @@
Veuillez nous dire quelle carte vous avez
Chère équipe de support,
Veuillez nous en dire plus sur votre problème. Chaque petit détail peut nous aider.
+ Portefeuille précédemment activé
Mes suggestions
Impossible de scanner une carte
Commentaires
@@ -563,21 +579,25 @@
Restauration du code d\'accès
Cartes identiques
Code d\'accès
+ Disponible avec %s
Recherche par pays
Indisponible
Recherche par devise
+ En utilisant la fonctionnalité onramp, vous acceptez %1$s et %2$s du fournisseur
Le montant de l\'achat ne doit pas dépasser %s
Le montant à acheter doit être au moins %s
Aucun fournisseur disponible pour cette devise
Payer avec
+ Disponible jusqu\'à %s
+ Disponible à partir de %s
Vous pourrez finaliser votre transaction sur le fournisseur tiers, %s
Redirection vers %s...
Nos services ne sont pas disponibles dans ce pays
- Modifiez-le ou confirmez-le
Votre résidence a été identifiée comme
Résidence
Veuillez sélectionner le bon pays pour garantir des options de paiement et des services précis.
Paramètres
+ Vous pouvez vérifier l\'état de la transaction à partir de la page du jeton.
Vous pouvez vérifier l\'état de la transaction à partir de la page du jeton
Via
Grouper
@@ -588,8 +608,11 @@
Paramètres
Vous n\'avez pas donné accès à votre caméra
Accès à la caméra refusé
+ Aucun mémo requis
%1$s (%2$s) sur le réseau %3$s
+ L’envoi de toute autre devise entraînera sa perte irréversible.
Envoyez uniquement %s à cette adresse. L\'envoi de toute autre devise entraînera sa perte irréversible.
+ Envoyez uniquement %1$s sur le réseau %2$s
Transférez des fonds depuis un autre portefeuille ou une autre bourse
Participer
Échec du chargement des informations sur le programme de parrainage. Veuillez réessayer plus tard.
@@ -641,6 +664,11 @@
Scannez votre carte
Scannez la carte pour modifier ses paramètres. Les modifications n\'affecteront que la carte que vous avez scannée et n\'affecteront pas les autres cartes liées à votre portefeuille.
Préparez votre carte !
+ Alerte de sécurité
+ Vous n\'avez pas assez de fonds sur votre solde pour vendre cette cryptomonnaie. Veuillez déposer l\'actif souhaité pour continuer.
+ Solde insuffisant
+ La vente de cryptomonnaies n\'est pas disponible dans votre région pour le moment. Nous travaillons activement pour vous proposer cette option prochainement. Restez connecté !
+ Restriction Régionale
Déjà inclus dans l\'adresse saisie
Le montant de la commission est %s fois le montant recommandé. Assurez-vous que les paramètres personnalisés sont corrects.
Vous avez spécifié une commission inférieure au montant recommandé, ce qui pourrait entraîner un retard dans votre transaction. Continuer?
@@ -681,6 +709,7 @@
Les frais de douane sont élevés
En raison des particularités du réseau %1$s, les frais de transfert de la totalité du solde sont plus élevés. Pour réduire la commission, vous pouvez en laisser %2$s.
Les frais sont plus élevés
+ Le solde de votre compte ne peut pas être inférieur au montant du loyer. Veuillez conserver au moins %1$s sur votre compte ou retirer tous les fonds.
La commission incluse dépasse le montant du transfert, ce qui entraîne une valeur négative
Montant invalide
Le montant minimum d\'envoi est de %1$s. Veuillez vous assurer que le solde restant après l\'envoi ne sera pas inférieur à %2$s.
@@ -853,6 +882,7 @@
Vous recevez
Choisir le jeton
non disponible
+ C\'est mon portefeuille
Soldes masqués
Soldes affichés
Annuler
@@ -882,6 +912,7 @@
Non disponible à l\'achat
Indisponible à la vente
Non disponible pour l\'échange de %s
+ Indisponible pour un échange
contrat : %s
Vous n\'avez pas encore de transactions
Échec du chargement de l\'historique des transactions.\nCliquez sur le bouton de rechargement pour mettre à jour les informations.
@@ -921,6 +952,7 @@
Tout déverrouiller avec %s
La blockchain n\'est pas accessible. Réessayez plus tard
Scanner la carte ou la bague
+ Ce portefeuille a déjà été activé auparavant.\nSi cela n\'a pas été fait par vous, veuillez contacter le support.\nTangem ne vend jamais de portefeuilles avec le code d\'accès pré-généré.
Demande de signature d\'un message.\n\n%s
Dapp %1$s, demandant de\nsigner la transaction BNB.\n\n%2$s
Ordre de trade pour %1$s\nPrix : %2$s\nMontant à recevoir : %3$s\nMontant à payer : %4$s
@@ -1002,12 +1034,12 @@
Cette carte pourrait être un échantillon de production ou une contrefaçon
Échec de la vérification d\'authenticité
Associer
- Ce jeton doit être associé à votre compte Hedera avant que vous puissiez le recevoir. Frais d\'association ~%1$s %2$s
+ Ce jeton doit être associé à votre compte Hedera avant que vous puissiez le recevoir. Frais d\'association ~%1$s %2$s
Ce jeton doit être associé à votre compte Hedera avant que vous puissiez le recevoir
Associez votre jeton
%s insuffisant. Renflouez votre compte Hedera pour associer ce jeton
Êtes-vous sûr(e) de vouloir annuler la transaction ? Vous ne pourrez plus réessayer.
- Votre transaction d\'un montant de %1$s %2$s n\'a pas été finalisée. Vous pouvez réessayer plus tard pour la finaliser.
+ Votre transaction d\'un montant de %1$s %2$s n\'a pas été finalisée. Vous pouvez réessayer plus tard pour la finaliser.
Vous avez une transaction inachevée
Il ne reste que %s signatures sur cette carte. Vous devez retirer tous vos fonds.
Faible nombre de signatures
diff --git a/core/res/src/main/res/values-ja/strings.xml b/core/res/src/main/res/values-ja/strings.xml
index 12b087d798..bd018bcf92 100644
--- a/core/res/src/main/res/values-ja/strings.xml
+++ b/core/res/src/main/res/values-ja/strings.xml
@@ -1,11 +1,22 @@
- ポートフォリオにトークンが見つかりませんか？マーケットから見つけ、買付のために追加してください
- ポートフォリオにトークンが見つかりませんか？マーケットから見つけ、売却のために追加してください
+ トークンが見つかりませんか？メインページのマーケットセクションに移動し、ポートフォリオに追加して買付できるようにします。
+ トークンが見つかりませんか？メインページのマーケットセクションに移動し、ポートフォリオに追加して売却できるようにします。
+ 売却
+ これには数秒かかる場合があります。しばらくしてからもう一度お試しください。
+ データはまだ読み込まれていません。
+ この操作は現在利用できません。しばらくしてからもう一度お試しいただくか、画面を下にスワイプしてデータを更新してください。
+ ボタンは使用できません
トークンを選択
- ポートフォリオにトークンが見つかりませんか？マーケットから見つけ、スワップのために追加してください
+ トークンが見つかりませんか？メインページのマーケットセクションに移動し、ポートフォリオに追加してスワップできるようにします。
選択したトークンと交換できるトークンがありません。別のトークンを選択してください。
利用可能なペアがありません
+ 交換機能を使用するには、ポートフォリオに少なくとも2つのトークンが含まれている必要があります。
+ トークンの追加
+ ポートフォリオに追加されているトークンは1つだけです。交換機能を使用するには、少なくとも2つのトークンを追加する必要があります。
+ トークンの追加
+ 受け取りたいトークンを選択します
+ スワップしたいトークンを選択します
ネットワークを選択
カスタムトークンの追加
トークンの管理
@@ -244,8 +255,9 @@
提供元
ステータス
Tangemは、各プロバイダーの条件に従って、サードパーティプロバイダーを介してトークンスワップを提供します。
- プロバイダーを選択
+ プロバイダー
エラーが発生しました。コード: %s
+ エラー%1$s 。選択したプロバイダーは指定された取引を処理できません。値を%2$sに切り上げるか、変更してください。
選択したプロバイダーは現在利用できません。しばらくしてからもう一度お試しください。(コード: %s )
現在、交換はご利用いただけません。しばらくしてからもう一度お試しください。(コード: %s )
推定金額
@@ -256,6 +268,9 @@
金額は %1$s（%2$sネットワーク）で返金されました
確認するには、プロバイダーのウェブサイトにアクセスしてください。
プロバイダーによる本人確認手続きが必要です。
+ 買付完了
+ 買付中
+ 買付中...
キャンセルされました
確認済み
確認中
@@ -301,6 +316,7 @@
お持ちのカードまたはリングについて教えてください
サポートチームの皆さん、こんにちは。
問題について詳しく教えてください。どんな些細なことでも役に立ちます。
+ 以前に有効化されたウォレット
私の提案
カード / リングをスキャンできません
フィードバック
@@ -555,23 +571,27 @@
アクセスコードの復元
同一のカード
アクセスコード
- プロバイダーは取引を促進し、スムーズで効率的なトークン交換を保証します
+ %sで利用可能
+ Tangemでの暗号通貨の買付は、サードパーティプロバイダーの条件に基づいて行われます。
国で検索
利用不可
通貨で検索
+ オンランプ機能を使用することにより、プロバイダの%1$sおよび%2$sに同意するものとします
買付金額は%s以下にしてください
買付金額は少なくとも%sである必要があります
この通貨で利用可能なプロバイダーはありません
支払う
+ 最大 %s まで使用可能
+ %s 以上で利用可能
サードパーティプロバイダー%sで取引を完了できます。
%sにリダイレクトしています...
この国では当社のサービスはご利用いただけません
- 変更または確認
あなたの住居は次のように識別されています
住居
正確なお支払い方法とサービスを確保するため、正しい国を選択してください。
設定
- トークンページから取引状況を確認できます
+ この画面を閉じて、トークンの詳細画面で取引状況を確認できます。
+ この画面を閉じて、トークンの詳細画面で取引状況を確認できます。
経由
グループ
残高順
@@ -585,7 +605,7 @@
%3$sネットワーク上の%1$s ( %2$s )
他の暗号資産を送信すると、取り返しのつかない損失が発生します。
このアドレスには%sのみを送金してください。他のトークンを送信すると、取り返しのつかない損失が発生します。
- このアドレスには%sのみを送信してください。
+ %2$sネットワークの%1$sのみを送信してください
ウォレットや取引所から資金を送金する
参加する
紹介プログラムに関する情報を読み込めませんでした。しばらくしてからもう一度お試しください。
@@ -635,6 +655,11 @@
カードまたはリングをスキャン
カードまたはリングをスキャンして設定を変更します。変更はスキャンしたカードまたはリングにのみ影響し、ウォレットに関連付けられている他のデバイスには影響しません。
Tangemを準備してください！
+ セキュリティ警告
+ 暗号通貨を売却するための十分な資金が残高にありません。続行するには希望の資産を入金してください。
+ 残高不足
+ 現在、お住まいの地域では暗号資産の売却はご利用いただけません。このオプションをすぐにご利用いただけるよう積極的に取り組んでいますので、お楽しみに！
+ 地域制限
入力したアドレスにすでに含まれています
手数料額が推奨額の%s倍となっています。設定を再度確認し、調整してください。
推奨手数料を下回る手数料が指定されたため、取引に遅れが生じる可能性があります。続行しますか？
@@ -675,6 +700,7 @@
カスタム手数料が高くなっています
%1$sネットワークの特殊性により、残高全体を転送する場合の手数料は高くなります。手数料を削減するには、 %2$sを残します。
手数料が高くなっています
+ 口座残高はレンタル料金より低くすることはできません。残高を少なくとも%1$sに維持するか、すべての資金を引き出してください。
手数料が送金金額を超えており、マイナスの値になってしまいます。
無効な金額
最低送金金額は%1$sです。送金後の残高が%2$s未満にならないようにしてください。
@@ -847,6 +873,7 @@
受け取る
トークンを選択
利用不可
+ これは私のウォレットです
残高非表示
残高表示
元に戻す
@@ -876,6 +903,7 @@
買付できません
売却できません
%sからのスワップは利用できません
+ スワップはできません
コントラクト: %s
まだ取引はありません
取引履歴の読み込みに失敗しました。\n情報を更新するには、リロードボタンをクリックしてください。
@@ -915,6 +943,7 @@
%sですべてをロック解除
ブロックチェーンにアクセスできません。後でもう一度お試しください。
カードまたはリングをスキャン
+ このウォレットはすでに有効化されています。\nあなたが行ったのでない場合は、サポートに連絡してください。\nTangemは、事前に生成されたアクセスコードと一緒にウォレットを販売することはありません。
メッセージに署名することを要求しています。 \n\n %s
Dapp%1$s 、BNB取引の署名を要求しています\n\n%2$s
%1$sの取引注文\n価格: %2$s\n受取金額: %3$s\n支払金額: %4$s
@@ -996,12 +1025,12 @@
このカードは、サンプル品または偽造品である可能性があります
真正性チェックに失敗しました
関連付ける
- このトークンを受け取るには、Hederaアカウントに関連付ける必要があります。関連付け手数料 ~ %1$s %2$s
+ このトークンを受け取るには、Hederaアカウントに関連付ける必要があります。関連付け手数料 ~ %1$s %2$s
このトークンを受け取るには、Hederaアカウントに関連付ける必要があります。
トークンを関連付ける
%sが不足しています。このトークンを関連付けるには、Hederaアカウントに資金を追加してください。
取引をキャンセルしてもよろしいですか? 取引を再試行することはできません
- %1$s %2$sの取引が完了しませんでした。もう一度試して完了してください。
+ %1$s %2$sの取引が完了しませんでした。もう一度試して完了してください。
未完了の取引があります
このカードには%sの署名のみが残っています。資金をすべて引き出す必要があります。
署名数が少ないです
diff --git a/core/res/src/main/res/values-ru/strings.xml b/core/res/src/main/res/values-ru/strings.xml
index 5077d67084..92629c43f6 100644
--- a/core/res/src/main/res/values-ru/strings.xml
+++ b/core/res/src/main/res/values-ru/strings.xml
@@ -1,8 +1,22 @@
+ Не нашли свой токен? Перейдите в раздел «Рынок» на главной странице и добавьте его в свой портфель для покупки.
+ Не нашли свой токен? Перейдите в раздел «Рынок» на главной странице и добавьте его в свой портфель для продажи.
+ Продать
+ Это может занять несколько секунд. Пожалуйста, попробуйте позже.
+ Данные ещё не загрузились
+ Это действие в данный момент недоступно, пожалуйста попробуйте позже или обновите данные, сделав свайп экрана вниз.
+ Кнопка недоступна
Выберите токен
- Нет доступных токенов для обмена с выбранным токеном, пожалуйста, выберите другой.
+ Не нашли свой токен? Перейдите в раздел «Рынок» на главной странице и добавьте его в свой портфель для обмена.
+ Нет доступных вариантов для обмена с выбранным токеном, пожалуйста, выберите другой.
Нет доступных пар
+ Для использования функции обмена ваш портфель должен содержать минимум 2 токена.
+ Добавьте токены
+ У вас добавлен всего 1 токен. Для использования функции обмена необходимо добавить минимум 2 токена.
+ Добавьте токены
+ Выберите токен для получения
+ Выберите токен для обмена
Выберите сеть
Добавить токен
Валюты
@@ -176,7 +190,7 @@
Отправить
Успешно
Поддержка
- Обмен
+ Обменять
условия участия
Условиями использования
Сегодня
@@ -250,8 +264,9 @@
Предоставлено
Статус
Tangem предоставляет доступ к обмену через сторонних поставщиков в соответствии с их правилами
- Выберите провайдера
+ Провайдер
Произошла ошибка. Код: %s
+ Ошибка %1$s. Выбранный провайдер не может обработать указанную транзакцию. Округлите значение до %2$s или измените его.
Выбранный провайдер недоступен для обмена. Попробуйте позже. (Код: %s)
В данный момент обмен невозможен. Попробуйте позже. (Код: %s)
Курс обмена
@@ -262,6 +277,9 @@
Сумма была возвращена в %1$s (%2$s сети)
Посетите сайт провайдера для проверки
Провайдер запрашивает прохождение верификации
+ Куплено
+ Покупка
+ Покупка...
Отменен
Подтверждено
Подтверждение
@@ -295,6 +313,7 @@
Недоступно для этой пары
Требуется разрешение
Рекомендовано
+ Куплено %s
Покупка %s
Покупка %s...
Токены не найдены. Пожалуйста, попробуйте другой запрос
@@ -306,6 +325,7 @@
Скажите, пожалуйста, какая у вас карта или кольцо?
Привет, команда поддержки,
Пожалуйста, расскажите нам больше о вашей проблеме. Каждая маленькая деталь может помочь.
+ Ранее активированный кошелек
Мои предложения
Не могу отсканировать карту/кольцо
Обращение в поддержку
@@ -573,17 +593,27 @@
Восстановление кода доступа
Идентичные карты
Код доступа
+ Доступно с %s
+ Tangem предоставляет доступ к покупке через сторонних провайдеров в соответствии с их правилами
Поиск по стране
Недоступно
Поиск по валюте
+ Пользуясь сервисом покупки, вы соглашаетесь с %1$s и %2$s
Сумма покупки не может быть больше, чем %s
Сумма покупки должна составлять минимум %s
- Для данной валюты нет доступных провайдеров
+ Нет доступных провайдеров для выбранной валюты
Оплата с
- Вы сможете завершить транзакцию через сервис стороннего провайдера, %s
+ Доступно до %s
+ Доступно от %s
+ Вы сможете продолжить транзакцию через сервис стороннего провайдера, %s
Переход к %s...
Наши сервисы недоступны в данной стране
+ Ваше место жительства определено как
+ Страна проживания
+ Пожалуйста, укажите правильную страну, чтобы обеспечить точность доступных способов оплаты и услуг.
Настройки
+ You can close this screen and check the transaction status on the token details screen.
+ Вы можете закрыть этот экран и проверить статус транзакции на экране информации о токене.
Через
Группы
По балансу
@@ -593,8 +623,11 @@
Настройки
Вы не предоставили доступ к вашей камере
Доступ к камере запрещен
+ Memo не требуется
%1$s (%2$s) в сети %3$s
+ Использование другой сети может привести к утрате средств.
Отправляйте только %s на этот адрес. Использование другой сети может привести к утрате средств.
+ Отправляйте только %1$s в сети %2$s
Переводите средства с любого кошелька или биржи
Участвовать
Не удалось загрузить информацию по реферальной программе. Пожалуйста, попробуйте позже.
@@ -651,6 +684,10 @@
Отсканируйте карту или кольцо, чтобы изменить ее настройки. Изменения затронут только ту карту или кольцо, которые вы отсканировали, и не повлияют на другие устройства, привязанные к вашему кошельку.
Приготовьте свой Tangem!
Уведомление безопасности
+ На вашем балансе недостаточно средств для продажи криптовалюты. Пожалуйста, пополните нужный актив, чтобы продолжить.
+ Недостаточно средств
+ Продажа криптовалюты в вашем регионе временно недоступна. Мы активно работаем над тем, чтобы добавить эту возможность. Следите за нашими новостями!
+ Региональные ограничения
Уже содержится во введенном адресе
Сумма комиссии в %s раз превышает рекомендованную. Убедитесь, что указанная комиссия верна.
Вы указали комиссию ниже рекомендуемой, это может привести к задержке исполнения вашей транзакции. Продолжить?
@@ -691,6 +728,7 @@
Установлена высокая комиссия
Ввиду особенности сети %1$s комиссия при переводе всего баланса выше. Для того, чтобы снизить комиссию Вы можете оставить %2$s.
Комиссия повышена
+ Баланс вашего счета не может быть ниже арендной платы. Пожалуйста, оставьте на счете не менее %1$s или выведите все средства.
Включенная комиссия превышает сумму перевода, что приводит к отрицательному значению
Недопустимая сумма
Минимальная сумма отправки - %1$s. Пожалуйста, убедитесь, что остаток после отправки также не будет меньше %2$s.
@@ -892,6 +930,7 @@
Недоступно для покупки
Недоступно для продажи
Недоступно для обмена с %s
+ Недоступно для обмена
контракт: %s
У вас еще нет транзакций
Не удалось загрузить историю транзакций.\nНажмите на кнопку перезагрузки, чтобы обновить информацию.
@@ -970,7 +1009,7 @@
Адрес скопирован в буфер обмена
Нет соединения с интернетом
Получить с 10%% скидкой
- Получите доступ к более чем 13 000 криптовалют. Покупайте, продавайте, обменяйте и стейкайте в один клик. Свяжите до трех карт для резервного копирования.
+ Получите доступ к более чем 13 000 криптовалют. Покупайте, продавайте, обменивайте и стейкайте в один клик. Свяжите до трех карт для резервного копирования.
Откройте Tangem Wallet
Настройки кошелька
Tangem
@@ -1013,12 +1052,12 @@
Возможно, данная карта является образцом или подделкой
Ошибка проверки подлинности
Ассоциировать
- Этот токен должен быть ассоциирован с вашей учетной записью Hedera, прежде чем вы сможете его принять. Стоимость ассоциации ~%1$s %2$s
+ Этот токен должен быть ассоциирован с вашей учетной записью Hedera, прежде чем вы сможете его принять. Стоимость ассоциации ~%1$s %2$s
Этот токен должен быть ассоциирован с вашей учетной записью Hedera, прежде чем вы сможете его принять
Ассоциируете свой токен
Недостаточно %s. Пополните ваш аккаунт Hedera для ассоциации этого токена
Вы уверены что хотите отменить эту транзакцию? Вы не сможете отправить ее еще раз
- Ваша транзакция %1$s %2$s не была завершена. Вы можете попробовать отправить ее еще раз.
+ Ваша транзакция %1$s %2$s не была завершена. Вы можете попробовать отправить ее еще раз.
У вас есть незавершенная транзакция
На этой карте осталось всего %s подписей. Вам следует вывести все ваши средства.
Малое количество подписей
diff --git a/core/res/src/main/res/values-uk-rUA/strings.xml b/core/res/src/main/res/values-uk-rUA/strings.xml
index 542adfe9cc..7a2ba44136 100644
--- a/core/res/src/main/res/values-uk-rUA/strings.xml
+++ b/core/res/src/main/res/values-uk-rUA/strings.xml
@@ -2,10 +2,20 @@
Токен не знайдено у вашому портфелі? Перевірте Ринки, щоб знайти та додати його для покупки
Токен не знайдено у вашому портфелі? Перевірте Ринки, щоб знайти та додати його для продажу
+ Продати
+ Це може зайняти кілька секунд. Будь ласка, спробуйте пізніше.
+ Дані ще не завантажилися
+ Наразі ця дія недоступна, будь ласка спробуйте пізніше або оновіть дані, зробивши свайп екрану до низу.
+ Кнопка недоступна
Оберіть токен
Токен не знайдено у вашому портфелі? Перевірте ринки, щоб знайти та додати його для обміну
Немає доступних токенів для обміну з обраним токеном. Будь ласка, оберіть інший.
Немає вільної пари
+ Щоб скористатися функцією обміну, у вашому портфелі має бути щонайменше 2 токени.
+ У вас додано лише 1 токен. Щоб скористатися функцією обміну, потрібно додати мінімум 2 токени.
+ Додайте токени
+ Оберіть токен для отримання
+ Оберіть токен для обміну
Оберіть мережу
Додати токен
Токени
@@ -130,7 +140,7 @@
За ринком
Повільно
Швидкість та комісія
- Отримати ваші адреси
+ Синхронізувати адреси
Перейти до провайдера
Перейти до токену
година
@@ -253,8 +263,9 @@
Послугу надає
Статус
Tangem пропонує обмін токенів через сторонніх провайдерів відповідно до умов кожного провайдера
- Оберіть провайдера
+ Провайдер
Виникла помилка. Код: %s
+ Помилка %1$s. Обраний провайдер не може обробити зазначену транзакцію. Округліть значення до %2$s або змініть його.
Наразі обраний провайдер недоступний для обміну. Спробуй пізніше. (Код: %s)
Наразі обмін неможливий. Спробуй пізніше. (Код: %s)
Курс обміну
@@ -265,6 +276,9 @@
Сума була повернута в %1$s (%2$s мережі)
Відвідайте сайт провайдера для перевірки
Провайдер вимагає проходження KYC верифікації
+ Куплено
+ Купівля
+ Купівля...
Скасовано
Підтверджено
Підтвердження
@@ -579,6 +593,8 @@
Відновлення коду доступу
Ідентичні картки
Код доступу
+ Доступно з %s
+ Tangem забезпечує доступ к покупці через сторонніх провайдерів згідно з їхніми умовами
Пошук за країною
Недоступно
Пошук по валюті
@@ -586,13 +602,16 @@
Сума покупки повинна бути не менше %s
Для данної валюти немає доступних провайдерів
Оплата з
+ Доступно до %s
+ Доступно від %s
Ви зможете завершити транзакцію у стороннього постачальника, %s
Перенаправлення на %s...
Наші сервіси недоступні в цій країні
- Змінити або підтвердити
Ваше місце проживання визначено як
+ Країна проживання
Будь ласка, виберіть правильну країну, щоб забезпечити точні способи оплати та послуги.
Параметри
+ Ви можете закрити цей екран і перевірити статус транзакції на екрані деталей токена.
Ви можете перевірити статус транзакції на сторінці токена
Через
Групами
@@ -603,8 +622,11 @@
Налаштування
Ви не надали доступ до своєї камери
Доступ до камери заборонено
+ Memo не вимагається
%1$s (%2$s) у мережі %3$s
+ Використання іншої мережі може призвести до втрати коштів.
Надсилайте лише %s на цю адресу. Надсилання будь-якої іншої валюти призведе до її незворотної втрати.
+ Надсилайте лише %1$s у мережі %2$s
Переказуйте кошти з будь-якого гаманця або біржі
Взяти участь
Не вдалося завантажити інформацію по реферальній програмі. Будь ласка, спробуйте пізніше.
@@ -660,6 +682,11 @@
Сканувати
Відскануйте картку або кільце, щоб змінити її налаштування. Зміни торкнуться лише тої картки або кільця, які ви відсканували, і не вплинуть на інші пристрої, прив\'язані до вашого гаманця.
Підготуйте свій Tangem!
+ Оповіщення безпеки
+ На вашому балансі недостатньо коштів для продажу криптовалюти. Будь ласка, внесіть бажаний актив, щоб продовжити.
+ Недостатній баланс
+ Продаж криптовалюти у вашому регіоні тимчасово недоступний. Ми активно працюємо над тим, щоб додати цю можливість. Слідкуйте за нашими новинами!
+ Регіональні обмеження
Вже включено до введеної адреси
Сума комісії у %s разів перевищує рекомендовану. Переконайтеся, що вказана комісія вірна.
Ви вказали комісію нижче рекомендованої, це може спричинити затримку вашої транзакції. Продовжити?
@@ -700,6 +727,7 @@
Встановлена комісія завелика
Через особливості мережі %1$s комісія за переказ всього балансу вища. Щоб зменшити комісію, Ви можете залишити %2$s.
Підвищена комісія
+ Баланс вашого рахунку не може бути меншим за орендну плату. Будь ласка, залиште на рахунку не менше %1$s або виведіть всі кошти.
Включена комісія перевищує суму переказу, що призводить до від’ємного значення
Недопустима сума
Мінімальна сума переказу - %1$s. Будь ласка, переконайтеся, що залишок після переказу не буде меншим ніж %2$s.
@@ -872,6 +900,7 @@
Ви отримаєте
Оберіть токен
недоступно
+ Це мій гаманець
Баланси приховано
Баланси показано
Скасувати
@@ -901,6 +930,7 @@
Недоступно для покупки
Недоступно для продажу
Недоступно для обміну з %s
+ Недоступно для обміну
контракт: %s
У вас ще немає транзакцій
Не вдалося завантажити історію транзакцій.\nНатисніть кнопку нижче, щоб оновити інформацію
@@ -940,6 +970,7 @@
Розблокувати все з %s
Блокчейн недоступний. Спробуйте пізніше
Відскануйте картку або кільце
+ Цей гаманець вже був активований раніше.\nЯкщо це було зроблено не вами, зверніться до служби підтримки.\nTangem ніколи не продає гаманці разом з попередньо згенерованим кодом доступу.
Запит на підпис повідомлення.\n\n%s
Dapp %1$s, запит на\nпідпис транзакції BNB.\n\n%2$s
Торговий ордер на %1$s\nЦіна: %2$s\nСума до отримання: %3$s\nСума до сплати: %4$s
@@ -1021,12 +1052,12 @@
Ця картка може бути виробничим зразком або підробкою
Перевірка автентичності не вдалася
Асоціювати
- Цей токен повинен бути асоційований з вашим обліковим записом Hedera, перш ніж ви зможете його прийняти. Вартість асоціації ~ %1$s %2$s
+ Цей токен повинен бути асоційований з вашим обліковим записом Hedera, перш ніж ви зможете його прийняти. Вартість асоціації ~ %1$s %2$s
Цей токен повинен бути асоційований з вашим обліковим записом Hedera, перш ніж ви зможете його прийняти
Асоціюйте свій токен
Недостатньо %s. Поповніть ваш обліковий запис Hedera для асоціації цього токена
Ви впевнені, що хочете скасувати цю транзакцію? Ви не зможете відправити її ще раз
- Ваша транзакція %1$s %2$s не була завершена. Ви можете спробувати відправити її ще раз.
+ Ваша транзакція %1$s %2$s не була завершена. Ви можете спробувати відправити її ще раз.
У вас є незавершена транзакція
На цій картці залишається лише %s підписів. Ви повинні вивести всі свої кошти.
Низька кількість підписів
diff --git a/core/res/src/main/res/values/strings.xml b/core/res/src/main/res/values/strings.xml
index 4cb2f17b12..12d15e5487 100644
--- a/core/res/src/main/res/values/strings.xml
+++ b/core/res/src/main/res/values/strings.xml
@@ -1,13 +1,22 @@
- Token not found in your portfolio? Check the Markets to find and add it for purchase
- Token not found in your portfolio? Check the Markets to find and add it for selling
+ Can’t find your token? Go to the Market section on the main page and add it to your portfolio for purchase
+ Can’t find your token? Go to the Market section on the main page and add it to your portfolio for selling.
+ Sell
+ This may take a few seconds. Please try again later.
+ The data has not loaded yet.
+ The action is currently unavailable. Please try again later or refresh the data by swiping down on the screen.
+ Button is unavailable
Choose the Token
- Token not found in your portfolio? Check the Markets to find and add it for swap
+ Can’t find your token? Go to the Market section on the main page and add it to your portfolio for swapping.
There are no available tokens to swap with the selected token. Please choose another one.
No available pair
- Choose the Token you want to Receive
- Choose the Token you want to Swap
+ To use the exchange feature, your portfolio must contain at least 2 tokens.
+ Add tokens
+ You only have 1 token added to your portfolio. To use the exchange feature, you need to add at least 2 tokens.
+ Add tokens
+ Choose the token you want to receive
+ Choose the token you want to swap
Choose network
Add custom token
Manage tokens
@@ -249,7 +258,7 @@
Provided by
Status
Tangem offers token swaps via 3rd-party providers according to each provider\'s terms
- Choose provider
+ Provider
An error occurred. Code: %s
Error %1$s. The selected provider cannot process the specified transaction. Please round the value up to %2$s or change it
Selected provider is unavailable at the moment. Please try again later. (Code: %s)
@@ -262,6 +271,9 @@
The amount was refunded in %1$s (%2$s network)
Visit provider’s website for verification
KYC verification required by provider
+ Bought
+ Buying
+ Buying...
Canceled
Confirmed
Confirming
@@ -567,23 +579,27 @@
Access code restore
Identical cards
Access code
- Providers facilitate transactions, ensuring smooth and efficient token exchanges
+ Available with %s
+ Buying crypto in Tangem is powered by third-party providers on their terms.
Search by country
Unavailable
Search by currency
+ By using onramp functionality, you agree with provider’s %1$s and %2$s
The purchase amount should be no more than %s
The amount to buy must be at least %s
No available providers for this currency
Pay with
+ Available up to %s
+ Available from %s
You will be able to complete your transaction on the third-party provider, %s
Redirecting to %s...
Our services are not available in this country
- Change or confirm it
Your residence has been identified as
Residence
Please select the correct country to ensure accurate payment options and services.
Settings
- You can check the transaction status from the token page
+ You can close this screen and check the transaction status on the token details screen.
+ You can close this screen and check the transaction status on the token details screen.
Via
Group
By balance
@@ -597,7 +613,7 @@
%1$s (%2$s) on %3$s network
Sending any other currency will result in its irreversible loss.
Send only %s to this address. Sending any other currency will result in its irreversible loss.
- Send only %s to this address.
+ Send only %1$s on the %2$s network
Transfer funds from any wallet or exchange
Participate
Failed to load the information about the referral program. Please try again later.
@@ -650,6 +666,10 @@
Scan the card or ring to change its settings. The changes will impact only the card or ring you\'ve scanned and will not affect other devices tied to your wallet.
Get your Tangem ready!
Security Alert
+ You don’t have enough funds in your balance to sell cryptocurrency. Please deposit the desired asset to proceed.
+ Insufficient Balance
+ Selling cryptocurrency is unavailable in your region at the moment. We’re actively working to bring this option to you soon—stay tuned!
+ Regional Restriction
Already included in the entered address
Your commission amount is %s times higher than the recommended amount. Please review and adjust your custom settings.
You specified a commission below the recommended amount, which could cause a delay in your transaction. Continue?
@@ -690,6 +710,7 @@
Custom fee is high
Due to the peculiarities of the %1$s network, the fee for transferring the entire balance is higher. To reduce the commission, you can leave %2$s.
The fee is higher
+ Your account balance cannot be lower than the rent fee. Please maintain at least %1$s on your account or withdraw all funds.
The included commission exceeds the transfer amount, leading to a negative value
Invalid amount
The minimum sending amount is %1$s. Please ensure that the remaining balance after sending will not be less than %2$s.
@@ -892,6 +913,7 @@
Unavailable to purchase
Unavailable to sell
Unavailable for swap from %s
+ Unavailable for swap
contract: %s
You don\'t have any transactions yet
Failed to load transaction history.\nClick on reload button to update the information.
@@ -1013,12 +1035,12 @@
This card might be a production sample or counterfeit
Authenticity check failed
Associate
- This token must be associated with your Hedera account before you can receive it. Association fee ~%1$s %2$s
+ This token must be associated with your Hedera account before you can receive it. Association fee ~%1$s %2$s
This token must be associated with your Hedera account before you can receive it
Associate your token
Not enough %s. Top up your Hedera account to associate this token
Are you sure you want to cancel the transaction? You will not be able to retry the transaction again
- Your transaction with an amount of %1$s %2$s was not completed. You can try again to complete it.
+ Your transaction with an amount of %1$s %2$s was not completed. You can try again to complete it.
You have unfinished transaction
Only %s signatures are left on this card. You must withdraw all of your funds.
Low signature count
diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
index c7fb1b5984..0e9ea7edd7 100644
--- a/core/ui/build.gradle.kts
+++ b/core/ui/build.gradle.kts
@@ -21,6 +21,7 @@ dependencies {
/** AndroidX libraries */
implementation(deps.androidx.fragment.ktx)
implementation(deps.androidx.paging.runtime)
+ implementation(deps.lifecycle.runtime.ktx)
implementation(deps.androidx.palette)
implementation(deps.androidx.windowManager) {
exclude(
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/FullScreen.kt b/core/ui/src/main/java/com/tangem/core/ui/components/FullScreen.kt
new file mode 100644
index 0000000000..9f94bf859a
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/FullScreen.kt
@@ -0,0 +1,123 @@
+package com.tangem.core.ui.components
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.PixelFormat
+import android.view.View
+import android.view.WindowManager
+import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.ui.platform.AbstractComposeView
+import androidx.compose.ui.platform.LocalView
+import androidx.lifecycle.findViewTreeLifecycleOwner
+import androidx.lifecycle.findViewTreeViewModelStoreOwner
+import androidx.lifecycle.setViewTreeLifecycleOwner
+import androidx.lifecycle.setViewTreeViewModelStoreOwner
+import androidx.savedstate.findViewTreeSavedStateRegistryOwner
+import androidx.savedstate.setViewTreeSavedStateRegistryOwner
+import java.util.UUID
+
+@Composable
+fun FullScreen(notTouchable: Boolean = false, content: @Composable (() -> Unit) -> Unit) {
+ val view = LocalView.current
+ val parentComposition = rememberCompositionContext()
+ val currentContent by rememberUpdatedState(content)
+ val id = rememberSaveable { UUID.randomUUID() }
+
+ val fullScreenLayout = remember {
+ FullScreenLayout(
+ notTouchable = notTouchable,
+ composeView = view,
+ uniqueId = id,
+ ).apply {
+ setContent(parentComposition) {
+ currentContent(::dismiss)
+ }
+ }
+ }
+
+ DisposableEffect(fullScreenLayout) {
+ fullScreenLayout.show()
+ onDispose { fullScreenLayout.dispose() }
+ }
+}
+
+@SuppressLint("ViewConstructor", "ClickableViewAccessibility")
+private class FullScreenLayout(
+ private val notTouchable: Boolean,
+ private val composeView: View,
+ uniqueId: UUID,
+) : AbstractComposeView(composeView.context) {
+
+ private val windowManager =
+ composeView.context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
+
+ private val params = createLayoutParams()
+
+ override var shouldCreateCompositionOnAttachedToWindow: Boolean = false
+ private set
+
+ private var viewShowing = false
+
+ init {
+ if (notTouchable) {
+ setOnTouchListener { _, _ -> false }
+ }
+
+ id = android.R.id.content
+ setTag(androidx.compose.ui.R.id.compose_view_saveable_id_tag, "CustomLayout:$uniqueId")
+ setViewTreeLifecycleOwner(composeView.findViewTreeLifecycleOwner())
+ setViewTreeSavedStateRegistryOwner(composeView.findViewTreeSavedStateRegistryOwner())
+ setViewTreeViewModelStoreOwner(composeView.findViewTreeViewModelStoreOwner())
+ }
+
+ private var content: @Composable () -> Unit by mutableStateOf({})
+
+ @Composable
+ override fun Content() {
+ content()
+ }
+
+ fun setContent(parent: CompositionContext, content: @Composable () -> Unit) {
+ setParentCompositionContext(parent)
+ this.content = content
+ shouldCreateCompositionOnAttachedToWindow = true
+ }
+
+ private fun createLayoutParams(): WindowManager.LayoutParams = WindowManager.LayoutParams().apply {
+ type = WindowManager.LayoutParams.TYPE_APPLICATION_PANEL
+ token = composeView.applicationWindowToken
+ width = WindowManager.LayoutParams.MATCH_PARENT
+ height = WindowManager.LayoutParams.MATCH_PARENT
+ format = PixelFormat.TRANSLUCENT
+ flags = WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS or
+ WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
+ }
+
+ fun show() {
+ if (viewShowing) dismiss()
+ windowManager.addView(this, params)
+ params.flags = params.flags or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+
+ if (notTouchable) {
+ params.flags = params.flags or WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE
+ }
+
+ windowManager.updateViewLayout(this, params)
+ viewShowing = true
+ }
+
+ fun dismiss() {
+ if (!viewShowing) return
+ disposeComposition()
+ windowManager.removeViewImmediate(this)
+ viewShowing = false
+ }
+
+ fun dispose() {
+ dismiss()
+ setViewTreeSavedStateRegistryOwner(null)
+ setViewTreeSavedStateRegistryOwner(null)
+ setViewTreeViewModelStoreOwner(null)
+ }
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/ResizableText.kt b/core/ui/src/main/java/com/tangem/core/ui/components/ResizableText.kt
index e63aa1c8e3..649e5c7788 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/ResizableText.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/ResizableText.kt
@@ -14,6 +14,8 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.TextUnit
import androidx.compose.ui.unit.sp
+private const val COEFFICIENT = 0.8f
+
@Suppress("MagicNumber")
@Composable
fun ResizableText(
@@ -50,7 +52,7 @@ fun ResizableText(
fontSizeValue.value = fontSizeRange.min.value
readyToDraw.value = true
} else {
- fontSizeValue.value = nextFontSizeValue * 0.8f
+ fontSizeValue.value = nextFontSizeValue * COEFFICIENT
}
} else {
readyToDraw.value = true
@@ -119,6 +121,53 @@ fun ResizableText(
)
}
+@Composable
+fun ResizableText(
+ text: String,
+ fontSizeValue: TextUnit,
+ fontSizeRange: FontSizeRange,
+ onFontSizeChange: (Float) -> Unit,
+ modifier: Modifier = Modifier,
+ color: Color = Color.Unspecified,
+ overflow: TextOverflow = TextOverflow.Clip,
+ maxLines: Int = Int.MAX_VALUE,
+ style: TextStyle = LocalTextStyle.current,
+) {
+ val readyToDraw = remember { mutableStateOf(false) }
+
+ val textState = remember { mutableStateOf(text) }
+ if (textState.value != text) {
+ readyToDraw.value = false
+ onFontSizeChange(fontSizeRange.max.value)
+ textState.value = text
+ }
+
+ Text(
+ text = text,
+ modifier = modifier.drawWithContent { if (readyToDraw.value) drawContent() },
+ color = color,
+ fontSize = fontSizeValue.value.sp,
+ overflow = overflow,
+ softWrap = false,
+ maxLines = maxLines,
+ onTextLayout = {
+ if (it.hasVisualOverflow) {
+ val nextFontSizeValue = fontSizeValue.value - fontSizeRange.step.value
+ if (nextFontSizeValue <= fontSizeRange.min.value) {
+ onFontSizeChange(fontSizeRange.min.value)
+ readyToDraw.value = true
+ } else {
+ val newSizeValue = nextFontSizeValue * COEFFICIENT
+ onFontSizeChange(newSizeValue)
+ }
+ } else {
+ readyToDraw.value = true
+ }
+ },
+ style = style,
+ )
+}
+
data class FontSizeRange(
val min: TextUnit,
val max: TextUnit,
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/TextFields.kt b/core/ui/src/main/java/com/tangem/core/ui/components/TextFields.kt
index da346fafa1..dbe2a76c91 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/TextFields.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/TextFields.kt
@@ -44,6 +44,7 @@ fun OutlineTextField(
isError: Boolean = false,
keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
keyboardActions: KeyboardActions = KeyboardActions(),
+ visualTransformation: VisualTransformation = VisualTransformation.None,
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
) {
TangemTextField(
@@ -58,6 +59,7 @@ fun OutlineTextField(
isError = isError,
keyboardOptions = keyboardOptions,
keyboardActions = keyboardActions,
+ visualTransformation = visualTransformation,
interactionSource = interactionSource,
)
}
@@ -76,6 +78,8 @@ fun OutlineTextFieldWithIcon(
isError: Boolean = false,
keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
keyboardActions: KeyboardActions = KeyboardActions(),
+ visualTransformation: VisualTransformation = VisualTransformation.None,
+ caption: String? = null,
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
) {
TangemTextFieldWithIcon(
@@ -91,6 +95,8 @@ fun OutlineTextFieldWithIcon(
isError = isError,
keyboardOptions = keyboardOptions,
keyboardActions = keyboardActions,
+ visualTransformation = visualTransformation,
+ caption = caption,
interactionSource = interactionSource,
onIconClick = onIconClick,
)
@@ -189,15 +195,16 @@ private fun TangemTextField(
enter = fadeIn(),
exit = fadeOut(),
) {
- if (caption.isNullOrEmpty()) return@AnimatedVisibility
+ val captionWrapped = remember(this) { requireNotNull(caption) }
+
Column {
Spacer(modifier = Modifier.height(4.dp))
Text(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp),
- text = caption,
- style = TangemTheme.typography.body1,
+ text = captionWrapped,
+ style = TangemTheme.typography.caption2,
color = colors.captionColor(enabled = enabled, isError = isError).value,
)
}
@@ -218,6 +225,7 @@ private fun TangemTextFieldWithIcon(
placeholder: String? = null,
enabled: Boolean = true,
isError: Boolean = false,
+ caption: String? = null,
visualTransformation: VisualTransformation = VisualTransformation.None,
keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
keyboardActions: KeyboardActions = KeyboardActions(),
@@ -280,6 +288,26 @@ private fun TangemTextFieldWithIcon(
}
},
)
+
+ AnimatedVisibility(
+ visible = !caption.isNullOrEmpty(),
+ enter = fadeIn(),
+ exit = fadeOut(),
+ ) {
+ val captionWrapped = remember(this) { requireNotNull(caption) }
+
+ Column {
+ Spacer(modifier = Modifier.height(4.dp))
+ Text(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(horizontal = 16.dp),
+ text = captionWrapped,
+ style = TangemTheme.typography.caption2,
+ color = colors.captionColor(enabled = enabled, isError = isError).value,
+ )
+ }
+ }
}
}
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithBackButton.kt b/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithBackButton.kt
index 65304bcf57..bd95803a6a 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithBackButton.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithBackButton.kt
@@ -4,6 +4,7 @@ import android.content.res.Configuration
import androidx.annotation.DrawableRes
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
import androidx.compose.ui.tooling.preview.Preview
import com.tangem.core.ui.R
import com.tangem.core.ui.components.appbar.models.TopAppBarButtonUM
@@ -26,6 +27,7 @@ fun AppBarWithBackButton(
modifier: Modifier = Modifier,
text: String? = null,
@DrawableRes iconRes: Int? = null,
+ containerColor: Color = Color.Transparent,
) {
TangemTopAppBar(
modifier = modifier,
@@ -34,6 +36,7 @@ fun AppBarWithBackButton(
iconRes = iconRes ?: R.drawable.ic_back_24,
onIconClicked = onBackClick,
),
+ containerColor = containerColor,
)
}
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheet.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheet.kt
index d9b884cb75..22399d6e4b 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheet.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheet.kt
@@ -1,16 +1,21 @@
package com.tangem.core.ui.components.bottomsheets
+import androidx.activity.compose.BackHandler
+import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
import androidx.compose.foundation.background
+import androidx.compose.foundation.focusable
import androidx.compose.foundation.layout.*
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.ModalBottomSheet
-import androidx.compose.material3.SheetState
+import androidx.compose.material3.*
import androidx.compose.material3.SheetValue.Expanded
-import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.runtime.*
import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.input.key.*
import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.tangem.core.ui.components.appbar.models.TopAppBarButtonUM
import com.tangem.core.ui.extensions.TextReference
@@ -18,6 +23,7 @@ import com.tangem.core.ui.res.LocalBottomSheetAlwaysVisible
import com.tangem.core.ui.res.TangemTheme
import com.tangem.core.ui.utils.WindowInsetsZero
import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
/**
@@ -31,6 +37,7 @@ inline fun TangemBottomSheet(
containerColor: Color = TangemTheme.colors.background.primary,
addBottomInsets: Boolean = true,
skipPartiallyExpanded: Boolean = true,
+ noinline onBack: (() -> Unit)? = null,
crossinline content: @Composable ColumnScope.(T) -> Unit,
) {
TangemBottomSheet(
@@ -39,6 +46,7 @@ inline fun TangemBottomSheet(
addBottomInsets = addBottomInsets,
title = { TangemBottomSheetTitle(title = titleText, endButton = titleAction) },
skipPartiallyExpanded = skipPartiallyExpanded,
+ onBack = onBack,
content = content,
)
}
@@ -52,6 +60,7 @@ inline fun TangemBottomSheet(
containerColor: Color = TangemTheme.colors.background.primary,
addBottomInsets: Boolean = true,
skipPartiallyExpanded: Boolean = true,
+ noinline onBack: (() -> Unit)? = null,
crossinline title: @Composable BoxScope.(T) -> Unit = {},
crossinline content: @Composable ColumnScope.(T) -> Unit,
) {
@@ -73,6 +82,7 @@ inline fun TangemBottomSheet(
addBottomInsets = addBottomInsets,
title = title,
content = content,
+ onBack = onBack,
skipPartiallyExpanded = skipPartiallyExpanded,
)
}
@@ -85,6 +95,7 @@ inline fun DefaultBottomSheet(
containerColor: Color,
addBottomInsets: Boolean,
skipPartiallyExpanded: Boolean = true,
+ noinline onBack: (() -> Unit)? = null,
crossinline title: @Composable (BoxScope.(T) -> Unit),
crossinline content: @Composable (ColumnScope.(T) -> Unit),
) {
@@ -98,6 +109,7 @@ inline fun DefaultBottomSheet(
containerColor = containerColor,
addBottomInsets = addBottomInsets,
title = title,
+ onBack = onBack,
content = content,
)
}
@@ -129,6 +141,7 @@ inline fun PreviewBottomSheet(
initialValue = Expanded,
density = LocalDensity.current,
),
+ onBack = null,
containerColor = containerColor,
addBottomInsets = addBottomInsets,
title = title,
@@ -144,6 +157,7 @@ inline fun BasicBottomSheet(
sheetState: SheetState,
containerColor: Color,
addBottomInsets: Boolean,
+ noinline onBack: (() -> Unit)? = null,
crossinline title: @Composable (BoxScope.(T) -> Unit),
crossinline content: @Composable (ColumnScope.(T) -> Unit),
modifier: Modifier = Modifier,
@@ -152,15 +166,7 @@ inline fun BasicBottomSheet(
val bottomBarHeight = with(LocalDensity.current) { WindowInsets.systemBars.getBottom(this).toDp() }
- ModalBottomSheet(
- modifier = modifier.statusBarsPadding(),
- onDismissRequest = config.onDismissRequest,
- sheetState = sheetState,
- containerColor = containerColor,
- shape = TangemTheme.shapes.bottomSheetLarge,
- contentWindowInsets = { WindowInsetsZero },
- dragHandle = { TangemBottomSheetDraggableHeader(color = containerColor) },
- ) {
+ val bsContent: @Composable ColumnScope.() -> Unit = {
Column(
modifier = Modifier.let {
if (addBottomInsets) {
@@ -179,6 +185,90 @@ inline fun BasicBottomSheet(
content(model)
}
}
+
+ if (onBack != null) {
+ ModalBottomSheetWithBackHandling(
+ modifier = modifier.statusBarsPadding(),
+ onDismissRequest = config.onDismissRequest,
+ sheetState = sheetState,
+ containerColor = containerColor,
+ shape = TangemTheme.shapes.bottomSheetLarge,
+ contentWindowInsets = { WindowInsetsZero },
+ dragHandle = { TangemBottomSheetDraggableHeader(color = containerColor) },
+ onBack = onBack,
+ content = bsContent,
+ )
+ } else {
+ ModalBottomSheet(
+ modifier = modifier.statusBarsPadding(),
+ onDismissRequest = config.onDismissRequest,
+ sheetState = sheetState,
+ containerColor = containerColor,
+ shape = TangemTheme.shapes.bottomSheetLarge,
+ contentWindowInsets = { WindowInsetsZero },
+ dragHandle = { TangemBottomSheetDraggableHeader(color = containerColor) },
+ content = bsContent,
+ )
+ }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun ModalBottomSheetWithBackHandling(
+ onDismissRequest: () -> Unit,
+ onBack: (() -> Unit),
+ modifier: Modifier = Modifier,
+ sheetState: SheetState = rememberModalBottomSheetState(),
+ sheetMaxWidth: Dp = BottomSheetDefaults.SheetMaxWidth,
+ shape: Shape = BottomSheetDefaults.ExpandedShape,
+ containerColor: Color = BottomSheetDefaults.ContainerColor,
+ contentColor: Color = contentColorFor(containerColor),
+ tonalElevation: Dp = 0.dp,
+ scrimColor: Color = BottomSheetDefaults.ScrimColor,
+ dragHandle: @Composable (() -> Unit)? = { BottomSheetDefaults.DragHandle() },
+ contentWindowInsets: @Composable () -> WindowInsets = { BottomSheetDefaults.windowInsets },
+ content: @Composable ColumnScope.() -> Unit,
+) {
+ BackHandler(enabled = sheetState.targetValue != SheetValue.Hidden) {
+ onBack()
+ }
+
+ val requester = remember { FocusRequester() }
+ val backPressedDispatcherOwner = LocalOnBackPressedDispatcherOwner.current
+
+ ModalBottomSheet(
+ onDismissRequest = onDismissRequest,
+ modifier = modifier
+ .focusRequester(requester)
+ .focusable()
+ .onPreviewKeyEvent {
+ if (it.key == Key.Back && it.type == KeyEventType.KeyUp && !it.nativeKeyEvent.isCanceled) {
+ backPressedDispatcherOwner?.onBackPressedDispatcher?.onBackPressed()
+ return@onPreviewKeyEvent true
+ }
+ return@onPreviewKeyEvent false
+ },
+ sheetState = sheetState,
+ sheetMaxWidth = sheetMaxWidth,
+ shape = shape,
+ containerColor = containerColor,
+ contentColor = contentColor,
+ tonalElevation = tonalElevation,
+ scrimColor = scrimColor,
+ dragHandle = dragHandle,
+ contentWindowInsets = contentWindowInsets,
+ properties = ModalBottomSheetDefaults.properties(
+ // Set false otherwise the onPreviewKeyEvent doesn't work at all.
+ // The functionality of shouldDismissOnBackPress is achieved by the BackHandler.
+ shouldDismissOnBackPress = false,
+ ),
+ content = content,
+ )
+
+ LaunchedEffect(Unit) {
+ delay(timeMillis = 200)
+ requester.requestFocus()
+ }
}
@OptIn(ExperimentalMaterial3Api::class)
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/TokenReceiveBottomSheet.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/TokenReceiveBottomSheet.kt
index 46317b571e..0e39a22357 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/TokenReceiveBottomSheet.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/TokenReceiveBottomSheet.kt
@@ -1,13 +1,17 @@
package com.tangem.core.ui.components.bottomsheets.tokenreceive
+import android.content.res.Configuration
import androidx.compose.animation.animateColorAsState
-import androidx.compose.foundation.*
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.LazyRow
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.pager.HorizontalPager
import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.SnackbarHostState
import androidx.compose.material3.Text
import androidx.compose.runtime.*
@@ -22,15 +26,22 @@ import androidx.compose.ui.platform.LocalHapticFeedback
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import androidx.compose.ui.unit.dp
import com.tangem.core.ui.R
import com.tangem.core.ui.components.SecondaryButtonIconStart
import com.tangem.core.ui.components.bottomsheets.TangemBottomSheet
import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
+import com.tangem.core.ui.components.notifications.Notification
+import com.tangem.core.ui.components.notifications.NotificationConfig
import com.tangem.core.ui.components.rememberQrPainters
import com.tangem.core.ui.components.snackbar.CopiedTextSnackbarHost
-import com.tangem.core.ui.extensions.resolveReference
-import com.tangem.core.ui.extensions.shareText
+import com.tangem.core.ui.extensions.*
import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemThemePreview
+import kotlinx.collections.immutable.persistentListOf
import kotlinx.coroutines.launch
@Composable
@@ -50,37 +61,62 @@ private fun TokenReceiveBottomSheetContent(content: TokenReceiveBottomSheetConfi
Column(
modifier = Modifier
.verticalScroll(state = rememberScrollState())
- .padding(
- start = TangemTheme.dimens.spacing24,
- top = TangemTheme.dimens.spacing24,
- end = TangemTheme.dimens.spacing24,
- bottom = TangemTheme.dimens.spacing16,
- ),
+ .padding(top = 24.dp, bottom = 16.dp)
+ .padding(horizontal = 24.dp),
horizontalAlignment = Alignment.CenterHorizontally,
- verticalArrangement = Arrangement.spacedBy(space = TangemTheme.dimens.spacing24),
+ verticalArrangement = Arrangement.spacedBy(space = 24.dp),
) {
QrCodeContent(content = content, onAddressChange = { selectedAddress = it })
- DisclaimerText(text = content.name)
+ Info(
+ currency = content.symbol,
+ network = content.network,
+ showMemoDisclaimer = content.showMemoDisclaimer,
+ )
- Row(horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing16)) {
- CopyButton(
- address = selectedAddress.value,
- snackbarHostState = snackbarHostState,
- onClick = content.onCopyClick,
- modifier = Modifier.weight(1f),
- )
-
- ShareButton(
- address = selectedAddress.value,
- onClick = content.onShareClick,
- modifier = Modifier.weight(1f),
- )
- }
+ Buttons(
+ address = selectedAddress.value,
+ snackbarHostState = snackbarHostState,
+ onShareClick = content.onShareClick,
+ onCopyClick = content.onCopyClick,
+ )
}
}
}
+@Composable
+private fun Info(currency: String, network: String, showMemoDisclaimer: Boolean, modifier: Modifier = Modifier) {
+ Column(
+ modifier = modifier,
+ horizontalAlignment = Alignment.CenterHorizontally,
+ verticalArrangement = Arrangement.spacedBy(space = 16.dp),
+ ) {
+ if (showMemoDisclaimer) {
+ Text(
+ modifier = Modifier
+ .padding(horizontal = 18.dp)
+ .fillMaxWidth(),
+ text = stringResource(R.string.receive_bottom_sheet_no_memo_required_message),
+ style = TangemTheme.typography.caption1,
+ color = TangemTheme.colors.text.tertiary,
+ textAlign = TextAlign.Center,
+ )
+ }
+
+ Notification(
+ config = NotificationConfig(
+ title = resourceReference(
+ R.string.receive_bottom_sheet_warning_title,
+ wrappedList(currency, network),
+ ),
+ subtitle = resourceReference(R.string.receive_bottom_sheet_warning_message_description),
+ iconResId = R.drawable.ic_alert_circle_24,
+ ),
+ iconTint = TangemTheme.colors.icon.accent,
+ )
+ }
+}
+
@Composable
private fun ContainerWithSnackbarHost(snackbarHostState: SnackbarHostState, content: @Composable () -> Unit) {
Box {
@@ -90,12 +126,11 @@ private fun ContainerWithSnackbarHost(snackbarHostState: SnackbarHostState, cont
hostState = snackbarHostState,
modifier = Modifier
.align(Alignment.BottomCenter)
- .padding(bottom = TangemTheme.dimens.spacing80),
+ .padding(bottom = 80.dp),
)
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun QrCodeContent(content: TokenReceiveBottomSheetConfig, onAddressChange: (AddressModel) -> Unit) {
val qrCodes = rememberQrPainters(content.addresses.map(AddressModel::value))
@@ -124,7 +159,7 @@ private fun QrCodeContent(content: TokenReceiveBottomSheetConfig, onAddressChang
val unselectedColor = TangemTheme.colors.icon.informative
LazyRow(
- modifier = Modifier.height(TangemTheme.dimens.size20),
+ modifier = Modifier.height(20.dp),
state = indicatorState,
horizontalArrangement = Arrangement.Center,
verticalAlignment = Alignment.CenterVertically,
@@ -138,9 +173,9 @@ private fun QrCodeContent(content: TokenReceiveBottomSheetConfig, onAddressChang
Box(
modifier = Modifier
- .padding(horizontal = TangemTheme.dimens.spacing4, vertical = TangemTheme.dimens.spacing6)
+ .padding(horizontal = 4.dp, vertical = 6.dp)
.background(color = color, shape = CircleShape)
- .size(TangemTheme.dimens.size7),
+ .size(7.dp),
)
}
}
@@ -153,7 +188,7 @@ private fun QrCodePage(content: TokenReceiveBottomSheetConfig, qrCodePainter: Pa
Column(
modifier = Modifier.fillMaxWidth(),
horizontalAlignment = Alignment.CenterHorizontally,
- verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing24),
+ verticalArrangement = Arrangement.spacedBy(24.dp),
) {
Text(
text = stringResource(
@@ -171,7 +206,7 @@ private fun QrCodePage(content: TokenReceiveBottomSheetConfig, qrCodePainter: Pa
painter = qrCodePainter,
contentDescription = null,
contentScale = ContentScale.Fit,
- modifier = Modifier.size(TangemTheme.dimens.size248),
+ modifier = Modifier.size(248.dp),
)
Text(
@@ -193,58 +228,108 @@ private fun getName(content: TokenReceiveBottomSheetConfig, index: Int): String
}
@Composable
-private fun DisclaimerText(text: String) {
- Text(
- text = stringResource(R.string.receive_bottom_sheet_warning_message_full, text),
- color = TangemTheme.colors.text.secondary,
- textAlign = TextAlign.Center,
- style = TangemTheme.typography.caption2,
- )
-}
-
-@Composable
-private fun CopyButton(
+private fun Buttons(
address: String,
snackbarHostState: SnackbarHostState,
- onClick: () -> Unit,
+ onShareClick: () -> Unit,
+ onCopyClick: () -> Unit,
modifier: Modifier = Modifier,
) {
val hapticFeedback = LocalHapticFeedback.current
val clipboardManager = LocalClipboardManager.current
val coroutineScope = rememberCoroutineScope()
- val resources = LocalContext.current.resources
+ val context = LocalContext.current
+ val resources = context.resources
- SecondaryButtonIconStart(
+ Row(
modifier = modifier,
- text = stringResource(id = R.string.common_copy),
- iconResId = R.drawable.ic_copy_24,
- onClick = {
- onClick()
- hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
- clipboardManager.setText(AnnotatedString(address))
+ horizontalArrangement = Arrangement.spacedBy(16.dp),
+ ) {
+ SecondaryButtonIconStart(
+ modifier = Modifier.weight(1f),
+ text = stringResource(id = R.string.common_copy),
+ iconResId = R.drawable.ic_copy_24,
+ onClick = {
+ onCopyClick()
- coroutineScope.launch {
- snackbarHostState.showSnackbar(
- message = resources.getString(R.string.wallet_notification_address_copied),
- )
- }
- },
- )
+ hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
+ clipboardManager.setText(AnnotatedString(address))
+
+ coroutineScope.launch {
+ snackbarHostState.showSnackbar(
+ message = resources.getString(R.string.wallet_notification_address_copied),
+ )
+ }
+ },
+ )
+
+ SecondaryButtonIconStart(
+ modifier = Modifier.weight(1f),
+ text = stringResource(id = R.string.common_share),
+ iconResId = R.drawable.ic_share_24,
+ onClick = {
+ onShareClick()
+
+ hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
+ context.shareText(address)
+ },
+ )
+ }
}
+// region Preview
@Composable
-private fun ShareButton(address: String, onClick: () -> Unit, modifier: Modifier = Modifier) {
- val hapticFeedback = LocalHapticFeedback.current
- val context = LocalContext.current
+@Preview(showBackground = true, widthDp = 360)
+@Preview(showBackground = true, widthDp = 360, uiMode = Configuration.UI_MODE_NIGHT_YES)
+private fun Preview_TokenReceiveBottomSheet(
+ @PreviewParameter(TokenReceiveBottomSheetConfigPreviewProvider::class) params: TokenReceiveBottomSheetConfig,
+) {
+ TangemThemePreview {
+ val config = TangemBottomSheetConfig(
+ isShow = true,
+ content = params,
+ onDismissRequest = {},
+ )
- SecondaryButtonIconStart(
- modifier = modifier,
- text = stringResource(id = R.string.common_share),
- iconResId = R.drawable.ic_share_24,
- onClick = {
- onClick()
- hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
- context.shareText(address)
- },
+ TokenReceiveBottomSheet(config)
+ }
+}
+
+private class TokenReceiveBottomSheetConfigPreviewProvider : PreviewParameterProvider {
+ val address = AddressModel(
+ displayName = stringReference("Address 1"),
+ value = "0xe5178c7d4d0e861ed2e9414e045b501226b0de8d",
+ type = AddressModel.Type.Default,
)
-}
\ No newline at end of file
+ private val baseConfig = TokenReceiveBottomSheetConfig(
+ name = "Stellar",
+ symbol = "XLM",
+ network = "Ethereum",
+ addresses = persistentListOf(address),
+ showMemoDisclaimer = false,
+ onCopyClick = {},
+ onShareClick = {},
+ )
+
+ override val values: Sequence
+ get() = sequenceOf(
+ baseConfig,
+ baseConfig.copy(
+ addresses = persistentListOf(
+ address,
+ address.copy(displayName = stringReference("Address 2")),
+ ),
+ ),
+ baseConfig.copy(
+ showMemoDisclaimer = true,
+ ),
+ baseConfig.copy(
+ showMemoDisclaimer = true,
+ addresses = persistentListOf(
+ address,
+ address.copy(displayName = stringReference("Address 2")),
+ ),
+ ),
+ )
+}
+// endregion Preview
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/TokenReceiveBottomSheetConfig.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/TokenReceiveBottomSheetConfig.kt
index a0a649302c..29d19f5300 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/TokenReceiveBottomSheetConfig.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/TokenReceiveBottomSheetConfig.kt
@@ -3,11 +3,12 @@ package com.tangem.core.ui.components.bottomsheets.tokenreceive
import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfigContent
import kotlinx.collections.immutable.ImmutableList
-class TokenReceiveBottomSheetConfig(
+data class TokenReceiveBottomSheetConfig(
val name: String,
val symbol: String,
val network: String,
val addresses: ImmutableList,
+ val showMemoDisclaimer: Boolean,
val onCopyClick: () -> Unit,
val onShareClick: () -> Unit,
) : TangemBottomSheetConfigContent
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/buttons/actions/ActionButtonConfig.kt b/core/ui/src/main/java/com/tangem/core/ui/components/buttons/actions/ActionButtonConfig.kt
index c93d92643e..d315a2a715 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/buttons/actions/ActionButtonConfig.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/buttons/actions/ActionButtonConfig.kt
@@ -23,4 +23,5 @@ data class ActionButtonConfig(
val onLongClick: (() -> TextReference?)? = null,
val enabled: Boolean = true,
val dimContent: Boolean = false,
+ val isInProgress: Boolean = false,
)
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/buttons/actions/Actions.kt b/core/ui/src/main/java/com/tangem/core/ui/components/buttons/actions/Actions.kt
index 60bc6e7e12..d5d30f90ca 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/buttons/actions/Actions.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/buttons/actions/Actions.kt
@@ -8,9 +8,11 @@ import androidx.compose.foundation.background
import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.Icon
-import androidx.compose.material.Text
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
+import androidx.compose.runtime.ReadOnlyComposable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
@@ -22,8 +24,9 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
import com.tangem.core.ui.R
-import com.tangem.core.ui.components.SpacerW8
import com.tangem.core.ui.extensions.TextReference
import com.tangem.core.ui.extensions.resolveReference
import com.tangem.core.ui.res.TangemTheme
@@ -45,9 +48,19 @@ fun RoundedActionButton(
modifier: Modifier = Modifier,
color: Color = TangemTheme.colors.button.secondary,
) {
- Button(
+ ActionBaseButton(
config = config,
shape = RoundedCornerShape(size = TangemTheme.dimens.radius24),
+ content = {
+ ActionButtonContent(
+ config = config,
+ text = { Text(text = config.text, textColor = it) },
+ modifier = it.padding(
+ start = TangemTheme.dimens.spacing16,
+ end = TangemTheme.dimens.spacing24,
+ ),
+ )
+ },
modifier = modifier,
color = color,
)
@@ -69,9 +82,19 @@ fun ActionButton(
modifier: Modifier = Modifier,
color: Color = TangemTheme.colors.button.secondary,
) {
- Button(
+ ActionBaseButton(
config = config,
shape = RoundedCornerShape(size = TangemTheme.dimens.radius12),
+ content = {
+ ActionButtonContent(
+ config = config,
+ text = { textColor -> Text(text = config.text, textColor = textColor) },
+ modifier = it.padding(
+ start = TangemTheme.dimens.spacing16,
+ end = TangemTheme.dimens.spacing24,
+ ),
+ )
+ },
modifier = modifier,
color = color,
)
@@ -79,22 +102,24 @@ fun ActionButton(
@OptIn(ExperimentalFoundationApi::class)
@Composable
-private fun Button(
+fun ActionBaseButton(
config: ActionButtonConfig,
shape: RoundedCornerShape,
+ content: @Composable (modifier: Modifier) -> Unit,
modifier: Modifier = Modifier,
color: Color = TangemTheme.colors.button.secondary,
) {
+ val context = LocalContext.current
val backgroundColor by animateColorAsState(
targetValue = if (config.enabled) color else TangemTheme.colors.button.disabled,
label = "Update background color",
)
- val context = LocalContext.current
- Row(
+
+ Box(
modifier = modifier
- .heightIn(min = TangemTheme.dimens.size36)
+ .heightIn(min = 36.dp)
+ .widthIn(min = 100.dp)
.clip(shape)
- .background(color = backgroundColor)
.combinedClickable(
enabled = config.enabled,
onClick = config.onClick,
@@ -107,48 +132,86 @@ private fun Button(
}
},
)
- .padding(start = TangemTheme.dimens.spacing16, end = TangemTheme.dimens.spacing24)
+ .background(color = backgroundColor),
+ ) {
+ content(Modifier.align(Alignment.Center))
+
+ if (config.isInProgress) {
+ Loading(
+ modifier = Modifier
+ .align(alignment = Alignment.Center)
+ .matchParentSize(),
+ backgroundColor = backgroundColor,
+ )
+ }
+ }
+}
+
+@Composable
+fun ActionButtonContent(
+ config: ActionButtonConfig,
+ text: @Composable (Color) -> Unit,
+ modifier: Modifier = Modifier,
+ paddingBetweenIconAndText: Dp = 8.dp,
+) {
+ Row(
+ modifier = modifier
.padding(vertical = TangemTheme.dimens.spacing8),
horizontalArrangement = Arrangement.Center,
verticalAlignment = Alignment.CenterVertically,
) {
- val iconTint by animateColorAsState(
- targetValue = when {
- !config.enabled -> TangemTheme.colors.icon.informative
- config.dimContent -> TangemTheme.colors.icon.informative
- else -> TangemTheme.colors.icon.primary1
- },
- label = "Update tint color",
- )
-
+ val iconTint = when {
+ !config.enabled -> TangemTheme.colors.icon.informative
+ config.dimContent -> TangemTheme.colors.icon.informative
+ else -> TangemTheme.colors.icon.primary1
+ }
Icon(
+ modifier = Modifier.size(size = TangemTheme.dimens.size20),
painter = painterResource(id = config.iconResId),
contentDescription = null,
- modifier = Modifier.size(size = TangemTheme.dimens.size20),
tint = iconTint,
)
- SpacerW8()
+ Spacer(modifier = Modifier.width(width = paddingBetweenIconAndText))
- val textColor by animateColorAsState(
- targetValue = when {
- !config.enabled -> TangemTheme.colors.text.disabled
- config.dimContent -> TangemTheme.colors.text.tertiary
- else -> TangemTheme.colors.text.primary1
- },
- label = "Update text color",
- )
+ text(getTextColor(config))
+ }
+}
- Text(
- text = config.text.resolveReference(),
- color = textColor,
- overflow = TextOverflow.Ellipsis,
- maxLines = 1,
- style = TangemTheme.typography.button,
+@Composable
+private fun Text(text: TextReference, textColor: Color) {
+ Text(
+ text = text.resolveReference(),
+ color = textColor,
+ overflow = TextOverflow.Ellipsis,
+ maxLines = 1,
+ style = TangemTheme.typography.button,
+ )
+}
+
+@Composable
+private fun Loading(backgroundColor: Color, modifier: Modifier = Modifier) {
+ Box(
+ modifier = modifier.background(color = backgroundColor),
+ contentAlignment = Alignment.Center,
+ ) {
+ CircularProgressIndicator(
+ modifier = Modifier.size(TangemTheme.dimens.size24),
+ color = TangemTheme.colors.icon.accent,
)
}
}
+@Composable
+@ReadOnlyComposable
+fun getTextColor(config: ActionButtonConfig): Color {
+ return when {
+ !config.enabled -> TangemTheme.colors.text.disabled
+ config.dimContent -> TangemTheme.colors.text.tertiary
+ else -> TangemTheme.colors.text.primary1
+ }
+}
+
@Preview(group = "RoundedActionButton", showBackground = true)
@Preview(group = "RoundedActionButton", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
@Composable
@@ -188,5 +251,12 @@ private class ActionStateProvider : CollectionPreviewParameterProvider Unit,
) {
Column(modifier = modifier) {
content()
AnimatedVisibility(visible = footer != null) {
+ val footerWrapped = remember(this) { requireNotNull(footer) }
Text(
- text = footer.orEmpty(),
+ text = footerWrapped.resolveReference(),
style = TangemTheme.typography.caption2,
color = TangemTheme.colors.text.tertiary,
modifier = Modifier
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/ContentIcon.kt b/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/ContentIcon.kt
index 8d1787952d..52d7c920a6 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/ContentIcon.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/ContentIcon.kt
@@ -31,6 +31,13 @@ internal fun ContentIcon(
alpha = alpha,
colorFilter = colorFilter,
)
+ is CurrencyIconState.FiatIcon -> CoinIcon(
+ modifier = modifier,
+ url = icon.url,
+ fallbackResId = icon.fallbackResId,
+ alpha = alpha,
+ colorFilter = colorFilter,
+ )
is CurrencyIconState.TokenIcon -> TokenIcon(
modifier = modifier,
url = icon.url,
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/CurrencyIcon.kt b/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/CurrencyIcon.kt
index 1b92960c51..a9a7677136 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/CurrencyIcon.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/CurrencyIcon.kt
@@ -39,6 +39,7 @@ fun CurrencyIcon(state: CurrencyIconState, modifier: Modifier = Modifier, should
is CurrencyIconState.Locked -> LockedIcon(modifier = iconModifier)
is CurrencyIconState.Empty -> EmptyIcon(resId = state.resId, modifier = iconModifier)
is CurrencyIconState.CoinIcon,
+ is CurrencyIconState.FiatIcon,
is CurrencyIconState.CustomTokenIcon,
is CurrencyIconState.TokenIcon,
-> {
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/CurrencyIconState.kt b/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/CurrencyIconState.kt
index 371ad59f61..5ebf4ad190 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/CurrencyIconState.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/CurrencyIconState.kt
@@ -71,6 +71,21 @@ sealed class CurrencyIconState {
override val showCustomBadge: Boolean = true,
) : CurrencyIconState()
+ /**
+ * Represents a fiat icon.
+ *
+ * @property url The URL where the fiat icon can be fetched from. May be `null` if not found.
+ * @property fallbackResId The drawable resource ID to be used as a fallback if the URL is not available.
+ */
+ data class FiatIcon(
+ val url: String?,
+ @DrawableRes val fallbackResId: Int,
+ ) : CurrencyIconState() {
+ override val isGrayscale: Boolean = false
+ override val showCustomBadge: Boolean = false
+ override val topBadgeIconResId: Int? = null
+ }
+
data object Loading : CurrencyIconState() {
override val isGrayscale: Boolean = false
override val showCustomBadge: Boolean = false
@@ -113,6 +128,7 @@ sealed class CurrencyIconState {
is Loading,
is Locked,
is Empty,
+ is FiatIcon,
-> this
}
}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowApprox.kt b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowApprox.kt
index 4a2a746428..2cc7bbdd3b 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowApprox.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowApprox.kt
@@ -37,10 +37,10 @@ import com.tangem.core.ui.res.TangemThemePreview
fun InputRowApprox(
leftIcon: CurrencyIconState,
leftTitle: TextReference,
- leftSubtitle: TextReference,
+ leftSubtitle: TextReference?,
rightIcon: CurrencyIconState,
rightTitle: TextReference,
- rightSubtitle: TextReference,
+ rightSubtitle: TextReference?,
modifier: Modifier = Modifier,
leftTitleEllipsisOffset: Int = 0,
rightTitleEllipsisOffset: Int = 0,
@@ -69,7 +69,7 @@ fun InputRowApprox(
tint = TangemTheme.colors.text.tertiary,
modifier = Modifier
.padding(
- horizontal = TangemTheme.dimens.spacing4,
+ horizontal = TangemTheme.dimens.spacing8,
vertical = TangemTheme.dimens.spacing10,
),
)
@@ -88,12 +88,13 @@ fun InputRowApprox(
private fun InputRowApproxItem(
iconState: CurrencyIconState,
title: TextReference,
- subtitle: TextReference,
+ subtitle: TextReference?,
modifier: Modifier = Modifier,
titleEllipsisOffset: Int = 0,
) {
Row(
modifier = modifier,
+ verticalAlignment = Alignment.CenterVertically,
) {
CurrencyIcon(
state = iconState,
@@ -112,13 +113,15 @@ private fun InputRowApproxItem(
color = TangemTheme.colors.text.primary1,
ellipsis = TextEllipsis.OffsetEnd(titleEllipsisOffset),
)
- EllipsisText(
- text = subtitle.resolveReference(),
- style = TangemTheme.typography.caption2,
- color = TangemTheme.colors.text.tertiary,
- modifier = Modifier
- .padding(top = TangemTheme.dimens.spacing2),
- )
+ if (subtitle != null) {
+ EllipsisText(
+ text = subtitle.resolveReference(),
+ style = TangemTheme.typography.caption2,
+ color = TangemTheme.colors.text.tertiary,
+ modifier = Modifier
+ .padding(top = TangemTheme.dimens.spacing2),
+ )
+ }
}
}
}
@@ -154,6 +157,18 @@ private fun InputRowApproxPreview() {
modifier = Modifier
.background(TangemTheme.colors.background.action),
)
+ InputRowApprox(
+ leftIcon = CurrencyIconState.Loading,
+ leftTitle = TextReference.Str("Left title Left title Left title Left title Left title USD"),
+ leftSubtitle = null,
+ leftTitleEllipsisOffset = 3,
+ rightIcon = CurrencyIconState.Loading,
+ rightTitle = TextReference.Str("Right title USD"),
+ rightSubtitle = null,
+ rightTitleEllipsisOffset = 3,
+ modifier = Modifier
+ .background(TangemTheme.colors.background.action),
+ )
}
}
}
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/notifications/Notification.kt b/core/ui/src/main/java/com/tangem/core/ui/components/notifications/Notification.kt
index cd7b4d5852..c18e2c3e71 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/notifications/Notification.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/notifications/Notification.kt
@@ -222,13 +222,23 @@ private fun Buttons(state: NotificationButtonsState?, isEnabled: Boolean = true)
@Composable
private fun SingleSecondaryButton(config: NotificationButtonsState.SecondaryButtonConfig, isEnabled: Boolean = true) {
- SecondaryButton(
- text = config.text.resolveReference(),
- onClick = config.onClick,
- modifier = Modifier.fillMaxWidth(),
- size = TangemButtonSize.WideAction,
- enabled = isEnabled,
- )
+ if (config.iconResId != null) {
+ SecondaryButtonIconEnd(
+ text = config.text.resolveReference(),
+ onClick = config.onClick,
+ modifier = Modifier.fillMaxWidth(),
+ iconResId = config.iconResId,
+ enabled = isEnabled,
+ )
+ } else {
+ SecondaryButton(
+ text = config.text.resolveReference(),
+ onClick = config.onClick,
+ modifier = Modifier.fillMaxWidth(),
+ size = TangemButtonSize.WideAction,
+ enabled = isEnabled,
+ )
+ }
}
@Composable
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/rows/RowComponents.kt b/core/ui/src/main/java/com/tangem/core/ui/components/rows/RowComponents.kt
index 78c7a724b7..f07edb1802 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/rows/RowComponents.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/rows/RowComponents.kt
@@ -46,7 +46,7 @@ inline fun RowContentContainer(
}
@Composable
-internal fun RowText(
+fun RowText(
mainText: String,
secondText: String,
accentMainText: Boolean,
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/token/TokenItem.kt b/core/ui/src/main/java/com/tangem/core/ui/components/token/TokenItem.kt
index 3d76006795..c504817b1b 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/token/TokenItem.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/token/TokenItem.kt
@@ -25,6 +25,7 @@ import com.tangem.core.ui.components.token.internal.*
import com.tangem.core.ui.components.token.state.TokenItemState
import com.tangem.core.ui.extensions.TextReference
import com.tangem.core.ui.extensions.rememberHapticFeedback
+import com.tangem.core.ui.extensions.stringReference
import com.tangem.core.ui.res.TangemColorPalette
import com.tangem.core.ui.res.TangemTheme
import com.tangem.core.ui.res.TangemThemePreview
@@ -145,14 +146,16 @@ private fun Modifier.tokenClickable(state: TokenItemState): Modifier = composed
is TokenItemState.Unreachable,
-> {
val onClick = state.onItemClick
- val onLongClick = state.onItemLongClick?.let { rememberHapticFeedback(state = state, onAction = it) }
+ val onLongClick = state.onItemLongClick?.let {
+ rememberHapticFeedback(state = state, onAction = { it(state) })
+ }
when {
onClick == null && onLongClick == null -> this
onClick == null && onLongClick != null -> combinedClickable(onClick = {}, onLongClick = onLongClick)
- onClick != null && onLongClick == null -> combinedClickable(onClick = onClick)
+ onClick != null && onLongClick == null -> combinedClickable(onClick = { onClick(state) })
onClick != null && onLongClick != null -> {
- combinedClickable(onClick = onClick, onLongClick = onLongClick)
+ combinedClickable(onClick = { onClick(state) }, onLongClick = onLongClick)
}
else -> this
}
@@ -456,7 +459,7 @@ private class TokenItemStateProvider : CollectionPreviewParameterProvider {
- PriceText(text = state.value, modifier = modifier, isAvailable = state.isAvailable)
+ PriceText(text = state.value.resolveReference(), modifier = modifier, isAvailable = state.isAvailable)
}
is TokenPriceState.Unknown -> {
PriceText(text = DASH_SIGN, modifier = modifier)
@@ -158,7 +160,7 @@ private class TokenPriceChangeStateProvider : CollectionPreviewParameterProvider
priceChangePercent = "2.5%",
type = PriceChangeType.NEUTRAL,
),
- TokenPriceState.TextContent(value = "Subtitle", isAvailable = true),
+ TokenPriceState.TextContent(value = stringReference(value = "Subtitle"), isAvailable = true),
TokenPriceState.Unknown,
TokenPriceState.Loading,
TokenPriceState.Locked,
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/token/internal/TokenTitle.kt b/core/ui/src/main/java/com/tangem/core/ui/components/token/internal/TokenTitle.kt
index 9bf3412f33..7f379e09a6 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/token/internal/TokenTitle.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/token/internal/TokenTitle.kt
@@ -15,6 +15,7 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.style.TextOverflow
import com.tangem.core.ui.R
import com.tangem.core.ui.components.RectangleShimmer
+import com.tangem.core.ui.extensions.resolveReference
import com.tangem.core.ui.res.TangemTheme
import com.tangem.core.ui.components.token.state.TokenItemState.TitleState as TokenTitleState
@@ -46,7 +47,7 @@ private fun ContentTitle(state: TokenTitleState.Content, modifier: Modifier = Mo
* So we need to use [weight] to avoid displacement.
*/
CurrencyNameText(
- name = state.text,
+ name = state.text.resolveReference(),
isAvailable = state.isAvailable,
modifier = Modifier.weight(weight = 1f, fill = false),
)
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/token/state/TokenItemState.kt b/core/ui/src/main/java/com/tangem/core/ui/components/token/state/TokenItemState.kt
index c33e5c8caa..6f3b2342a9 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/token/state/TokenItemState.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/token/state/TokenItemState.kt
@@ -4,6 +4,7 @@ import androidx.compose.runtime.Immutable
import com.tangem.core.ui.components.audits.AuditLabelUM
import com.tangem.core.ui.components.currency.icon.CurrencyIconState
import com.tangem.core.ui.components.marketprice.PriceChangeType
+import com.tangem.core.ui.extensions.TextReference
/** TokenItem component state */
@Immutable
@@ -31,10 +32,10 @@ sealed class TokenItemState {
abstract val subtitle2State: Subtitle2State?
/** Callback which will be called when an item is clicked */
- abstract val onItemClick: (() -> Unit)?
+ abstract val onItemClick: ((TokenItemState) -> Unit)?
/** Callback which will be called when an item is long clicked */
- abstract val onItemLongClick: (() -> Unit)?
+ abstract val onItemLongClick: ((TokenItemState) -> Unit)?
/**
* Loading token state
@@ -52,8 +53,8 @@ sealed class TokenItemState {
) : TokenItemState() {
override val fiatAmountState: FiatAmountState = FiatAmountState.Loading
override val subtitle2State: Subtitle2State = Subtitle2State.Loading
- override val onItemClick: (() -> Unit)? = null
- override val onItemLongClick: (() -> Unit)? = null
+ override val onItemClick: ((TokenItemState) -> Unit)? = null
+ override val onItemLongClick: ((TokenItemState) -> Unit)? = null
}
/**
@@ -67,8 +68,8 @@ sealed class TokenItemState {
override val subtitleState: SubtitleState = SubtitleState.Locked
override val fiatAmountState: FiatAmountState = FiatAmountState.Locked
override val subtitle2State: Subtitle2State = Subtitle2State.Locked
- override val onItemClick: (() -> Unit)? = null
- override val onItemLongClick: (() -> Unit)? = null
+ override val onItemClick: ((TokenItemState) -> Unit)? = null
+ override val onItemLongClick: ((TokenItemState) -> Unit)? = null
}
/**
@@ -90,8 +91,8 @@ sealed class TokenItemState {
override val subtitleState: SubtitleState,
override val fiatAmountState: FiatAmountState,
override val subtitle2State: Subtitle2State,
- override val onItemClick: (() -> Unit)?,
- override val onItemLongClick: (() -> Unit)?,
+ override val onItemClick: ((TokenItemState) -> Unit)?,
+ override val onItemLongClick: ((TokenItemState) -> Unit)?,
) : TokenItemState()
/**
@@ -110,8 +111,8 @@ sealed class TokenItemState {
) : TokenItemState() {
override val subtitleState: SubtitleState? = null
override val fiatAmountState: FiatAmountState? = null
- override val onItemClick: (() -> Unit)? = null
- override val onItemLongClick: (() -> Unit)? = null
+ override val onItemClick: ((TokenItemState) -> Unit)? = null
+ override val onItemLongClick: ((TokenItemState) -> Unit)? = null
}
/**
@@ -129,8 +130,8 @@ sealed class TokenItemState {
override val iconState: CurrencyIconState,
override val titleState: TitleState,
override val subtitleState: SubtitleState? = null,
- override val onItemClick: (() -> Unit)?,
- override val onItemLongClick: (() -> Unit)?,
+ override val onItemClick: ((TokenItemState) -> Unit)?,
+ override val onItemLongClick: ((TokenItemState) -> Unit)?,
) : TokenItemState() {
override val fiatAmountState: FiatAmountState? = null
override val subtitle2State: Subtitle2State? = null
@@ -150,18 +151,18 @@ sealed class TokenItemState {
override val iconState: CurrencyIconState,
override val titleState: TitleState,
override val subtitleState: SubtitleState? = null,
- override val onItemLongClick: (() -> Unit)?,
+ override val onItemLongClick: ((TokenItemState) -> Unit)?,
) : TokenItemState() {
override val fiatAmountState: FiatAmountState? = null
override val subtitle2State: Subtitle2State? = null
- override val onItemClick: (() -> Unit)? = null
+ override val onItemClick: ((TokenItemState) -> Unit)? = null
}
@Immutable
sealed class TitleState {
data class Content(
- val text: String,
+ val text: TextReference,
val hasPending: Boolean = false,
val isAvailable: Boolean = true,
) : TitleState()
@@ -180,7 +181,7 @@ sealed class TokenItemState {
val type: PriceChangeType,
) : SubtitleState()
- data class TextContent(val value: String, val isAvailable: Boolean = true) : SubtitleState()
+ data class TextContent(val value: TextReference, val isAvailable: Boolean = true) : SubtitleState()
data object Unknown : SubtitleState()
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/tokenlist/TokenListItem.kt b/core/ui/src/main/java/com/tangem/core/ui/components/tokenlist/TokenListItem.kt
index 56b0ce8bf1..1a4d6d8dae 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/tokenlist/TokenListItem.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/tokenlist/TokenListItem.kt
@@ -1,14 +1,17 @@
package com.tangem.core.ui.components.tokenlist
import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import com.tangem.core.ui.components.fields.SearchBar
import com.tangem.core.ui.components.token.TokenItem
+import com.tangem.core.ui.components.tokenlist.internal.GroupTitleItem
import com.tangem.core.ui.components.tokenlist.internal.NetworkTitleItem
import com.tangem.core.ui.components.tokenlist.state.TokensListItemUM
import com.tangem.core.ui.extensions.resolveReference
+import com.tangem.core.ui.res.TangemTheme
/**
* Multi-currency content item
@@ -25,6 +28,9 @@ fun TokenListItem(state: TokensListItemUM, isBalanceHidden: Boolean, modifier: M
is TokensListItemUM.NetworkGroupTitle -> {
NetworkTitleItem(networkName = state.name.resolveReference(), modifier = modifier)
}
+ is TokensListItemUM.GroupTitle -> {
+ GroupTitleItem(state, modifier)
+ }
is TokensListItemUM.Token -> {
TokenItem(
state = state.state,
@@ -35,5 +41,13 @@ fun TokenListItem(state: TokensListItemUM, isBalanceHidden: Boolean, modifier: M
is TokensListItemUM.SearchBar -> {
SearchBar(state = state.searchBarUM, modifier = modifier.padding(all = 12.dp))
}
+ is TokensListItemUM.Text -> {
+ Text(
+ text = state.text.resolveReference(),
+ modifier = modifier.padding(all = 12.dp),
+ color = TangemTheme.colors.text.tertiary,
+ style = TangemTheme.typography.body2,
+ )
+ }
}
}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/tokenlist/internal/GroupTitleItem.kt b/core/ui/src/main/java/com/tangem/core/ui/components/tokenlist/internal/GroupTitleItem.kt
new file mode 100644
index 0000000000..c79e40c723
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/tokenlist/internal/GroupTitleItem.kt
@@ -0,0 +1,31 @@
+package com.tangem.core.ui.components.tokenlist.internal
+
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import com.tangem.core.ui.components.rows.NetworkTitle
+import com.tangem.core.ui.components.tokenlist.state.TokensListItemUM
+import com.tangem.core.ui.extensions.resolveReference
+import com.tangem.core.ui.res.TangemTheme
+
+/**
+ * Group title item
+ *
+ * @param state state
+ * @param modifier modifier
+ *
+[REDACTED_AUTHOR]
+ */
+@Composable
+fun GroupTitleItem(state: TokensListItemUM.GroupTitle, modifier: Modifier = Modifier) {
+ NetworkTitle(
+ title = {
+ Text(
+ text = state.text.resolveReference(),
+ style = TangemTheme.typography.subtitle2,
+ color = TangemTheme.colors.text.tertiary,
+ )
+ },
+ modifier = modifier,
+ )
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/tokenlist/internal/NetworkTitleItem.kt b/core/ui/src/main/java/com/tangem/core/ui/components/tokenlist/internal/NetworkTitleItem.kt
index 4f6bf25949..8ca65a2982 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/tokenlist/internal/NetworkTitleItem.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/tokenlist/internal/NetworkTitleItem.kt
@@ -4,7 +4,6 @@ import android.content.res.Configuration
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.BoxScope
-import androidx.compose.foundation.layout.size
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
@@ -78,9 +77,7 @@ private fun BaseNetworkTitleItem(
@Composable
private fun DraggableIcon(reorderableTokenListState: ReorderableLazyListState) {
Box(
- modifier = Modifier
- .size(TangemTheme.dimens.size32)
- .detectReorder(reorderableTokenListState),
+ modifier = Modifier.detectReorder(reorderableTokenListState),
contentAlignment = Alignment.Center,
) {
Icon(
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/tokenlist/state/TokensListItemUM.kt b/core/ui/src/main/java/com/tangem/core/ui/components/tokenlist/state/TokensListItemUM.kt
index 8a26f00508..23332310aa 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/tokenlist/state/TokensListItemUM.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/tokenlist/state/TokensListItemUM.kt
@@ -29,8 +29,17 @@ sealed interface TokensListItemUM {
* @property id id
* @property name network group name
*/
+ @Deprecated("Use GroupTitle instead") // TODO: [REDACTED_JIRA]
data class NetworkGroupTitle(override val id: Int, val name: TextReference) : TokensListItemUM
+ /**
+ * Group title
+ *
+ * @property id id
+ * @property text title value
+ */
+ data class GroupTitle(override val id: Any, val text: TextReference) : TokensListItemUM
+
/**
* Token item
*
@@ -39,4 +48,6 @@ sealed interface TokensListItemUM {
data class Token(val state: TokenItemState) : TokensListItemUM {
override val id: String = state.id
}
+
+ data class Text(override val id: Any, val text: TextReference) : TokensListItemUM
}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt b/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt
index 28de4a0d24..0ec7a47466 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt
@@ -82,6 +82,8 @@ fun getActiveIconRes(blockchainId: String): Int {
"casper", "casper/test" -> R.drawable.img_casper_22
"xodex" -> R.drawable.img_xodex_22
"canxium" -> R.drawable.img_canxium_22
+ "chiliz", "chiliz/test" -> R.drawable.img_chiliz_22
+ "clore-ai" -> R.drawable.img_clore_22
else -> R.drawable.ic_alert_24
}
}
@@ -162,6 +164,8 @@ fun getActiveIconResByCoinId(coinId: String): Int {
"casper-network" -> R.drawable.img_casper_22
"xodex" -> R.drawable.img_xodex_22
"canxium" -> R.drawable.img_canxium_22
+ "chiliz", "chiliz/test" -> R.drawable.img_chiliz_22
+ "clore-ai" -> R.drawable.img_clore_22
else -> R.drawable.ic_alert_24
}
}
@@ -245,6 +249,8 @@ fun getGreyedOutIconRes(blockchainId: String): Int {
"casper", "casper/test" -> R.drawable.ic_casper_22
"xodex" -> R.drawable.ic_xodex_22
"canxium" -> R.drawable.ic_canxium_22
+ "chiliz", "chiliz/test" -> R.drawable.ic_chiliz_22
+ "clore-ai" -> R.drawable.ic_clore_22
else -> R.drawable.ic_alert_24
}
}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/TangemAnimations.kt b/core/ui/src/main/java/com/tangem/core/ui/res/TangemAnimations.kt
index 2e81db1003..28d531895d 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/res/TangemAnimations.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/res/TangemAnimations.kt
@@ -7,8 +7,6 @@ import androidx.compose.runtime.*
@Immutable
object TangemAnimations {
- val transitionSpecs = TransitionSpecs
-
@Composable
@NonRestartableComposable
fun horizontalIndicatorAsState(targetFraction: Float): State {
@@ -19,8 +17,18 @@ object TangemAnimations {
)
}
- @Immutable
- object TransitionSpecs {
- // TODO add more transition specs
+ object AnimatedContent {
+ fun slide(
+ forwardWhen: (initial: S, target: S) -> Boolean,
+ ): AnimatedContentTransitionScope.() -> ContentTransform = {
+ val direction = if (forwardWhen(initialState, targetState)) {
+ AnimatedContentTransitionScope.SlideDirection.End
+ } else {
+ AnimatedContentTransitionScope.SlideDirection.Start
+ }
+
+ slideIntoContainer(towards = direction, animationSpec = tween())
+ .togetherWith(slideOutOfContainer(towards = direction, animationSpec = tween()))
+ }
}
}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/TangemDimens.kt b/core/ui/src/main/java/com/tangem/core/ui/res/TangemDimens.kt
index 9617ee7825..7698a8067d 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/res/TangemDimens.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/res/TangemDimens.kt
@@ -36,6 +36,7 @@ data class TangemDimens internal constructor(
val radius26: Dp = 26.dp,
val radius28: Dp = 28.dp,
val radius36: Dp = 36.dp,
+ val radius40: Dp = 40.dp,
// endregion Radius
// region Size
val size0: Dp = 0.dp,
diff --git a/core/ui/src/main/java/com/tangem/core/ui/utils/DashedBorder.kt b/core/ui/src/main/java/com/tangem/core/ui/utils/DashedBorder.kt
new file mode 100644
index 0000000000..c999d451ae
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/utils/DashedBorder.kt
@@ -0,0 +1,67 @@
+package com.tangem.core.ui.utils
+
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.graphics.*
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+
+/**
+ * Add a dashed border around a Composable component.
+ *
+ * @param color color
+ * @param shape shape
+ * @param strokeWidth stroke width
+ * @param dashLength length of each dash
+ * @param gapLength length of the gap between each dash
+ * @param cap stroke cap
+ */
+fun Modifier.dashedBorder(
+ color: Color,
+ shape: Shape,
+ dashLength: Dp,
+ gapLength: Dp,
+ strokeWidth: Dp = 1.dp,
+ cap: StrokeCap = StrokeCap.Round,
+) = dashedBorder(
+ brush = SolidColor(color),
+ shape = shape,
+ strokeWidth = strokeWidth,
+ dashLength = dashLength,
+ gapLength = gapLength,
+ cap = cap,
+)
+
+/**
+ * Add a dashed border around a Composable component.
+ *
+ * @param brush brush
+ * @param shape shape
+ * @param strokeWidth stroke width
+ * @param dashLength length of each dash
+ * @param gapLength length of the gap between each dash
+ * @param cap stroke cap
+ */
+fun Modifier.dashedBorder(
+ brush: Brush,
+ shape: Shape,
+ strokeWidth: Dp = 2.dp,
+ dashLength: Dp = 4.dp,
+ gapLength: Dp = 4.dp,
+ cap: StrokeCap = StrokeCap.Round,
+) = this.drawWithContent {
+ val outline = shape.createOutline(size = size, layoutDirection = layoutDirection, density = this)
+
+ val dashedStroke = Stroke(
+ cap = cap,
+ width = strokeWidth.toPx(),
+ pathEffect = PathEffect.dashPathEffect(
+ intervals = floatArrayOf(dashLength.toPx(), gapLength.toPx()),
+ ),
+ )
+
+ drawContent()
+
+ drawOutline(outline = outline, style = dashedStroke, brush = brush)
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/utils/HideKeyboardNestedScrollConnection.kt b/core/ui/src/main/java/com/tangem/core/ui/utils/HideKeyboardNestedScrollConnection.kt
new file mode 100644
index 0000000000..4cdea96a77
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/utils/HideKeyboardNestedScrollConnection.kt
@@ -0,0 +1,33 @@
+package com.tangem.core.ui.utils
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
+import androidx.compose.ui.input.nestedscroll.NestedScrollSource
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.platform.SoftwareKeyboardController
+
+/**
+ * [NestedScrollConnection] that calls [SoftwareKeyboardController.hide] on pre scroll
+ *
+ * @property keyboardController keyboard controller
+ *
+[REDACTED_AUTHOR]
+ */
+private class HideKeyboardNestedScrollConnection(
+ private val keyboardController: SoftwareKeyboardController?,
+) : NestedScrollConnection {
+
+ override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
+ keyboardController?.hide()
+
+ return super.onPreScroll(available, source)
+ }
+}
+
+@Composable
+fun rememberHideKeyboardNestedScrollConnection(): NestedScrollConnection {
+ val keyboardController = LocalSoftwareKeyboardController.current
+ return remember { HideKeyboardNestedScrollConnection(keyboardController = keyboardController) }
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/utils/ImageBackgroundContrastChecker.kt b/core/ui/src/main/java/com/tangem/core/ui/utils/ImageBackgroundContrastChecker.kt
index 7c9071598f..ab859df2bb 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/utils/ImageBackgroundContrastChecker.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/utils/ImageBackgroundContrastChecker.kt
@@ -39,6 +39,6 @@ class ImageBackgroundContrastChecker(
private companion object {
// https://www.w3.org/TR/2008/REC-WCAG20-20081211/#contrast-ratiodef
- private const val LOW_CONTRAST_RATIO = 1.1f
+ private const val LOW_CONTRAST_RATIO = 1f
}
}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/webview/WebViewExt.kt b/core/ui/src/main/java/com/tangem/core/ui/webview/WebViewExt.kt
new file mode 100644
index 0000000000..39ec3d8e8d
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/webview/WebViewExt.kt
@@ -0,0 +1,30 @@
+package com.tangem.core.ui.webview
+
+import android.webkit.WebSettings
+import android.webkit.WebView
+
+/**
+ * Applies set of settings to prevent base security issues
+ *
+[REDACTED_AUTHOR]
+ */
+fun WebView.applySafeSettings() {
+ settings.apply {
+ // disable to use scripts
+ javaScriptEnabled = false
+
+ // disable access to files
+ allowFileAccess = false
+
+ // disable access to content by system content provider
+ allowContentAccess = false
+
+ // disable to use cached data (scripts, files, etc)
+ cacheMode = WebSettings.LOAD_NO_CACHE
+
+ // disable to use local storage
+ domStorageEnabled = false
+ }
+
+ setDownloadListener(null)
+}
\ No newline at end of file
diff --git a/core/ui/src/main/res/drawable/ic_access_code.xml b/core/ui/src/main/res/drawable/ic_access_code.xml
new file mode 100644
index 0000000000..d24768aa15
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_access_code.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
diff --git a/core/ui/src/main/res/drawable/ic_alert_circle_red_20.xml b/core/ui/src/main/res/drawable/ic_alert_circle_red_20.xml
new file mode 100644
index 0000000000..e7528979e2
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_alert_circle_red_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/core/ui/src/main/res/drawable/ic_chiliz_22.xml b/core/ui/src/main/res/drawable/ic_chiliz_22.xml
new file mode 100644
index 0000000000..8d1f446943
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_chiliz_22.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/core/ui/src/main/res/drawable/ic_clore_22.xml b/core/ui/src/main/res/drawable/ic_clore_22.xml
new file mode 100644
index 0000000000..b283f4461b
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_clore_22.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/core/ui/src/main/res/drawable/ic_eye_outline_24.xml b/core/ui/src/main/res/drawable/ic_eye_outline_24.xml
new file mode 100644
index 0000000000..fb8273fbf8
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_eye_outline_24.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/core/ui/src/main/res/drawable/ic_feature_1.xml b/core/ui/src/main/res/drawable/ic_feature_1.xml
new file mode 100644
index 0000000000..ed4eba060f
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_feature_1.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
diff --git a/core/ui/src/main/res/drawable/ic_feature_2.xml b/core/ui/src/main/res/drawable/ic_feature_2.xml
new file mode 100644
index 0000000000..6c1b54564b
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_feature_2.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
diff --git a/core/ui/src/main/res/drawable/ic_feature_3.xml b/core/ui/src/main/res/drawable/ic_feature_3.xml
new file mode 100644
index 0000000000..cf8a08f7d0
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_feature_3.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
diff --git a/features/swap/presentation/src/main/res/drawable/ic_lightning_16.xml b/core/ui/src/main/res/drawable/ic_lightning_16.xml
similarity index 100%
rename from features/swap/presentation/src/main/res/drawable/ic_lightning_16.xml
rename to core/ui/src/main/res/drawable/ic_lightning_16.xml
diff --git a/core/ui/src/main/res/drawable/ic_success_blue_76.xml b/core/ui/src/main/res/drawable/ic_success_blue_76.xml
new file mode 100644
index 0000000000..dc223550de
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_success_blue_76.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
diff --git a/core/ui/src/main/res/drawable/img_chiliz_22.xml b/core/ui/src/main/res/drawable/img_chiliz_22.xml
new file mode 100644
index 0000000000..70f61bbde0
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_chiliz_22.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
diff --git a/core/ui/src/main/res/drawable/img_clore_22.xml b/core/ui/src/main/res/drawable/img_clore_22.xml
new file mode 100644
index 0000000000..ac3bcd98da
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_clore_22.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
diff --git a/core/ui/src/main/res/drawable/img_travala_banner_promo_background.webp b/core/ui/src/main/res/drawable/img_travala_banner_promo_background.webp
deleted file mode 100644
index bc3845b8b7..0000000000
Binary files a/core/ui/src/main/res/drawable/img_travala_banner_promo_background.webp and /dev/null differ
diff --git a/core/ui/src/main/res/drawable/img_travala_banner_promo_background_2.webp b/core/ui/src/main/res/drawable/img_travala_banner_promo_background_2.webp
deleted file mode 100644
index c051b16418..0000000000
Binary files a/core/ui/src/main/res/drawable/img_travala_banner_promo_background_2.webp and /dev/null differ
diff --git a/core/ui/src/main/res/raw/anim_confetti.json b/core/ui/src/main/res/raw/anim_confetti.json
new file mode 100644
index 0000000000..f2d1e7f974
--- /dev/null
+++ b/core/ui/src/main/res/raw/anim_confetti.json
@@ -0,0 +1 @@
+{"v":"5.6.3","fr":30,"ip":0,"op":120,"w":1242,"h":2688,"nm":"Comp 1","ddd":1,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Shape Layer 14","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[692,1011.9999999999999,0],"ix":2},"a":{"a":0,"k":[71,-332,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-48,204],[72.555,109.763],[-9.41,53.993],[11.376,60.133],[-20.778,48.214],[-43.71,34.149],[-28,80]],"o":[[48,-204],[-46.308,-70.056],[6.44,-36.951],[-18.438,-97.46],[10.775,-25.002],[128,-100],[28,-80]],"v":[[71,-332],[151,-620],[209.484,-736.613],[141,-856],[199.096,-959.097],[193,-1114],[371,-1280]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":14,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":14.077,"s":[0]},{"t":46.384765625,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":11.923,"s":[0]},{"t":42.0771484375,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim In Out Path","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":2,"op":112,"st":2,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Shape Layer 13","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[648,1040,0],"ix":2},"a":{"a":0,"k":[27,-304,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[28,112],[154,-50],[122,52],[60,164]],"o":[[0,0],[-24,-96],[-150.386,48.827],[-141.68,-60.388],[-60,-164]],"v":[[27,-304],[-107,-530],[-249,-720],[-335,-908],[-537,-1284]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":14,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":3.308,"s":[0]},{"t":35.615234375,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-1,"s":[0]},{"t":27,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim In Out Path","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":112,"st":-5,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Shape Layer 12","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[674,1228,0],"ix":2},"a":{"a":0,"k":[53,-116,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-34,-98],[21,-81],[-20,-38],[-18,-48],[-8,-34],[-62,-38],[-24,-36],[-62,-30],[-84,-22]],"o":[[34,98],[-11.008,42.46],[12.721,24.17],[18,48],[9.222,39.192],[62,38],[24,36],[62,30],[84,22]],"v":[[53,-116],[134,25],[94,107],[181,157],[150,265],[237,323],[250,463],[383,540],[480,694]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.03137254901960784,0.807843137254902,0.3607843137254902,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":14,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":22.692,"s":[0]},{"t":55,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":20.538,"s":[0]},{"t":50.6923828125,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim In Out Path","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":6,"op":112,"st":6,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Shape Layer 11","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[704,1180,0],"ix":2},"a":{"a":0,"k":[83,-164,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-38,-60],[-40.126,23.279],[42.5,-0.5],[-35,2.5],[-47.28,-26.863],[-20,-30],[-21.113,-24.13],[-34,-42],[-16,-40]],"o":[[38,60],[65.5,-38],[-20.024,0.236],[41.06,-2.933],[44,25],[20,30],[14,16],[34,42],[16,40]],"v":[[83,-164],[166.5,-75],[217.5,-41.5],[222.5,-81.5],[377,-77],[378,1],[458,17],[478,91],[616,178]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.22745098039215686,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":14,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":7.615,"s":[0]},{"t":39.9228515625,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":3.308,"s":[0]},{"t":31.3076171875,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim In Out Path","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":112,"st":-3,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Shape Layer 10","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[730,1100,0],"ix":2},"a":{"a":0,"k":[109,-244,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-72,-10],[-51,10],[13,-16],[-24.905,-7.729],[-10,10]],"o":[[72,10],[51,-10],[-10.168,12.514],[29,9],[10,-10]],"v":[[109,-244],[483,-178],[533,-129],[556,-83],[618,-93]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":14,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":16.23,"s":[0]},{"t":48.5380859375,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":14.077,"s":[0]},{"t":44.23046875,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim In Out Path","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":3,"op":112,"st":3,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"Shape Layer 9","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[678,1086,0],"ix":2},"a":{"a":0,"k":[57,-258,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-106,94],[-78,82],[-2,37],[-15,15],[-27.82,25.594],[-23,24],[-38.877,17.279],[-24,-14]],"o":[[106,-94],[78,-82],[2.405,-44.488],[18.028,-18.028],[25,-23],[19.594,-20.446],[36,-16],[24,14]],"v":[[57,-258],[204,-404],[337,-493],[346,-597],[426,-624],[454,-699],[542,-728],[611,-805]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":14,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":7.615,"s":[0]},{"t":39.9228515625,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":3.308,"s":[0]},{"t":31.3076171875,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim In Out Path","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":112,"st":-3,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"Shape Layer 8","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[640,1170,0],"ix":2},"a":{"a":0,"k":[19,-174,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[92,-22],[38,-38],[78,-8],[38,-10],[10,-20]],"o":[[-92,22],[-38,38],[-78,8],[-38,10],[-10,20]],"v":[[19,-174],[-115,-120],[-283,-46],[-423,-50],[-517,32]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":14,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":7.615,"s":[0]},{"t":39.9228515625,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":5.462,"s":[0]},{"t":35.615234375,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim In Out Path","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"Shape Layer 7","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[661,1191,0],"ix":2},"a":{"a":0,"k":[40,-153,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[16.398,-37.618],[29.992,-37.49],[41,-30],[60.195,-37.77],[80.591,1.465],[-31.635,-5.678],[109.189,24.816],[22,-30]],"o":[[-34,78],[-44,55],[-59.359,43.434],[-51,32],[-55,-1],[39,7],[-132,-30],[-22,30]],"v":[[40,-153],[-41,-58],[-104,84],[-253,140],[-359,228],[-381,175],[-459,204],[-652,321]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":14,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":18.385,"s":[0]},{"t":50.6923828125,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":14.077,"s":[0]},{"t":42.0771484375,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim In Out Path","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":2,"op":112,"st":2,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":"Shape Layer 6","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[646,1126,0],"ix":2},"a":{"a":0,"k":[25,-218,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[90,52],[20,-18],[44,46],[60,-36],[34,64],[-46,-10],[34,-50],[52,12],[28,10]],"o":[[-90,-52],[-20,18],[-44,-46],[-60,36],[-34,-64],[46,10],[-34,50],[-52,-12],[-28,-10]],"v":[[25,-218],[-175,-248],[-271,-286],[-379,-328],[-487,-310],[-535,-444],[-469,-396],[-547,-342],[-627,-366]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":14,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":5.462,"s":[0]},{"t":37.76953125,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":3.308,"s":[0]},{"t":35.615234375,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim In Out Path","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":0,"ind":10,"ty":3,"nm":"Null 1","sr":1,"ks":{"o":{"a":0,"k":0,"ix":11},"r":{"a":0,"k":184,"ix":10},"p":{"a":0,"k":[633,1188,0],"ix":2},"a":{"a":0,"k":[12,-198,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ip":0,"op":112,"st":0,"bm":0},{"ddd":1,"ind":11,"ty":4,"nm":"Shape Layer 41","parent":10,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-11,"s":[0]},{"t":87.9189453125,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10,"x":"var $bm_rt;\n$bm_rt = transform.rotation;"},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0.179,"s":[6.395,-188.007,0],"to":[3.99,-626.075,396.962],"ti":[-3.99,626.075,-396.962]},{"t":34.7802734375,"s":[30.337,-3944.458,2381.774]}],"ix":2},"a":{"a":0,"k":[56.08,-285.558,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7,-27],[35,7],[-41.906,32.862],[0,0]],"o":[[-7,27],[32,27],[23.167,-18.167],[0,0]],"v":[[72,-317],[4,-279],[91,-263.167],[107.167,-289.667]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.345,0.381,0.671,0.5,0.491,0.265,0.624,1,0.638,0.15,0.577],"ix":9}},"s":{"a":0,"k":[0,0],"ix":5},"e":{"a":0,"k":[100,0],"ix":6},"t":1,"nm":"Gradient Fill 1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":12,"ty":4,"nm":"Shape Layer 40","parent":10,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-2.293,"s":[0]},{"t":80.50390625,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0.179,"s":[6.395,-188.007,0],"to":[172.235,-647.46,153.434],"ti":[-172.235,647.46,-153.434]},{"t":80,"s":[1039.806,-4072.764,920.605]}],"ix":2},"a":{"a":0,"k":[-262,-435,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[46,54],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.969,0.18,0.404,0.5,0.97,0.346,0.318,1,0.972,0.512,0.233],"ix":9}},"s":{"a":0,"k":[-49,0],"ix":5},"e":{"a":0,"k":[68,0],"ix":6},"t":1,"nm":"Gradient Fill 1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-262,-435],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":13,"ty":4,"nm":"Shape Layer 39","parent":10,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0.179,"s":[0]},{"t":91.6259765625,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0.179,"s":[6.395,-188.007,0],"to":[140.553,-166.199,-42.398],"ti":[-140.553,166.199,42.398]},{"t":15.0078125,"s":[849.715,-1185.203,-254.39]}],"ix":2},"a":{"a":0,"k":[14.5,-433,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[27,96],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.22745098039215686,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[14.5,-433],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":0,"ind":14,"ty":3,"nm":"Null 2","sr":1,"ks":{"o":{"a":0,"k":0,"ix":11},"r":{"a":0,"k":-49,"ix":10},"p":{"a":0,"k":[621,1344,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ip":0,"op":112,"st":-4,"bm":0},{"ddd":0,"ind":15,"ty":3,"nm":"Null 3","sr":1,"ks":{"o":{"a":0,"k":0,"ix":11},"r":{"a":0,"k":82,"ix":10},"p":{"a":0,"k":[621,1344,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ip":0,"op":112,"st":-4,"bm":0},{"ddd":1,"ind":16,"ty":4,"nm":"Shape Layer 105","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-11,"s":[0]},{"t":87.6826171875,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10,"x":"var $bm_rt;\n$bm_rt = transform.rotation;"},"or":{"a":0,"k":[0,0,135],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-112.965,-122.431,0],"to":[727.321,51.433,435.455],"ti":[-727.321,-51.433,-435.455]},{"t":34.544921875,"s":[4250.962,186.167,2612.729]}],"ix":2},"a":{"a":0,"k":[56.08,-285.558,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7,-27],[35,7],[-41.906,32.862],[0,0]],"o":[[-7,27],[32,27],[23.167,-18.167],[0,0]],"v":[[72,-317],[4,-279],[91,-263.167],[107.167,-289.667]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.345,0.381,0.671,0.5,0.491,0.265,0.624,1,0.638,0.15,0.577],"ix":9}},"s":{"a":0,"k":[0,0],"ix":5},"e":{"a":0,"k":[100,0],"ix":6},"t":1,"nm":"Gradient Fill 1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":17,"ty":4,"nm":"Shape Layer 104","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-2.293,"s":[0]},{"t":80.50390625,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,135],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-112.965,-122.431,0],"to":[527.848,55.985,153.434],"ti":[-527.848,-55.985,-153.434]},{"t":54.552734375,"s":[3054.124,213.477,920.605]}],"ix":2},"a":{"a":0,"k":[-262,-435,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[46,54],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.969,0.18,0.404,0.5,0.97,0.346,0.318,1,0.972,0.512,0.233],"ix":9}},"s":{"a":0,"k":[-49,0],"ix":5},"e":{"a":0,"k":[68,0],"ix":6},"t":1,"nm":"Gradient Fill 1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-262,-435],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":18,"ty":4,"nm":"Shape Layer 103","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":91.6259765625,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,135],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-112.965,-122.431,0],"to":[4.145,138.496,-42.398],"ti":[-4.145,-138.496,42.398]},{"t":15.0078125,"s":[-88.093,708.543,-254.39]}],"ix":2},"a":{"a":0,"k":[14.5,-433,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[27,96],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.22745098039215686,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[14.5,-433],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":19,"ty":4,"nm":"Shape Layer 102","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-3.528,"s":[0]},{"t":94.09765625,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,135],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":-0.179,"s":[-112.965,-122.431,0],"to":[-61.615,187.567,26.907],"ti":[61.615,-187.567,-26.907]},{"t":31.0732421875,"s":[-482.654,1002.974,161.442]}],"ix":2},"a":{"a":0,"k":[-180.917,-577,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[36,32],[26,-104]],"o":[[0,0],[-36,-32],[-11.157,44.627]],"v":[[-161,-650],[-193,-562],[-165,-504]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":14,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":20,"ty":4,"nm":"Shape Layer 101","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-1.057,"s":[0]},{"t":84.2109375,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,135],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.824},"o":{"x":0.167,"y":0.167},"t":0,"s":[-112.965,-122.431,0],"to":[-90.863,90.863,0],"ti":[88.083,-357.903,-768.642]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.164},"t":17.479,"s":[-658.144,422.748,0],"to":[-84.157,341.951,734.383],"ti":[-714.89,-84.078,-197.259]},{"t":86.6826171875,"s":[3631.196,927.217,1183.551]}],"ix":2},"a":{"a":0,"k":[-45,-602,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[40,40],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.17254901960784313,0.5529411764705883,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-45,-602],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":21,"ty":4,"nm":"Shape Layer 100","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-2.293,"s":[0]},{"t":100.2763671875,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,135],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.796},"o":{"x":0.167,"y":0.167},"t":0,"s":[-112.965,-122.431,0],"to":[-134.704,42.073,0],"ti":[7.203,-205.415,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.157},"t":28,"s":[-921.188,130.006,0],"to":[-19.567,558.035,0],"ti":[-540.328,-229.432,0]},{"t":116,"s":[2320.778,1506.598,0]}],"ix":2},"a":{"a":0,"k":[232.5,-595.5,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[11,67],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.17254901960784313,0.5529411764705883,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[232.5,-595.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":22,"ty":4,"nm":"Shape Layer 99","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":86.6826171875,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,135],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.775},"o":{"x":0.167,"y":0.167},"t":0,"s":[-112.965,-122.431,0],"to":[-115.257,9.245,0],"ti":[52.068,-163.912,-53.249]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.155},"t":19.951,"s":[-804.504,-66.963,0],"to":[-48.777,153.551,49.883],"ti":[-156.371,-109.917,-25.485]},{"t":91,"s":[2733.865,1051.661,319.492]}],"ix":2},"a":{"a":0,"k":[120,-142,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[32,44],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.22745098039215686,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[120,-142],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":23,"ty":4,"nm":"Shape Layer 98","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-2.293,"s":[0]},{"t":146,"s":[1440]}],"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-2.293,"s":[0]},{"t":146,"s":[1440]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,135],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.855},"o":{"x":0.167,"y":0.167},"t":0,"s":[-112.965,-122.431,0],"to":[-138.996,-53.461,0],"ti":[-421.763,15.031,16.673]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.174},"t":21.187,"s":[-946.942,-443.198,0],"to":[421.763,-15.031,-16.673],"ti":[-560.76,-38.43,16.673]},{"t":100.2763671875,"s":[2417.616,-212.616,-100.037]}],"ix":2},"a":{"a":0,"k":[116,-254,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[26,56],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[116,-254],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":24,"ty":4,"nm":"Shape Layer 97","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":144.7646484375,"s":[1080]}],"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":144.7646484375,"s":[59]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,311],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.673},"o":{"x":0.167,"y":0.167},"t":0,"s":[-137.695,-128.17,0],"to":[-87.16,25.736,-45.544],"ti":[-273.542,-218.754,122.377]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.14},"t":31.073,"s":[-660.653,26.246,-273.265],"to":[129.994,103.957,-58.156],"ti":[-320.287,-255.677,-112.981]},{"t":111.3984375,"s":[3683.402,989.215,1150.251]}],"ix":2},"a":{"a":0,"k":[56.08,-285.558,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[3.444,9.757]],"o":[[0,0],[0,0],[0,0],[-4.941,-14]],"v":[[72,-317],[4,-279],[24.151,-217.936],[88.307,-269.617]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.345,0.381,0.671,0.5,0.491,0.265,0.624,1,0.638,0.15,0.577],"ix":9}},"s":{"a":0,"k":[0,0],"ix":5},"e":{"a":0,"k":[100,0],"ix":6},"t":1,"nm":"Gradient Fill 1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":25,"ty":4,"nm":"Shape Layer 96","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-9,"s":[0]},{"t":89.154296875,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,311],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.853},"o":{"x":0.167,"y":0.167},"t":0,"s":[-89.038,-0.153,0],"to":[-552.568,-84.135,-9.152],"ti":[-1514.035,-462.134,43.281]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.183},"t":38,"s":[95.207,-392.324,-54.91],"to":[684.779,209.018,-19.576],"ti":[-315.276,-115.122,160.297]},{"t":97,"s":[1986.864,298.408,-1016.689]}],"ix":2},"a":{"a":0,"k":[-262,-435,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[46,54],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.969,0.18,0.404,0.5,0.97,0.346,0.318,1,0.972,0.512,0.233],"ix":9}},"s":{"a":0,"k":[-49,0],"ix":5},"e":{"a":0,"k":[68,0],"ix":6},"t":1,"nm":"Gradient Fill 1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-262,-435],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":26,"ty":4,"nm":"Shape Layer 95","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-14,"s":[0]},{"t":81.740234375,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,311],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.774},"o":{"x":0.167,"y":0.167},"t":0,"s":[-137.695,-128.17,0],"to":[-110.347,-144.949,-65.532],"ti":[-365.662,-268.839,-214.28]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.147},"t":26,"s":[-799.777,-997.863,-393.192],"to":[365.662,268.839,214.28],"ti":[-476.009,-413.788,-279.812]},{"t":76.796875,"s":[2056.275,1484.866,1285.683]}],"ix":2},"a":{"a":0,"k":[14.5,-433,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[27,96],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.22745098039215686,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[14.5,-433],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":27,"ty":4,"nm":"Shape Layer 94","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-9,"s":[0]},{"t":100.2763671875,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,311],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-137.695,-128.17,0],"to":[-90.481,-247.593,46.629],"ti":[90.481,247.593,-46.629]},{"t":44,"s":[-680.583,-1613.73,279.773]}],"ix":2},"a":{"a":0,"k":[-180.917,-577,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[36,32],[26,-104]],"o":[[0,0],[-36,-32],[-11.157,44.627]],"v":[[-161,-650],[-193,-562],[-165,-504]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":14,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":28,"ty":4,"nm":"Shape Layer 93","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-3.528,"s":[0]},{"t":91.6259765625,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,311],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-137.695,-128.17,0],"to":[69.003,-110.281,-16.168],"ti":[-69.003,110.281,16.168]},{"t":32,"s":[276.323,-789.855,-97.005]}],"ix":2},"a":{"a":0,"k":[-45,-602,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[40,40],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.17254901960784313,0.5529411764705883,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-45,-602],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":29,"ty":4,"nm":"Shape Layer 92","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-10,"s":[0]},{"t":81.740234375,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,311],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-137.695,-128.17,0],"to":[305.417,119.743,41.862],"ti":[-305.417,-119.743,-41.862]},{"t":27,"s":[1694.805,590.289,251.17]}],"ix":2},"a":{"a":0,"k":[232.5,-595.5,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[11,67],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.17254901960784313,0.5529411764705883,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[232.5,-595.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":30,"ty":4,"nm":"Shape Layer 91","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-2.293,"s":[0]},{"t":86.6826171875,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,311],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-137.695,-128.17,0],"to":[318.521,75.426,-43.518],"ti":[-318.521,-75.426,43.518]},{"t":24,"s":[1773.433,324.385,-261.107]}],"ix":2},"a":{"a":0,"k":[120,-142,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[32,44],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.22745098039215686,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[120,-142],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":31,"ty":4,"nm":"Shape Layer 90","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-4.765,"s":[0]},{"t":89.154296875,"s":[1080]}],"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":89.154296875,"s":[1800]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,311],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-137.695,-128.17,0],"to":[77.354,134.863,-215.584],"ti":[-77.354,-134.863,215.584]},{"t":27.3662109375,"s":[326.43,681.005,-1293.506]}],"ix":2},"a":{"a":0,"k":[116,-254,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[26,56],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[116,-254],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":32,"ty":4,"nm":"Shape Layer 89","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-1.057,"s":[0]},{"t":102.748046875,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10,"x":"var $bm_rt;\n$bm_rt = transform.rotation;"},"or":{"a":0,"k":[0,0,135],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-112.965,-122.431,0],"to":[301.698,164.851,-47.459],"ti":[-301.698,-164.851,47.459]},{"t":103.9833984375,"s":[1697.223,866.674,-284.755]}],"ix":2},"a":{"a":0,"k":[56.08,-285.558,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[84.659,-333.362],[4,-279],[45.665,-243.617],[119.735,-297.935]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.345,0.381,0.671,0.5,0.491,0.265,0.624,1,0.638,0.15,0.577],"ix":9}},"s":{"a":0,"k":[0,0],"ix":5},"e":{"a":0,"k":[100,0],"ix":6},"t":1,"nm":"Gradient Fill 1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":33,"ty":4,"nm":"Shape Layer 88","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-17,"s":[0]},{"t":95.3330078125,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,135],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-112.965,-122.431,0],"to":[159.503,223.195,-0.572],"ti":[-159.503,-223.195,0.572]},{"t":37.251953125,"s":[844.051,1216.741,-3.43]}],"ix":2},"a":{"a":0,"k":[-262,-435,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[46,54],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.969,0.18,0.404,0.5,0.97,0.346,0.318,1,0.972,0.512,0.233],"ix":9}},"s":{"a":0,"k":[-49,0],"ix":5},"e":{"a":0,"k":[68,0],"ix":6},"t":1,"nm":"Gradient Fill 1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-262,-435],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":34,"ty":4,"nm":"Shape Layer 87","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-11,"s":[0]},{"t":101.51171875,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,135],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-112.965,-122.431,0],"to":[33.76,196.346,-7.096],"ti":[-33.76,-196.346,7.096]},{"t":40.958984375,"s":[89.594,1055.648,-42.576]}],"ix":2},"a":{"a":0,"k":[14.5,-433,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[27,96],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.22745098039215686,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[14.5,-433],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":35,"ty":4,"nm":"Shape Layer 86","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-11,"s":[0]},{"t":85.447265625,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,135],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-112.965,-122.431,0],"to":[-16.649,163.663,0],"ti":[16.649,-163.663,0]},{"t":24.89453125,"s":[-212.861,859.547,0]}],"ix":2},"a":{"a":0,"k":[-180.917,-577,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[36,32],[26,-104]],"o":[[0,0],[-36,-32],[-11.157,44.627]],"v":[[-161,-650],[-193,-562],[-165,-504]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":14,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":36,"ty":4,"nm":"Shape Layer 85","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-3.528,"s":[0]},{"t":101.51171875,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,135],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-112.965,-122.431,0],"to":[-71.747,128.05,0],"ti":[71.747,-128.05,0]},{"t":49.609375,"s":[-543.449,645.87,0]}],"ix":2},"a":{"a":0,"k":[-45,-602,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[40,40],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.17254901960784313,0.5529411764705883,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-45,-602],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":37,"ty":4,"nm":"Shape Layer 84","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-4.765,"s":[0]},{"t":112.6337890625,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,135],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.728},"o":{"x":0.167,"y":0.167},"t":0,"s":[-112.965,-122.431,0],"to":[-81.837,27.324,33.544],"ti":[-153.275,-262.436,-33.544]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.131},"t":21,"s":[-603.986,41.512,201.262],"to":[153.275,262.436,33.544],"ti":[-235.112,-235.112,0]},{"t":50.845703125,"s":[806.688,1452.185,201.262]}],"ix":2},"a":{"a":0,"k":[232.5,-595.5,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[11,67],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.17254901960784313,0.5529411764705883,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[232.5,-595.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":38,"ty":4,"nm":"Shape Layer 83","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-6,"s":[0]},{"t":85.447265625,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,135],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.652},"o":{"x":0.167,"y":0.167},"t":0,"s":[-112.965,-122.431,0],"to":[-171.831,20.57,3.486],"ti":[602.026,-193.886,-848.553]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.142},"t":35,"s":[-1143.953,0.988,20.917],"to":[-778.519,946.911,884.934],"ti":[-1189.71,-488.979,-884.978]},{"t":139,"s":[5994.306,2934.863,5330.786]}],"ix":2},"a":{"a":0,"k":[120,-142,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[32,44],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.22745098039215686,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[120,-142],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":39,"ty":4,"nm":"Shape Layer 82","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-23,"s":[0]},{"t":97.8046875,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,135],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.883},"o":{"x":0.167,"y":0.167},"t":0,"s":[-112.965,-122.431,0],"to":[-120.682,-96.313,17.582],"ti":[57.484,-266.769,15.802]},{"i":{"x":0.833,"y":0.817},"o":{"x":0.167,"y":0.198},"t":15.008,"s":[-837.059,-700.31,105.493],"to":[-25.433,118.027,-6.991],"ti":[-511.749,-461.825,46.841]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.143},"t":54.553,"s":[271.713,386.113,403.89],"to":[308.693,278.579,-28.255],"ti":[-142.63,-100.689,10.833]},{"t":76.796875,"s":[1060.877,1065.009,-67.253]}],"ix":2},"a":{"a":0,"k":[116,-254,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[26,56],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[116,-254],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":40,"ty":4,"nm":"Shape Layer 81","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-12,"s":[0]},{"t":102.748046875,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,311],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-137.695,-128.17,0],"to":[135.751,-389.001,217.62],"ti":[-135.751,389.001,-217.62]},{"t":27,"s":[676.808,-2462.175,1305.721]}],"ix":2},"a":{"a":0,"k":[56.08,-285.558,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7,-27],[35,7],[-41.906,32.862],[0,0]],"o":[[-7,27],[32,27],[23.167,-18.167],[0,0]],"v":[[72,-317],[4,-279],[91,-263.167],[107.167,-289.667]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.345,0.381,0.671,0.5,0.491,0.265,0.624,1,0.638,0.15,0.577],"ix":9}},"s":{"a":0,"k":[0,0],"ix":5},"e":{"a":0,"k":[100,0],"ix":6},"t":1,"nm":"Gradient Fill 1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":41,"ty":4,"nm":"Shape Layer 80","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-25,"s":[0]},{"t":81.740234375,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,311],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.849},"o":{"x":0.167,"y":0.167},"t":0,"s":[-137.695,-128.17,0],"to":[-70.649,26.407,0],"ti":[-291.085,-122.356,90.248]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.171},"t":16,"s":[-561.59,30.269,0],"to":[291.085,122.356,-90.248],"ti":[-361.735,-95.95,90.248]},{"t":82.9755859375,"s":[1608.818,605.966,-541.488]}],"ix":2},"a":{"a":0,"k":[-262,-435,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[46,54],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.969,0.18,0.404,0.5,0.97,0.346,0.318,1,0.972,0.512,0.233],"ix":9}},"s":{"a":0,"k":[-49,0],"ix":5},"e":{"a":0,"k":[68,0],"ix":6},"t":1,"nm":"Gradient Fill 1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-262,-435],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":42,"ty":4,"nm":"Shape Layer 79","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":95.3330078125,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,311],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.704},"o":{"x":0.167,"y":0.167},"t":0,"s":[-137.695,-128.17,0],"to":[-49.159,-63.557,4.223],"ti":[-0.005,148.838,-20.562]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.144},"t":24,"s":[-432.65,-509.511,25.34],"to":[0.017,-477.286,65.936],"ti":[-415.767,197.78,-61.713]},{"t":91.6259765625,"s":[2061.954,-1696.192,395.618]}],"ix":2},"a":{"a":0,"k":[14.5,-433,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[27,96],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.22745098039215686,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[14.5,-433],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":43,"ty":4,"nm":"Shape Layer 78","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-20,"s":[0]},{"t":87.9189453125,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,311],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-137.695,-128.17,0],"to":[33.977,-166.361,22.596],"ti":[-33.977,166.361,-22.596]},{"t":30,"s":[66.167,-1126.338,135.575]}],"ix":2},"a":{"a":0,"k":[-180.917,-577,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[36,32],[26,-104]],"o":[[0,0],[-36,-32],[-11.157,44.627]],"v":[[-161,-650],[-193,-562],[-165,-504]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":14,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":44,"ty":4,"nm":"Shape Layer 77","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-16,"s":[0]},{"t":99.041015625,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,311],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-137.695,-128.17,0],"to":[345.992,-256.663,189.679],"ti":[-345.992,256.663,-189.679]},{"t":27,"s":[1938.258,-1668.151,1138.074]}],"ix":2},"a":{"a":0,"k":[-45,-602,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[40,40],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.17254901960784313,0.5529411764705883,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-45,-602],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":45,"ty":4,"nm":"Shape Layer 76","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-2.293,"s":[0]},{"t":45.90234375,"s":[1080]}],"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-3.528,"s":[0]},{"t":105.2197265625,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,311],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.826},"o":{"x":0.167,"y":0.167},"t":0,"s":[-137.695,-128.17,0],"to":[120.875,-60.552,0],"ti":[-340.061,254.939,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.163},"t":27.366,"s":[587.554,-491.48,0],"to":[340.061,-254.939,0],"ti":[-219.187,194.387,0]},{"t":82.9755859375,"s":[1902.674,-1657.802,0]}],"ix":2},"a":{"a":0,"k":[232.5,-595.5,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[11,67],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.17254901960784313,0.5529411764705883,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[232.5,-595.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":46,"ty":4,"nm":"Shape Layer 75","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-18,"s":[0]},{"t":86.6826171875,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,311],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.926},"o":{"x":0.167,"y":0.167},"t":0,"s":[-137.695,-128.17,0],"to":[208.471,-17.277,73.2],"ti":[-257.939,74.184,269.358]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.228},"t":15.897,"s":[1113.129,-231.834,439.203],"to":[257.939,-74.184,-269.358],"ti":[-49.469,56.907,342.559]},{"t":90,"s":[1409.942,-573.277,-1616.149]}],"ix":2},"a":{"a":0,"k":[120,-142,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[32,44],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.22745098039215686,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[120,-142],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":47,"ty":4,"nm":"Shape Layer 74","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-24,"s":[0]},{"t":94.09765625,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,311],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-137.695,-128.17,0],"to":[308.185,154.066,17.938],"ti":[-308.185,-154.066,-17.938]},{"t":24.89453125,"s":[1711.415,796.226,107.63]}],"ix":2},"a":{"a":0,"k":[116,-254,0],"ix":1},"s":{"a":0,"k":[51,51,51],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[26,56],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[116,-254],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":48,"ty":4,"nm":"Shape Layer 73","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-11,"s":[0]},{"t":87.9189453125,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10,"x":"var $bm_rt;\n$bm_rt = transform.rotation;"},"or":{"a":0,"k":[0,0,184],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[18.288,-165.578,0],"to":[-47.653,624.272,396.962],"ti":[47.653,-624.272,-396.962]},{"t":34.7802734375,"s":[-267.632,3580.053,2381.774]}],"ix":2},"a":{"a":0,"k":[56.08,-285.558,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7,-27],[35,7],[-41.906,32.862],[0,0]],"o":[[-7,27],[32,27],[23.167,-18.167],[0,0]],"v":[[72,-317],[4,-279],[91,-263.167],[107.167,-289.667]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.345,0.381,0.671,0.5,0.491,0.265,0.624,1,0.638,0.15,0.577],"ix":9}},"s":{"a":0,"k":[0,0],"ix":5},"e":{"a":0,"k":[100,0],"ix":6},"t":1,"nm":"Gradient Fill 1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":49,"ty":4,"nm":"Shape Layer 72","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-2.293,"s":[0]},{"t":80.50390625,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,184],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[18.288,-165.578,0],"to":[-143.363,403.815,153.434],"ti":[143.363,-403.815,-153.434]},{"t":54.552734375,"s":[-841.892,2257.314,920.605]}],"ix":2},"a":{"a":0,"k":[-262,-435,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[46,54],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.969,0.18,0.404,0.5,0.97,0.346,0.318,1,0.972,0.512,0.233],"ix":9}},"s":{"a":0,"k":[-49,0],"ix":5},"e":{"a":0,"k":[68,0],"ix":6},"t":1,"nm":"Gradient Fill 1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-262,-435],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":50,"ty":4,"nm":"Shape Layer 71","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":91.6259765625,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,184],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[18.288,-165.578,0],"to":[-196.222,199.787,-42.398],"ti":[196.222,-199.787,42.398]},{"t":32.30859375,"s":[-1159.042,1033.147,-254.39]}],"ix":2},"a":{"a":0,"k":[14.5,-433,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[27,96],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.22745098039215686,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[14.5,-433],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":51,"ty":4,"nm":"Shape Layer 70","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-3.528,"s":[0]},{"t":94.09765625,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,184],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.868},"o":{"x":0.167,"y":0.167},"t":0,"s":[18.288,-165.578,0],"to":[-181.982,76.554,26.907],"ti":[353.39,-64.568,-26.907]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.207},"t":31.073,"s":[-1073.604,293.746,161.442],"to":[-353.39,64.568,26.907],"ti":[171.408,11.986,0]},{"t":73.08984375,"s":[-2102.054,221.83,161.442]}],"ix":2},"a":{"a":0,"k":[-180.917,-577,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[36,32],[26,-104]],"o":[[0,0],[-36,-32],[-11.157,44.627]],"v":[[-161,-650],[-193,-562],[-165,-504]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":14,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":52,"ty":4,"nm":"Shape Layer 69","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-1.057,"s":[0]},{"t":84.2109375,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,184],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[18.288,-165.578,0],"to":[-128.187,-8.964,0],"ti":[128.187,8.964,0]},{"t":33,"s":[-750.834,-219.36,0]}],"ix":2},"a":{"a":0,"k":[-45,-602,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[40,40],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.17254901960784313,0.5529411764705883,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-45,-602],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":53,"ty":4,"nm":"Shape Layer 68","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-2.293,"s":[0]},{"t":100.2763671875,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,184],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[18.288,-165.578,0],"to":[-120.126,-74.06,0],"ti":[120.126,74.06,0]},{"t":39,"s":[-702.471,-609.938,0]}],"ix":2},"a":{"a":0,"k":[232.5,-595.5,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[11,67],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.17254901960784313,0.5529411764705883,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[232.5,-595.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":54,"ty":4,"nm":"Shape Layer 67","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":86.6826171875,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,184],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.723},"o":{"x":0.167,"y":0.167},"t":0,"s":[18.288,-165.578,0],"to":[-82.592,-80.92,0],"ti":[157.866,-68.24,-53.249]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.139},"t":27,"s":[-477.265,-651.099,0],"to":[-147.887,63.926,49.883],"ti":[-19.633,-190.127,-25.485]},{"t":80.50390625,"s":[-147.831,2175.133,319.492]}],"ix":2},"a":{"a":0,"k":[120,-142,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[32,44],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.22745098039215686,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[120,-142],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":55,"ty":4,"nm":"Shape Layer 66","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-2.293,"s":[0]},{"t":146,"s":[1440]}],"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-2.293,"s":[0]},{"t":146,"s":[1440]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,184],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.749},"o":{"x":0.167,"y":0.167},"t":0,"s":[18.288,-165.578,0],"to":[-50.842,-139.975,0],"ti":[92.088,-447.218,16.673]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.14},"t":36,"s":[-286.764,-1005.43,0],"to":[-92.088,447.218,-16.673],"ti":[41.246,-587.193,16.673]},{"t":100.2763671875,"s":[-534.238,2517.728,-100.037]}],"ix":2},"a":{"a":0,"k":[116,-254,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[26,56],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[116,-254],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":56,"ty":4,"nm":"Shape Layer 65","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":144.7646484375,"s":[1080]}],"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":144.7646484375,"s":[59]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.767},"o":{"x":0.167,"y":0.167},"t":0,"s":[6.395,-188.007,0],"to":[-6.333,-132.667,0],"ti":[83.687,200.398,-334.198]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.153},"t":26,"s":[-31.605,-984.007,0],"to":[-63.434,-151.901,253.321],"ti":[-17.165,-409.463,-112.981]},{"t":111.3984375,"s":[283.153,3184.715,1150.251]}],"ix":2},"a":{"a":0,"k":[56.08,-285.558,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[3.444,9.757]],"o":[[0,0],[0,0],[0,0],[-4.941,-14]],"v":[[72,-317],[4,-279],[24.151,-217.936],[88.307,-269.617]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.671,0.345,0.345,0.5,0.655,0.247,0.461,1,0.638,0.15,0.577],"ix":9}},"s":{"a":0,"k":[0,0],"ix":5},"e":{"a":0,"k":[100,0],"ix":6},"t":1,"nm":"Gradient Fill 1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":57,"ty":4,"nm":"Shape Layer 64","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-9,"s":[0]},{"t":89.154296875,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.836},"o":{"x":0.167,"y":0.167},"t":0,"s":[6.395,-188.007,0],"to":[64.5,-169.594,-9.152],"ti":[-113.79,-117.061,113.731]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.168},"t":27,"s":[393.395,-1205.571,-54.91],"to":[155.887,160.368,-155.806],"ti":[28,-314.6,160.297]},{"t":79,"s":[225.395,682.029,-1016.689]}],"ix":2},"a":{"a":0,"k":[-262,-435,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[46,54],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.969,0.18,0.404,0.5,0.97,0.346,0.318,1,0.972,0.512,0.233],"ix":9}},"s":{"a":0,"k":[-49,0],"ix":5},"e":{"a":0,"k":[68,0],"ix":6},"t":1,"nm":"Gradient Fill 1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-262,-435],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":58,"ty":4,"nm":"Shape Layer 63","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-14,"s":[0]},{"t":81.740234375,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.787},"o":{"x":0.167,"y":0.167},"t":0,"s":[6.395,-188.007,0],"to":[37,-178.375,-65.532],"ti":[-37,-452.343,-214.28]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.151},"t":28,"s":[228.395,-1258.256,-393.192],"to":[37,452.343,214.28],"ti":[0,-630.718,-279.812]},{"t":88,"s":[228.395,2526.051,1285.683]}],"ix":2},"a":{"a":0,"k":[14.5,-433,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[27,96],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.22745098039215686,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[14.5,-433],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":59,"ty":4,"nm":"Shape Layer 62","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-9,"s":[0]},{"t":100.2763671875,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[6.395,-188.007,0],"to":[127.5,-230.723,46.629],"ti":[-127.5,230.723,-46.629]},{"t":38,"s":[771.395,-1572.344,279.773]}],"ix":2},"a":{"a":0,"k":[-180.917,-577,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[36,32],[26,-104]],"o":[[0,0],[-36,-32],[-11.157,44.627]],"v":[[-161,-650],[-193,-562],[-165,-504]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":14,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":60,"ty":4,"nm":"Shape Layer 61","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-3.528,"s":[0]},{"t":91.6259765625,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[6.395,-188.007,0],"to":[259.979,-20.273,-16.168],"ti":[-259.979,20.273,16.168]},{"t":19,"s":[1566.267,-309.648,-97.005]}],"ix":2},"a":{"a":0,"k":[-45,-602,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[40,40],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.17254901960784313,0.5529411764705883,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-45,-602],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":61,"ty":4,"nm":"Shape Layer 60","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-10,"s":[0]},{"t":81.740234375,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[6.395,-188.007,0],"to":[110,309.06,41.862],"ti":[-110,-309.06,-41.862]},{"t":31,"s":[666.395,1666.35,251.17]}],"ix":2},"a":{"a":0,"k":[232.5,-595.5,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[11,67],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.17254901960784313,0.5529411764705883,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[232.5,-595.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":62,"ty":4,"nm":"Shape Layer 59","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-2.293,"s":[0]},{"t":86.6826171875,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[6.395,-188.007,0],"to":[111,205.897,-43.518],"ti":[-111,-205.897,43.518]},{"t":33,"s":[672.395,1047.376,-261.107]}],"ix":2},"a":{"a":0,"k":[120,-142,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[32,44],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.22745098039215686,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[120,-142],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":63,"ty":4,"nm":"Shape Layer 58","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-4.765,"s":[0]},{"t":89.154296875,"s":[1080]}],"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":89.154296875,"s":[1800]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[6.395,-188.007,0],"to":[14.845,244.879,-215.584],"ti":[-14.845,-244.879,215.584]},{"t":27.3662109375,"s":[95.463,1281.264,-1293.506]}],"ix":2},"a":{"a":0,"k":[116,-254,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[26,56],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[116,-254],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":64,"ty":4,"nm":"Shape Layer 57","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-1.057,"s":[0]},{"t":102.748046875,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10,"x":"var $bm_rt;\n$bm_rt = transform.rotation;"},"or":{"a":0,"k":[0,0,184],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[18.288,-165.578,0],"to":[44.909,224.342,-47.459],"ti":[-44.909,-224.342,47.459]},{"t":58.259765625,"s":[287.74,1180.472,-284.755]}],"ix":2},"a":{"a":0,"k":[56.08,-285.558,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[84.659,-333.362],[4,-279],[45.665,-243.617],[119.735,-297.935]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.345,0.381,0.671,0.5,0.491,0.265,0.624,1,0.638,0.15,0.577],"ix":9}},"s":{"a":0,"k":[0,0],"ix":5},"e":{"a":0,"k":[100,0],"ix":6},"t":1,"nm":"Gradient Fill 1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":65,"ty":4,"nm":"Shape Layer 56","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-17,"s":[0]},{"t":95.3330078125,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,184],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[18.288,-165.578,0],"to":[-63.805,266.808,-0.572],"ti":[63.805,-266.808,0.572]},{"t":51,"s":[-364.539,1435.268,-3.43]}],"ix":2},"a":{"a":0,"k":[-262,-435,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[46,54],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.969,0.18,0.404,0.5,0.97,0.346,0.318,1,0.972,0.512,0.233],"ix":9}},"s":{"a":0,"k":[-49,0],"ix":5},"e":{"a":0,"k":[68,0],"ix":6},"t":1,"nm":"Gradient Fill 1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-262,-435],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":66,"ty":4,"nm":"Shape Layer 55","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-11,"s":[0]},{"t":101.51171875,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,184],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.877},"o":{"x":0.167,"y":0.167},"t":0,"s":[18.288,-165.578,0],"to":[-126.036,154.294,-7.096],"ti":[142.905,-395.535,7.096]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.203},"t":39,"s":[-737.928,760.184,-42.576],"to":[-142.905,395.535,-7.096],"ti":[16.869,-241.241,0]},{"t":117,"s":[-839.144,2207.633,-42.576]}],"ix":2},"a":{"a":0,"k":[14.5,-433,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[27,96],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.22745098039215686,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[14.5,-433],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":67,"ty":4,"nm":"Shape Layer 54","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-11,"s":[0]},{"t":85.447265625,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,184],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[18.288,-165.578,0],"to":[-233.472,311.697,-17.966],"ti":[233.472,-311.697,17.966]},{"t":24,"s":[-1382.547,1704.606,-107.798]}],"ix":2},"a":{"a":0,"k":[-180.917,-577,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[36,32],[26,-104]],"o":[[0,0],[-36,-32],[-11.157,44.627]],"v":[[-161,-650],[-193,-562],[-165,-504]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":14,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":68,"ty":4,"nm":"Shape Layer 53","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-3.528,"s":[0]},{"t":101.51171875,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,184],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.762},"o":{"x":0.167,"y":0.167},"t":0,"s":[18.288,-165.578,0],"to":[-130.292,21.146,0],"ti":[485.802,-51.233,12.363]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.14},"t":22,"s":[-763.467,-38.702,0],"to":[-485.802,51.233,-12.363],"ti":[355.509,-30.087,12.363]},{"t":57,"s":[-2896.522,141.82,-74.176]}],"ix":2},"a":{"a":0,"k":[-45,-602,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[40,40],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.17254901960784313,0.5529411764705883,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-45,-602],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":69,"ty":4,"nm":"Shape Layer 52","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-4.765,"s":[0]},{"t":112.6337890625,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,184],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.78},"o":{"x":0.167,"y":0.167},"t":0,"s":[18.288,-165.578,0],"to":[-74.311,-43.837,33.544],"ti":[97.505,-287.852,-33.544]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.149},"t":34,"s":[-427.58,-428.6,201.262],"to":[-97.505,287.852,33.544],"ti":[23.194,-331.689,0]},{"t":102,"s":[-566.743,1561.534,201.262]}],"ix":2},"a":{"a":0,"k":[232.5,-595.5,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[11,67],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.17254901960784313,0.5529411764705883,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[232.5,-595.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":70,"ty":4,"nm":"Shape Layer 51","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-6,"s":[0]},{"t":85.447265625,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,184],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[18.288,-165.578,0],"to":[-124.762,-149.834,3.486],"ti":[124.762,149.834,-3.486]},{"t":26,"s":[-730.286,-1064.579,20.917]}],"ix":2},"a":{"a":0,"k":[120,-142,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[32,44],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.22745098039215686,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[120,-142],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":71,"ty":4,"nm":"Shape Layer 50","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-23,"s":[0]},{"t":97.8046875,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,184],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.77},"o":{"x":0.167,"y":0.167},"t":0,"s":[18.288,-165.578,0],"to":[-6.486,-154.267,17.582],"ti":[239.046,-131.632,15.802]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.142},"t":30,"s":[-20.629,-1091.18,105.493],"to":[-105.762,58.238,-6.991],"ti":[-17.583,-173.702,10.833]},{"t":76.796875,"s":[-107.774,1499.363,-67.253]}],"ix":2},"a":{"a":0,"k":[116,-254,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[26,56],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[116,-254],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":72,"ty":4,"nm":"Shape Layer 49","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-12,"s":[0]},{"t":102.748046875,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[6.395,-188.007,0],"to":[382.643,-152.755,217.62],"ti":[-382.643,152.755,-217.62]},{"t":33,"s":[2302.253,-1104.538,1305.721]}],"ix":2},"a":{"a":0,"k":[56.08,-285.558,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7,-27],[35,7],[-41.906,32.862],[0,0]],"o":[[-7,27],[32,27],[23.167,-18.167],[0,0]],"v":[[72,-317],[4,-279],[91,-263.167],[107.167,-289.667]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.345,0.381,0.671,0.5,0.491,0.265,0.624,1,0.638,0.15,0.577],"ix":9}},"s":{"a":0,"k":[0,0],"ix":5},"e":{"a":0,"k":[100,0],"ix":6},"t":1,"nm":"Gradient Fill 1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":73,"ty":4,"nm":"Shape Layer 48","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-25,"s":[0]},{"t":81.740234375,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.831},"o":{"x":0.167,"y":0.167},"t":0,"s":[6.395,-188.007,0],"to":[64.5,-93.5,0],"ti":[-64.5,-194.5,90.248]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.166},"t":25,"s":[393.395,-749.007,0],"to":[64.5,194.5,-90.248],"ti":[0,-288,90.248]},{"t":82.9755859375,"s":[393.395,978.993,-541.488]}],"ix":2},"a":{"a":0,"k":[-262,-435,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[46,54],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.969,0.18,0.404,0.5,0.97,0.346,0.318,1,0.972,0.512,0.233],"ix":9}},"s":{"a":0,"k":[-49,0],"ix":5},"e":{"a":0,"k":[68,0],"ix":6},"t":1,"nm":"Gradient Fill 1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-262,-435],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":74,"ty":4,"nm":"Shape Layer 47","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":95.3330078125,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.885},"o":{"x":0.167,"y":0.167},"t":0,"s":[6.395,-188.007,0],"to":[65.626,-110,4.223],"ti":[-147.468,-10.238,-26.905]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.19},"t":20,"s":[400.149,-848.007,25.34],"to":[361.407,25.09,65.936],"ti":[-121.292,-241.908,-61.713]},{"t":91.6259765625,"s":[1127.898,603.439,395.618]}],"ix":2},"a":{"a":0,"k":[14.5,-433,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[27,96],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.22745098039215686,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[14.5,-433],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":75,"ty":4,"nm":"Shape Layer 46","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-20,"s":[0]},{"t":87.9189453125,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.816},"o":{"x":0.167,"y":0.167},"t":0,"s":[6.395,-188.007,0],"to":[147.845,-83.5,22.596],"ti":[-263.557,-41.975,24.609]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.159},"t":24,"s":[893.467,-689.007,135.575],"to":[408.719,65.094,-38.164],"ti":[88.693,-68.281,27.128]},{"t":74,"s":[-447.485,1243.193,-405.659]}],"ix":2},"a":{"a":0,"k":[-180.917,-577,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[36,32],[26,-104]],"o":[[0,0],[-36,-32],[-11.157,44.627]],"v":[[-161,-650],[-193,-562],[-165,-504]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":14,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":76,"ty":4,"nm":"Shape Layer 45","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-16,"s":[0]},{"t":99.041015625,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.875},"o":{"x":0.167,"y":0.167},"t":0,"s":[6.395,-188.007,0],"to":[217.737,24,189.679],"ti":[-563.841,-88.203,-189.679]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.201},"t":26,"s":[1312.816,-44.007,1138.074],"to":[563.841,88.203,189.679],"ti":[-346.104,-64.203,0]},{"t":76.796875,"s":[3389.44,341.208,1138.074]}],"ix":2},"a":{"a":0,"k":[-45,-602,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[40,40],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.17254901960784313,0.5529411764705883,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-45,-602],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":77,"ty":4,"nm":"Shape Layer 44","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-2.293,"s":[0]},{"t":45.90234375,"s":[1080]}],"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-3.528,"s":[0]},{"t":105.2197265625,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.866},"o":{"x":0.167,"y":0.167},"t":0,"s":[6.395,-188.007,0],"to":[125,51.5,0],"ti":[-125,-69.882,151.388]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.196},"t":27.366,"s":[756.395,120.993,0],"to":[125,69.882,-151.388],"ti":[0,-18.382,151.388]},{"t":72,"s":[756.395,231.284,-908.328]}],"ix":2},"a":{"a":0,"k":[232.5,-595.5,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[11,67],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.17254901960784313,0.5529411764705883,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[232.5,-595.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":78,"ty":4,"nm":"Shape Layer 43","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-18,"s":[0]},{"t":86.6826171875,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[6.395,-188.007,0],"to":[149.808,146,73.2],"ti":[-149.808,-146,-73.2]},{"t":26,"s":[905.246,687.993,439.203]}],"ix":2},"a":{"a":0,"k":[120,-142,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[32,44],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.22745098039215686,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[120,-142],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":79,"ty":4,"nm":"Shape Layer 42","parent":14,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-24,"s":[0]},{"t":94.09765625,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[6.395,-188.007,0],"to":[85.912,333.667,17.938],"ti":[-85.912,-333.667,-17.938]},{"t":24.89453125,"s":[521.87,1813.993,107.63]}],"ix":2},"a":{"a":0,"k":[116,-254,0],"ix":1},"s":{"a":0,"k":[64,64,64],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[26,56],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[116,-254],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":80,"ty":4,"nm":"Shape Layer 38","parent":10,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-3.528,"s":[0]},{"t":94.09765625,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[6.395,-188.007,0],"to":[176.199,-89.062,26.907],"ti":[-176.199,89.062,-26.907]},{"t":31.0732421875,"s":[1063.587,-722.379,161.442]}],"ix":2},"a":{"a":0,"k":[-180.917,-577,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[36,32],[26,-104]],"o":[[0,0],[-36,-32],[-11.157,44.627]],"v":[[-161,-650],[-193,-562],[-165,-504]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":14,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":81,"ty":4,"nm":"Shape Layer 37","parent":10,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-1.057,"s":[0]},{"t":84.2109375,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[6.395,-188.007,0],"to":[128.5,0,0],"ti":[-128.5,0,0]},{"t":30,"s":[777.395,-188.007,0]}],"ix":2},"a":{"a":0,"k":[-45,-602,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[40,40],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.17254901960784313,0.5529411764705883,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-45,-602],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":82,"ty":4,"nm":"Shape Layer 36","parent":10,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-2.293,"s":[0]},{"t":100.2763671875,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[6.395,-188.007,0],"to":[125,65.5,0],"ti":[-125,-65.5,0]},{"t":22,"s":[756.395,204.993,0]}],"ix":2},"a":{"a":0,"k":[232.5,-595.5,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[11,67],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.17254901960784313,0.5529411764705883,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[232.5,-595.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":83,"ty":4,"nm":"Shape Layer 35","parent":10,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":86.6826171875,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.782},"o":{"x":0.167,"y":0.167},"t":0,"s":[6.395,-188.007,0],"to":[88.036,74.962,0],"ti":[-235.276,83.183,-29.696]},{"i":{"x":0.833,"y":0.693},"o":{"x":0.167,"y":0.155},"t":30,"s":[534.609,261.763,0],"to":[283.126,-100.101,35.736],"ti":[32.848,188.294,-25.485]},{"t":123,"s":[-62.525,-2846.235,319.492]}],"ix":2},"a":{"a":0,"k":[120,-142,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[32,44],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.22745098039215686,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[120,-142],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":84,"ty":4,"nm":"Shape Layer 33","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":454.311,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":144.7646484375,"s":[59]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.737},"o":{"x":0.167,"y":0.167},"t":0,"s":[627.395,1155.993,0],"to":[42.167,-122.667,0],"ti":[-345.153,74.903,-198.64]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.151},"t":28,"s":[880.395,419.993,0],"to":[432.939,-93.953,249.162],"ti":[-17.165,-409.463,-112.981]},{"t":127,"s":[1064.167,5582.141,1150.251]}],"ix":2},"a":{"a":0,"k":[56.08,-285.558,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[3.444,9.757]],"o":[[0,0],[0,0],[0,0],[-4.941,-14]],"v":[[72,-317],[4,-279],[24.151,-217.936],[88.307,-269.617]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.22745098039215686,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":85,"ty":4,"nm":"Shape Layer 32","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-9,"s":[0]},{"t":89.154296875,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.841},"o":{"x":0.167,"y":0.167},"t":0,"s":[627.395,1155.993,0],"to":[21.5,-126.594,-9.152],"ti":[-109.46,-148.367,74.781]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.169},"t":25,"s":[756.395,396.429,-54.90999999999999],"to":[113.887,154.368,-77.806],"ti":[7.464,-520.935,-7.703]},{"t":124,"s":[711.613,3522.04,-8.689]}],"ix":2},"a":{"a":0,"k":[-262,-435,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[46,54],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.969,0.18,0.404,0.5,0.97,0.346,0.318,1,0.972,0.512,0.233],"ix":9}},"s":{"a":0,"k":[-49,0],"ix":5},"e":{"a":0,"k":[68,0],"ix":6},"t":1,"nm":"Gradient Fill 1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-262,-435],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":86,"ty":4,"nm":"Shape Layer 31","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-14,"s":[0]},{"t":81.740234375,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.843},"o":{"x":0.167,"y":0.167},"t":0,"s":[627.395,1155.993,0],"to":[37,-178.375,-65.532],"ti":[-48.635,-750.211,-214.28]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.169},"t":29,"s":[849.395,85.744,-393.192],"to":[48.635,750.211,214.28],"ti":[-11.635,-928.586,-279.812]},{"t":145,"s":[919.2079999999999,5657.262,1285.683]}],"ix":2},"a":{"a":0,"k":[14.5,-433,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[27,96],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.22745098039215686,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[14.5,-433],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":87,"ty":4,"nm":"Shape Layer 30","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-9,"s":[0]},{"t":100.2763671875,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[627.395,1155.993,0],"to":[127.5,-230.723,46.629],"ti":[-127.5,230.723,-46.629]},{"t":25,"s":[1392.395,-228.34400000000002,279.773]}],"ix":2},"a":{"a":0,"k":[-180.917,-577,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[36,32],[26,-104]],"o":[[0,0],[-36,-32],[-11.157,44.627]],"v":[[-161,-650],[-193,-562],[-165,-504]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":14,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":88,"ty":4,"nm":"Shape Layer 29","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-3.528,"s":[0]},{"t":91.6259765625,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[627.395,1155.993,0],"to":[128.5,-20.273,-16.168],"ti":[-128.5,20.273,16.168]},{"t":44,"s":[1398.395,1034.352,-97.005]}],"ix":2},"a":{"a":0,"k":[-45,-602,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[40,40],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.17254901960784313,0.5529411764705883,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-45,-602],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":89,"ty":4,"nm":"Shape Layer 28","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-10,"s":[0]},{"t":81.740234375,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[627.395,1155.993,0],"to":[110,309.06,41.862],"ti":[-110,-309.06,-41.862]},{"t":41,"s":[1287.395,3010.35,251.17]}],"ix":2},"a":{"a":0,"k":[232.5,-595.5,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[11,67],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.17254901960784313,0.5529411764705883,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[232.5,-595.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":90,"ty":4,"nm":"Shape Layer 27","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-2.293,"s":[0]},{"t":86.6826171875,"s":[1080]}],"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[627.395,1155.993,0],"to":[111,205.897,-43.518],"ti":[-111,-205.897,43.518]},{"t":31,"s":[1293.395,2391.376,-261.107]}],"ix":2},"a":{"a":0,"k":[120,-142,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[32,44],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.22745098039215686,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[120,-142],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":91,"ty":4,"nm":"Shape Layer 26","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-4.765,"s":[0]},{"t":89.154296875,"s":[1080]}],"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":89.154296875,"s":[1800]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[627.395,1155.993,0],"to":[1,335.659,-215.584],"ti":[-1,-335.659,215.584]},{"t":58,"s":[633.395,3169.948,-1293.506]}],"ix":2},"a":{"a":0,"k":[116,-254,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[26,56],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[116,-254],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":92,"ty":4,"nm":"Shape Layer 25","parent":10,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-1.057,"s":[0]},{"t":102.748046875,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10,"x":"var $bm_rt;\n$bm_rt = transform.rotation;"},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[6.395,-188.007,0],"to":[-147.439,-471.248,-47.459],"ti":[147.439,471.248,47.459]},{"t":137.349609375,"s":[-878.24,-3015.497,-284.755]}],"ix":2},"a":{"a":0,"k":[56.08,-285.558,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[84.659,-333.362],[4,-279],[45.665,-243.617],[119.735,-297.935]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.345,0.381,0.671,0.5,0.491,0.265,0.624,1,0.638,0.15,0.577],"ix":9}},"s":{"a":0,"k":[0,0],"ix":5},"e":{"a":0,"k":[100,0],"ix":6},"t":1,"nm":"Gradient Fill 1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":93,"ty":4,"nm":"Shape Layer 24","parent":10,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-17,"s":[0]},{"t":95.3330078125,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[6.395,-188.007,0],"to":[53.803,-474.312,-0.572],"ti":[-53.803,474.312,0.572]},{"t":71,"s":[329.216,-3033.882,-3.43]}],"ix":2},"a":{"a":0,"k":[-262,-435,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[46,54],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.969,0.18,0.404,0.5,0.97,0.346,0.318,1,0.972,0.512,0.233],"ix":9}},"s":{"a":0,"k":[-49,0],"ix":5},"e":{"a":0,"k":[68,0],"ix":6},"t":1,"nm":"Gradient Fill 1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-262,-435],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":0,"ind":94,"ty":4,"nm":"Shape Layer 23","parent":10,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[6.395,-188.007,0],"to":[436.949,-283.973,0],"ti":[-436.949,283.973,0]},{"t":71,"s":[2628.09,-1891.843,0]}],"ix":2},"a":{"a":0,"k":[14.5,-433,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[27,96],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.22745098039215686,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[14.5,-433],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":95,"ty":4,"nm":"Shape Layer 22","parent":10,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-11,"s":[0]},{"t":85.447265625,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[6.395,-188.007,0],"to":[127.5,-103.954,0],"ti":[-127.5,103.954,0]},{"t":34,"s":[771.395,-811.733,0]}],"ix":2},"a":{"a":0,"k":[-180.917,-577,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[36,32],[26,-104]],"o":[[0,0],[-36,-32],[-11.157,44.627]],"v":[[-161,-650],[-193,-562],[-165,-504]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":14,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":96,"ty":4,"nm":"Shape Layer 21","parent":10,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-3.528,"s":[0]},{"t":101.51171875,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[6.395,-188.007,0],"to":[128.5,-30.183,0],"ti":[-128.5,30.183,0]},{"t":26,"s":[777.395,-369.106,0]}],"ix":2},"a":{"a":0,"k":[-45,-602,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[40,40],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.17254901960784313,0.5529411764705883,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-45,-602],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":97,"ty":4,"nm":"Shape Layer 20","parent":10,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-4.765,"s":[0]},{"t":112.6337890625,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.716},"o":{"x":0.167,"y":0.167},"t":0,"s":[6.395,-188.007,0],"to":[77.188,38.547,33.544],"ti":[-71.564,470.424,-33.544]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.136},"t":35,"s":[469.524,43.272,201.262],"to":[71.564,-470.424,33.544],"ti":[5.624,508.971,0]},{"t":100,"s":[435.782,-3010.554,201.262]}],"ix":2},"a":{"a":0,"k":[232.5,-595.5,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[11,67],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.17254901960784313,0.5529411764705883,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[232.5,-595.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":98,"ty":4,"nm":"Shape Layer 19","parent":10,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-6,"s":[0]},{"t":85.447265625,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[6.395,-188.007,0],"to":[134.91,140.766,3.486],"ti":[-134.91,-140.766,-3.486]},{"t":21,"s":[815.857,656.587,20.917]}],"ix":2},"a":{"a":0,"k":[120,-142,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[32,44],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.22745098039215686,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[120,-142],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":99,"ty":4,"nm":"Shape Layer 18","parent":10,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-23,"s":[0]},{"t":97.8046875,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.828},"o":{"x":0.167,"y":0.167},"t":0,"s":[6.395,-188.007,0],"to":[17.232,153.439,17.582],"ti":[-229.282,147.986,15.802]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.165},"t":21,"s":[109.785,732.626,105.493],"to":[101.442,-65.474,-6.991],"ti":[29.657,172.052,10.833]},{"t":76.796875,"s":[76.884,-1982.01,-729.705]}],"ix":2},"a":{"a":0,"k":[116,-254,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[26,56],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[116,-254],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":100,"ty":4,"nm":"Shape Layer 17","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-12,"s":[0]},{"t":102.748046875,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[627.395,1155.993,0],"to":[382.643,-152.755,217.62],"ti":[-382.643,152.755,-217.62]},{"t":25,"s":[2923.253,239.462,1305.721]}],"ix":2},"a":{"a":0,"k":[56.08,-285.558,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7,-27],[35,7],[-41.906,32.862],[0,0]],"o":[[-7,27],[32,27],[23.167,-18.167],[0,0]],"v":[[72,-317],[4,-279],[91,-263.167],[107.167,-289.667]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.345,0.381,0.671,0.5,0.491,0.265,0.624,1,0.638,0.15,0.577],"ix":9}},"s":{"a":0,"k":[0,0],"ix":5},"e":{"a":0,"k":[100,0],"ix":6},"t":1,"nm":"Gradient Fill 1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":101,"ty":4,"nm":"Shape Layer 16","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-25,"s":[0]},{"t":81.740234375,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.829},"o":{"x":0.167,"y":0.167},"t":0,"s":[627.395,1155.993,0],"to":[64.5,-93.5,0],"ti":[-78.679,-339.952,90.248]},{"i":{"x":0.833,"y":0.714},"o":{"x":0.167,"y":0.165},"t":30,"s":[1014.395,594.993,0],"to":[78.679,339.952,-90.248],"ti":[-14.179,-433.452,90.248]},{"t":121,"s":[1099.471,3195.705,-541.488]}],"ix":2},"a":{"a":0,"k":[-262,-435,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[46,54],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.969,0.18,0.404,0.5,0.97,0.346,0.318,1,0.972,0.512,0.233],"ix":9}},"s":{"a":0,"k":[-49,0],"ix":5},"e":{"a":0,"k":[68,0],"ix":6},"t":1,"nm":"Gradient Fill 1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-262,-435],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":102,"ty":4,"nm":"Shape Layer 15","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.822]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":102,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.828},"o":{"x":0.167,"y":0.167},"t":0,"s":[627.395,1155.993,0],"to":[65.626,-110,4.223],"ti":[-147.468,-10.238,-26.905]},{"i":{"x":0.833,"y":0.887},"o":{"x":0.167,"y":0.163},"t":28,"s":[1021.149,495.993,25.34],"to":[361.407,25.09,65.936],"ti":[-126.131,-151.254,-61.713]},{"t":71,"s":[1777.9360000000001,1403.514,395.618]}],"ix":2},"a":{"a":0,"k":[14.5,-433,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[27,96],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.22745098039215686,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[14.5,-433],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":103,"ty":4,"nm":"Shape Layer 5","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-20,"s":[0]},{"t":87.9189453125,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[627.395,1155.993,0],"to":[147.845,-83.5,22.596],"ti":[-147.845,83.5,-22.596]},{"t":19,"s":[1514.467,654.993,135.575]}],"ix":2},"a":{"a":0,"k":[-180.917,-577,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[36,32],[26,-104]],"o":[[0,0],[-36,-32],[-11.157,44.627]],"v":[[-161,-650],[-193,-562],[-165,-504]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":14,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":104,"ty":4,"nm":"Shape Layer 4","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-16,"s":[0]},{"t":99.041015625,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[627.395,1155.993,0],"to":[393.671,83.751,189.679],"ti":[-393.671,-83.751,-189.679]},{"t":58,"s":[2989.419,1658.499,1138.074]}],"ix":2},"a":{"a":0,"k":[-45,-602,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[40,40],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.17254901960784313,0.5529411764705883,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-45,-602],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":105,"ty":4,"nm":"Shape Layer 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-2.293,"s":[0]},{"t":45.90234375,"s":[1080]}],"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-3.528,"s":[0]},{"t":105.2197265625,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[627.395,1155.993,0],"to":[249,109.5,0],"ti":[-249,-109.5,0]},{"t":68,"s":[2121.395,1812.9929999999997,0]}],"ix":2},"a":{"a":0,"k":[232.5,-595.5,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[11,67],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.17254901960784313,0.5529411764705883,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[232.5,-595.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":106,"ty":4,"nm":"Shape Layer 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-18,"s":[0]},{"t":86.6826171875,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[627.395,1155.993,0],"to":[499.008,399.431,73.2],"ti":[-499.008,-399.431,-73.2]},{"t":96,"s":[3621.4449999999997,3552.5799999999995,439.20300000000003]}],"ix":2},"a":{"a":0,"k":[120,-142,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[32,44],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.22745098039215686,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[120,-142],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":1,"ind":107,"ty":4,"nm":"Shape Layer 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-24,"s":[0]},{"t":94.09765625,"s":[1080]}],"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[627.395,1155.993,0],"to":[535.305,103.127,17.938],"ti":[-535.305,-103.127,-17.938]},{"t":82,"s":[3839.226,1774.756,107.63000000000001]}],"ix":2},"a":{"a":0,"k":[116,-254,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[26,56],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.9490196078431372,0.9490196078431372,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.5372549019607843,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[116,-254],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":112,"st":-1,"bm":0},{"ddd":0,"ind":108,"ty":1,"nm":"Medium Gray-Blue Solid 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[621,1344,0],"ix":2},"a":{"a":0,"k":[621,1344,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"sw":1242,"sh":2688,"sc":"#272d41","ip":112,"op":112,"st":0,"bm":0,"hidden":0}],"markers":[]}
diff --git a/data/common/src/main/kotlin/com/tangem/data/common/currency/CryptoCurrencyFactory.kt b/data/common/src/main/kotlin/com/tangem/data/common/currency/CryptoCurrencyFactory.kt
index ff4455dc21..fb8608e78b 100644
--- a/data/common/src/main/kotlin/com/tangem/data/common/currency/CryptoCurrencyFactory.kt
+++ b/data/common/src/main/kotlin/com/tangem/data/common/currency/CryptoCurrencyFactory.kt
@@ -1,6 +1,7 @@
package com.tangem.data.common.currency
import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchainsdk.utils.ExcludedBlockchains
import com.tangem.blockchainsdk.utils.fromNetworkId
import com.tangem.blockchainsdk.utils.toCoinId
import com.tangem.domain.models.scan.ScanResponse
@@ -10,7 +11,9 @@ import timber.log.Timber
import com.tangem.blockchain.common.Token as SdkToken
// FIXME: Make internal
-class CryptoCurrencyFactory {
+class CryptoCurrencyFactory(
+ private val excludedBlockchains: ExcludedBlockchains,
+) {
@Suppress("LongParameterList") // Yep, it's long
fun createToken(
@@ -46,7 +49,7 @@ class CryptoCurrencyFactory {
return null
}
- val network = getNetwork(blockchain, extraDerivationPath, scanResponse) ?: return null
+ val network = getNetwork(blockchain, extraDerivationPath, scanResponse, excludedBlockchains) ?: return null
val id = getTokenId(network, sdkToken)
return CryptoCurrency.Token(
@@ -70,7 +73,7 @@ class CryptoCurrencyFactory {
Timber.e("Unable to map the SDK token to the domain token with Unknown blockchain")
return null
}
- val network = getNetwork(blockchain, extraDerivationPath, scanResponse) ?: return null
+ val network = getNetwork(blockchain, extraDerivationPath, scanResponse, excludedBlockchains) ?: return null
return createCoin(network)
}
diff --git a/data/common/src/main/kotlin/com/tangem/data/common/currency/NetworkOperations.kt b/data/common/src/main/kotlin/com/tangem/data/common/currency/NetworkOperations.kt
index f181886484..4b02448af9 100644
--- a/data/common/src/main/kotlin/com/tangem/data/common/currency/NetworkOperations.kt
+++ b/data/common/src/main/kotlin/com/tangem/data/common/currency/NetworkOperations.kt
@@ -2,6 +2,7 @@ package com.tangem.data.common.currency
import com.tangem.blockchain.common.Blockchain
import com.tangem.blockchain.common.FeePaidCurrency
+import com.tangem.blockchainsdk.utils.ExcludedBlockchains
import com.tangem.blockchainsdk.utils.toNetworkId
import com.tangem.domain.common.DerivationStyleProvider
import com.tangem.domain.common.extensions.canHandleToken
@@ -19,10 +20,10 @@ fun getNetwork(
blockchain: Blockchain,
extraDerivationPath: String?,
derivationStyleProvider: DerivationStyleProvider?,
+ excludedBlockchains: ExcludedBlockchains,
canHandleTokens: Boolean,
): Network? {
- if (blockchain == Blockchain.Unknown) {
- Timber.e("Unable to convert Unknown blockchain to the domain network model")
+ if (!isBlockchainSupported(blockchain, excludedBlockchains)) {
return null
}
@@ -40,13 +41,18 @@ fun getNetwork(
standardType = getNetworkStandardType(blockchain),
hasFiatFeeRate = blockchain.feePaidCurrency() !is FeePaidCurrency.FeeResource,
canHandleTokens = canHandleTokens,
+ transactionExtrasType = blockchain.getSupportedTransactionExtras(),
)
}
-fun getNetwork(networkId: Network.ID, derivationPath: Network.DerivationPath, scanResponse: ScanResponse): Network? {
+fun getNetwork(
+ networkId: Network.ID,
+ derivationPath: Network.DerivationPath,
+ scanResponse: ScanResponse,
+ excludedBlockchains: ExcludedBlockchains,
+): Network? {
val blockchain = getBlockchain(networkId)
- if (blockchain == Blockchain.Unknown) {
- Timber.e("Unable to convert Unknown blockchain to the domain network model")
+ if (!isBlockchainSupported(blockchain, excludedBlockchains)) {
return null
}
@@ -59,16 +65,44 @@ fun getNetwork(networkId: Network.ID, derivationPath: Network.DerivationPath, sc
currencySymbol = blockchain.currency,
standardType = getNetworkStandardType(blockchain),
hasFiatFeeRate = blockchain.feePaidCurrency() !is FeePaidCurrency.FeeResource,
- canHandleTokens = scanResponse.card.canHandleToken(blockchain, scanResponse.cardTypesResolver),
+ canHandleTokens = scanResponse.card.canHandleToken(
+ blockchain,
+ scanResponse.cardTypesResolver,
+ excludedBlockchains,
+ ),
+ transactionExtrasType = blockchain.getSupportedTransactionExtras(),
)
}
-fun getNetwork(blockchain: Blockchain, extraDerivationPath: String?, scanResponse: ScanResponse): Network? {
+private fun isBlockchainSupported(blockchain: Blockchain, excludedBlockchains: ExcludedBlockchains): Boolean {
+ if (blockchain == Blockchain.Unknown) {
+ Timber.w("Unable to convert Unknown blockchain to the domain network model")
+ return false
+ }
+ if (blockchain in excludedBlockchains) {
+ Timber.w("Unable to convert excluded blockchain to the domain network model")
+ return false
+ }
+
+ return true
+}
+
+fun getNetwork(
+ blockchain: Blockchain,
+ extraDerivationPath: String?,
+ scanResponse: ScanResponse,
+ excludedBlockchains: ExcludedBlockchains,
+): Network? {
return getNetwork(
blockchain = blockchain,
extraDerivationPath = extraDerivationPath,
derivationStyleProvider = scanResponse.derivationStyleProvider,
- canHandleTokens = scanResponse.card.canHandleToken(blockchain, scanResponse.cardTypesResolver),
+ excludedBlockchains = excludedBlockchains,
+ canHandleTokens = scanResponse.card.canHandleToken(
+ blockchain,
+ scanResponse.cardTypesResolver,
+ excludedBlockchains,
+ ),
)
}
@@ -113,4 +147,149 @@ private fun getDefaultDerivationPath(
derivationStyleProvider: DerivationStyleProvider,
): String? {
return blockchain.derivationPath(derivationStyleProvider.getDerivationStyle())?.rawPath
+}
+
+@Suppress("LongMethod")
+private fun Blockchain.getSupportedTransactionExtras(): Network.TransactionExtrasType {
+ return when (this) {
+ Blockchain.XRP -> Network.TransactionExtrasType.DESTINATION_TAG
+ Blockchain.Binance,
+ Blockchain.TON,
+ Blockchain.Cosmos,
+ Blockchain.TerraV1,
+ Blockchain.TerraV2,
+ Blockchain.Stellar,
+ Blockchain.Hedera,
+ Blockchain.Algorand,
+ Blockchain.Sei,
+ Blockchain.InternetComputer,
+ Blockchain.Casper,
+ -> Network.TransactionExtrasType.MEMO
+ // region Other blockchains
+ Blockchain.Unknown,
+ Blockchain.Arbitrum,
+ Blockchain.ArbitrumTestnet,
+ Blockchain.Avalanche,
+ Blockchain.AvalancheTestnet,
+ Blockchain.BinanceTestnet,
+ Blockchain.BSC,
+ Blockchain.BSCTestnet,
+ Blockchain.Bitcoin,
+ Blockchain.BitcoinTestnet,
+ Blockchain.BitcoinCash,
+ Blockchain.BitcoinCashTestnet,
+ Blockchain.Cardano,
+ Blockchain.CosmosTestnet,
+ Blockchain.Dogecoin,
+ Blockchain.Ducatus,
+ Blockchain.Ethereum,
+ Blockchain.EthereumTestnet,
+ Blockchain.EthereumClassic,
+ Blockchain.EthereumClassicTestnet,
+ Blockchain.Fantom,
+ Blockchain.FantomTestnet,
+ Blockchain.Litecoin,
+ Blockchain.Near,
+ Blockchain.NearTestnet,
+ Blockchain.Polkadot,
+ Blockchain.PolkadotTestnet,
+ Blockchain.Kava,
+ Blockchain.KavaTestnet,
+ Blockchain.Kusama,
+ Blockchain.Polygon,
+ Blockchain.PolygonTestnet,
+ Blockchain.RSK,
+ Blockchain.SeiTestnet,
+ Blockchain.StellarTestnet,
+ Blockchain.Solana,
+ Blockchain.SolanaTestnet,
+ Blockchain.Tezos,
+ Blockchain.Tron,
+ Blockchain.TronTestnet,
+ Blockchain.Gnosis,
+ Blockchain.Dash,
+ Blockchain.Optimism,
+ Blockchain.OptimismTestnet,
+ Blockchain.Dischain,
+ Blockchain.EthereumPow,
+ Blockchain.EthereumPowTestnet,
+ Blockchain.Kaspa,
+ Blockchain.Telos,
+ Blockchain.TelosTestnet,
+ Blockchain.TONTestnet,
+ Blockchain.Ravencoin,
+ Blockchain.Clore,
+ Blockchain.RavencoinTestnet,
+ Blockchain.Cronos,
+ Blockchain.AlephZero,
+ Blockchain.AlephZeroTestnet,
+ Blockchain.OctaSpace,
+ Blockchain.OctaSpaceTestnet,
+ Blockchain.Chia,
+ Blockchain.ChiaTestnet,
+ Blockchain.Decimal,
+ Blockchain.DecimalTestnet,
+ Blockchain.XDC,
+ Blockchain.XDCTestnet,
+ Blockchain.VeChain,
+ Blockchain.VeChainTestnet,
+ Blockchain.Aptos,
+ Blockchain.AptosTestnet,
+ Blockchain.Playa3ull,
+ Blockchain.Shibarium,
+ Blockchain.ShibariumTestnet,
+ Blockchain.AlgorandTestnet,
+ Blockchain.HederaTestnet,
+ Blockchain.Aurora,
+ Blockchain.AuroraTestnet,
+ Blockchain.Areon,
+ Blockchain.AreonTestnet,
+ Blockchain.PulseChain,
+ Blockchain.PulseChainTestnet,
+ Blockchain.ZkSyncEra,
+ Blockchain.ZkSyncEraTestnet,
+ Blockchain.Nexa,
+ Blockchain.NexaTestnet,
+ Blockchain.Moonbeam,
+ Blockchain.MoonbeamTestnet,
+ Blockchain.Manta,
+ Blockchain.MantaTestnet,
+ Blockchain.PolygonZkEVM,
+ Blockchain.PolygonZkEVMTestnet,
+ Blockchain.Radiant,
+ Blockchain.Base,
+ Blockchain.BaseTestnet,
+ Blockchain.Moonriver,
+ Blockchain.MoonriverTestnet,
+ Blockchain.Mantle,
+ Blockchain.MantleTestnet,
+ Blockchain.Flare,
+ Blockchain.FlareTestnet,
+ Blockchain.Taraxa,
+ Blockchain.TaraxaTestnet,
+ Blockchain.Koinos,
+ Blockchain.KoinosTestnet,
+ Blockchain.Joystream,
+ Blockchain.Bittensor,
+ Blockchain.Filecoin,
+ Blockchain.Blast,
+ Blockchain.BlastTestnet,
+ Blockchain.Cyber,
+ Blockchain.CyberTestnet,
+ Blockchain.Sui,
+ Blockchain.SuiTestnet,
+ Blockchain.EnergyWebChain,
+ Blockchain.EnergyWebChainTestnet,
+ Blockchain.EnergyWebX,
+ Blockchain.EnergyWebXTestnet,
+ Blockchain.CasperTestnet,
+ Blockchain.Core,
+ Blockchain.CoreTestnet,
+ Blockchain.Xodex,
+ Blockchain.Canxium,
+ Blockchain.Chiliz,
+ Blockchain.ChilizTestnet,
+ -> Network.TransactionExtrasType.NONE
+ // endregion
+ }
}
\ No newline at end of file
diff --git a/data/common/src/main/kotlin/com/tangem/data/common/currency/ResponseCryptoCurrenciesFactory.kt b/data/common/src/main/kotlin/com/tangem/data/common/currency/ResponseCryptoCurrenciesFactory.kt
index fb9ff22adb..7cda282ecb 100644
--- a/data/common/src/main/kotlin/com/tangem/data/common/currency/ResponseCryptoCurrenciesFactory.kt
+++ b/data/common/src/main/kotlin/com/tangem/data/common/currency/ResponseCryptoCurrenciesFactory.kt
@@ -3,6 +3,7 @@ package com.tangem.data.common.currency
import com.tangem.blockchain.common.Blockchain
import com.tangem.blockchain.common.Token
import com.tangem.blockchainsdk.compatibility.l2BlockchainsList
+import com.tangem.blockchainsdk.utils.ExcludedBlockchains
import com.tangem.blockchainsdk.utils.fromNetworkId
import com.tangem.blockchainsdk.utils.toCoinId
import com.tangem.datasource.api.tangemTech.models.UserTokensResponse
@@ -12,17 +13,15 @@ import com.tangem.domain.tokens.model.CryptoCurrency
import timber.log.Timber
import com.tangem.blockchain.common.Token as SdkToken
-class ResponseCryptoCurrenciesFactory {
+class ResponseCryptoCurrenciesFactory(
+ private val excludedBlockchains: ExcludedBlockchains,
+) {
- fun createCurrency(
- currencyId: CryptoCurrency.ID,
- response: UserTokensResponse,
- scanResponse: ScanResponse,
- ): CryptoCurrency {
+ fun createCurrency(currencyId: String, response: UserTokensResponse, scanResponse: ScanResponse): CryptoCurrency {
return response.tokens
.asSequence()
.mapNotNull { createCurrency(it, scanResponse) }
- .first { it.id == currencyId }
+ .first { it.id.value == currencyId }
}
fun createCurrencies(response: UserTokensResponse, scanResponse: ScanResponse): List {
@@ -69,7 +68,12 @@ class ResponseCryptoCurrenciesFactory {
responseToken: UserTokensResponse.Token,
scanResponse: ScanResponse,
): CryptoCurrency.Coin? {
- val network = getNetwork(blockchain, responseToken.derivationPath, scanResponse) ?: return null
+ val network = getNetwork(
+ blockchain,
+ responseToken.derivationPath,
+ scanResponse,
+ excludedBlockchains,
+ ) ?: return null
return CryptoCurrency.Coin(
id = getCoinId(network, blockchain.toCoinId()),
@@ -115,8 +119,13 @@ class ResponseCryptoCurrenciesFactory {
responseDerivationPath: String?,
scanResponse: ScanResponse,
): CryptoCurrency.Token? {
- val network = getNetwork(blockchain, responseDerivationPath, scanResponse)
- ?: return null
+ val network = getNetwork(
+ blockchain,
+ responseDerivationPath,
+ scanResponse,
+ excludedBlockchains,
+ ) ?: return null
+
val id = getTokenId(network, sdkToken)
return CryptoCurrency.Token(
diff --git a/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/DefaultCustomTokensRepository.kt b/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/DefaultCustomTokensRepository.kt
index 3c9aabf80e..e146654abd 100644
--- a/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/DefaultCustomTokensRepository.kt
+++ b/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/DefaultCustomTokensRepository.kt
@@ -1,6 +1,7 @@
package com.tangem.data.managetokens
import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchainsdk.utils.ExcludedBlockchains
import com.tangem.blockchainsdk.utils.toNetworkId
import com.tangem.crypto.hdWallet.DerivationPath
import com.tangem.data.common.api.safeApiCall
@@ -36,10 +37,11 @@ internal class DefaultCustomTokensRepository(
private val userWalletsStore: UserWalletsStore,
private val appPreferencesStore: AppPreferencesStore,
private val walletManagersFacade: WalletManagersFacade,
+ private val excludedBlockchains: ExcludedBlockchains,
private val dispatchers: CoroutineDispatcherProvider,
) : CustomTokensRepository {
- private val cryptoCurrencyFactory = CryptoCurrencyFactory()
+ private val cryptoCurrencyFactory = CryptoCurrencyFactory(excludedBlockchains)
private val userTokensResponseFactory = UserTokensResponseFactory()
private val tokenAddressConverter = TokenAddressesConverter()
private val userTokensBackwardCompatibility = UserTokensBackwardCompatibility()
@@ -50,6 +52,7 @@ internal class DefaultCustomTokensRepository(
Blockchain.Unknown,
Blockchain.Binance,
Blockchain.BinanceTestnet,
+ Blockchain.Kaspa,
-> true
Blockchain.Cardano -> blockchain.validateContractAddress(contractAddress)
else -> blockchain.validateAddress(contractAddress)
@@ -87,7 +90,9 @@ internal class DefaultCustomTokensRepository(
val userWallet = requireNotNull(userWalletsStore.getSyncOrNull(userWalletId)) {
"User wallet [$userWalletId] not found while finding token"
}
- val network = requireNotNull(getNetwork(networkId, derivationPath, userWallet.scanResponse)) {
+ val network = requireNotNull(
+ getNetwork(networkId, derivationPath, userWallet.scanResponse, excludedBlockchains),
+ ) {
"Network [$networkId] not found while finding token"
}
val tokenAddress = tokenAddressConverter.convertTokenAddress(
@@ -97,7 +102,7 @@ internal class DefaultCustomTokensRepository(
)
val supportedTokenNetworkIds = userWallet.scanResponse.card
- .supportedBlockchains(userWallet.scanResponse.cardTypesResolver)
+ .supportedBlockchains(userWallet.scanResponse.cardTypesResolver, excludedBlockchains)
.filter(Blockchain::canHandleTokens)
.map(Blockchain::toNetworkId)
@@ -137,7 +142,9 @@ internal class DefaultCustomTokensRepository(
val userWallet = requireNotNull(userWalletsStore.getSyncOrNull(userWalletId)) {
"User wallet [$userWalletId] not found while creating coin"
}
- val network = requireNotNull(getNetwork(networkId, derivationPath, userWallet.scanResponse)) {
+ val network = requireNotNull(
+ getNetwork(networkId, derivationPath, userWallet.scanResponse, excludedBlockchains),
+ ) {
"Network [$networkId] not found while creating coin"
}
@@ -168,7 +175,9 @@ internal class DefaultCustomTokensRepository(
val userWallet = requireNotNull(userWalletsStore.getSyncOrNull(userWalletId)) {
"User wallet [$userWalletId] not found while creating custom token"
}
- val network = requireNotNull(getNetwork(networkId, derivationPath, userWallet.scanResponse)) {
+ val network = requireNotNull(
+ getNetwork(networkId, derivationPath, userWallet.scanResponse, excludedBlockchains),
+ ) {
"Network [$networkId] not found while creating custom token"
}
val tokenAddress = tokenAddressConverter.convertTokenAddress(
@@ -230,11 +239,18 @@ internal class DefaultCustomTokensRepository(
Blockchain.entries
.mapNotNull { blockchain ->
- if (scanResponse.card.canHandleBlockchain(blockchain, scanResponse.cardTypesResolver)) {
+ val canHandleBlockchain = scanResponse.card.canHandleBlockchain(
+ blockchain,
+ scanResponse.cardTypesResolver,
+ excludedBlockchains,
+ )
+
+ if (canHandleBlockchain) {
getNetwork(
blockchain = blockchain,
extraDerivationPath = null,
scanResponse = scanResponse,
+ excludedBlockchains = excludedBlockchains,
)
} else {
null
diff --git a/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/DefaultManageTokensRepository.kt b/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/DefaultManageTokensRepository.kt
index deb08005ef..6e2f02f44c 100644
--- a/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/DefaultManageTokensRepository.kt
+++ b/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/DefaultManageTokensRepository.kt
@@ -2,8 +2,8 @@ package com.tangem.data.managetokens
import com.tangem.blockchain.common.Blockchain
import com.tangem.blockchainsdk.compatibility.l2BlockchainsCoinIds
+import com.tangem.blockchainsdk.utils.ExcludedBlockchains
import com.tangem.blockchainsdk.utils.fromNetworkId
-import com.tangem.blockchainsdk.utils.isSupportedInApp
import com.tangem.blockchainsdk.utils.toNetworkId
import com.tangem.data.common.api.safeApiCall
import com.tangem.data.common.currency.UserTokensResponseFactory
@@ -47,12 +47,13 @@ internal class DefaultManageTokensRepository(
private val manageTokensUpdateFetcher: ManageTokensUpdateFetcher,
private val appPreferencesStore: AppPreferencesStore,
private val testnetTokensStorage: TestnetTokensStorage,
+ private val excludedBlockchains: ExcludedBlockchains,
private val dispatchers: CoroutineDispatcherProvider,
) : ManageTokensRepository {
- private val managedCryptoCurrencyFactory = ManagedCryptoCurrencyFactory()
+ private val managedCryptoCurrencyFactory = ManagedCryptoCurrencyFactory(excludedBlockchains)
private val userTokensResponseFactory = UserTokensResponseFactory()
- private val cardCurrenciesFactory = CardCryptoCurrenciesFactory(DemoConfig())
+ private val cardCurrenciesFactory = CardCryptoCurrenciesFactory(DemoConfig(), excludedBlockchains)
// region getTokenListBatchFlow
override fun getTokenListBatchFlow(
@@ -202,9 +203,9 @@ internal class DefaultManageTokensRepository(
private fun getSupportedBlockchains(userWallet: UserWallet?): List {
return userWallet?.scanResponse?.let {
- it.card.supportedBlockchains(it.cardTypesResolver)
+ it.card.supportedBlockchains(it.cardTypesResolver, excludedBlockchains)
} ?: Blockchain.entries.filter {
- !it.isTestnet() && it.isSupportedInApp()
+ !it.isTestnet() && it !in excludedBlockchains
}
}
// endregion
@@ -290,6 +291,7 @@ internal class DefaultManageTokensRepository(
val canHandleBlockchain = userWallet.scanResponse.card.canHandleBlockchain(
blockchain = blockchain,
cardTypesResolver = userWallet.cardTypesResolver,
+ excludedBlockchains = excludedBlockchains,
)
return if (!canHandleBlockchain) {
@@ -304,7 +306,10 @@ internal class DefaultManageTokensRepository(
blockchain: Blockchain,
): CurrencyUnsupportedState.Token? {
val cardTypesResolver = userWallet.scanResponse.cardTypesResolver
- val supportedTokens = userWallet.scanResponse.card.supportedTokens(cardTypesResolver)
+ val supportedTokens = userWallet.scanResponse.card.supportedTokens(
+ cardTypesResolver,
+ excludedBlockchains,
+ )
return when {
// refactor this later by moving all this logic in card config
diff --git a/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/di/ManageTokensDataModule.kt b/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/di/ManageTokensDataModule.kt
index a85db459dd..3f64ae5970 100644
--- a/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/di/ManageTokensDataModule.kt
+++ b/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/di/ManageTokensDataModule.kt
@@ -1,5 +1,6 @@
package com.tangem.data.managetokens.di
+import com.tangem.blockchainsdk.utils.ExcludedBlockchains
import com.tangem.data.managetokens.DefaultCustomTokensRepository
import com.tangem.data.managetokens.DefaultManageTokensRepository
import com.tangem.data.managetokens.utils.ManageTokensUpdateFetcher
@@ -30,6 +31,7 @@ internal object ManageTokensDataModule {
appPreferencesStore: AppPreferencesStore,
testnetTokensStorage: TestnetTokensStorage,
dispatchers: CoroutineDispatcherProvider,
+ excludedBlockchains: ExcludedBlockchains,
): ManageTokensRepository {
return DefaultManageTokensRepository(
tangemTechApi,
@@ -37,6 +39,7 @@ internal object ManageTokensDataModule {
manageTokensUpdateFetcher,
appPreferencesStore,
testnetTokensStorage,
+ excludedBlockchains,
dispatchers,
)
}
@@ -49,12 +52,14 @@ internal object ManageTokensDataModule {
appPreferencesStore: AppPreferencesStore,
walletManagersFacade: WalletManagersFacade,
dispatchers: CoroutineDispatcherProvider,
+ excludedBlockchains: ExcludedBlockchains,
): CustomTokensRepository {
return DefaultCustomTokensRepository(
tangemTechApi,
userWalletsStore,
appPreferencesStore,
walletManagersFacade,
+ excludedBlockchains,
dispatchers,
)
}
diff --git a/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/utils/ManagedCryptoCurrencyFactory.kt b/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/utils/ManagedCryptoCurrencyFactory.kt
index a5eb111a0d..5ac35825b0 100644
--- a/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/utils/ManagedCryptoCurrencyFactory.kt
+++ b/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/utils/ManagedCryptoCurrencyFactory.kt
@@ -4,8 +4,8 @@ import com.tangem.blockchain.common.Blockchain
import com.tangem.blockchainsdk.compatibility.applyL2Compatibility
import com.tangem.blockchainsdk.compatibility.getL2CompatibilityTokenComparison
import com.tangem.blockchainsdk.compatibility.l2BlockchainsList
+import com.tangem.blockchainsdk.utils.ExcludedBlockchains
import com.tangem.blockchainsdk.utils.fromNetworkId
-import com.tangem.blockchainsdk.utils.isSupportedInApp
import com.tangem.blockchainsdk.utils.toCoinId
import com.tangem.data.common.currency.getCoinId
import com.tangem.data.common.currency.getNetwork
@@ -22,7 +22,9 @@ import com.tangem.domain.managetokens.model.ManagedCryptoCurrency.SourceNetwork
import com.tangem.domain.models.scan.ScanResponse
import com.tangem.domain.tokens.model.Network
-internal class ManagedCryptoCurrencyFactory {
+internal class ManagedCryptoCurrencyFactory(
+ private val excludedBlockchains: ExcludedBlockchains,
+) {
fun create(
coinsResponse: CoinsResponse,
@@ -79,16 +81,15 @@ internal class ManagedCryptoCurrencyFactory {
scanResponse: ScanResponse,
): List = tokensResponse.tokens
.mapNotNull { token ->
- maybeCreateCustomToken(token, null, scanResponse)
+ maybeCreateCustomToken(token, scanResponse)
}
private fun maybeCreateCustomToken(
token: UserTokensResponse.Token,
- imageHost: String?,
scanResponse: ScanResponse,
): ManagedCryptoCurrency? {
val blockchain = Blockchain.fromNetworkId(token.networkId)
- ?.takeIf { it.isSupportedInApp() }
+ ?.takeUnless { it in excludedBlockchains }
?: return null
if (!checkIsCustomToken(token, blockchain, scanResponse.derivationStyleProvider)) {
@@ -99,6 +100,7 @@ internal class ManagedCryptoCurrencyFactory {
blockchain = blockchain,
extraDerivationPath = token.derivationPath,
scanResponse = scanResponse,
+ excludedBlockchains = excludedBlockchains,
) ?: return null
val contractAddress = token.contractAddress
@@ -107,7 +109,7 @@ internal class ManagedCryptoCurrencyFactory {
currencyId = getCoinId(network, blockchain.toCoinId()),
name = token.name,
symbol = token.symbol,
- iconUrl = getIconUrl(blockchain.id, imageHost),
+ iconUrl = getIconUrl(blockchain.id),
network = network,
)
} else {
@@ -115,7 +117,7 @@ internal class ManagedCryptoCurrencyFactory {
currencyId = getTokenId(network, token.id, contractAddress),
name = token.name,
symbol = token.symbol,
- iconUrl = token.id?.let { getIconUrl(it, imageHost) },
+ iconUrl = token.id?.let { getIconUrl(it) },
contractAddress = contractAddress,
network = network,
decimals = token.decimals,
@@ -161,15 +163,16 @@ internal class ManagedCryptoCurrencyFactory {
extraDerivationPath: String? = null,
): SourceNetwork? {
val blockchain = Blockchain.fromNetworkId(networkId)
- ?.takeIf { it.isSupportedInApp() }
+ ?.takeUnless { it in excludedBlockchains }
?: return null
val network = getNetwork(
blockchain,
extraDerivationPath,
scanResponse?.derivationStyleProvider,
+ excludedBlockchains,
canHandleTokens = scanResponse?.let {
- it.card.canHandleToken(blockchain, it.cardTypesResolver)
+ it.card.canHandleToken(blockchain, it.cardTypesResolver, excludedBlockchains)
} ?: true,
) ?: return null
@@ -200,13 +203,14 @@ internal class ManagedCryptoCurrencyFactory {
.mapNotNullTo(mutableSetOf()) { token ->
val blockchain = Blockchain.fromNetworkId(token.networkId)
- if (blockchain != null && blockchain.isSupportedInApp()) {
+ if (blockchain != null && blockchain !in excludedBlockchains) {
getNetwork(
blockchain,
token.derivationPath,
scanResponse?.derivationStyleProvider,
+ excludedBlockchains,
canHandleTokens = scanResponse?.let {
- it.card.canHandleToken(blockchain, it.cardTypesResolver)
+ it.card.canHandleToken(blockchain, it.cardTypesResolver, excludedBlockchains)
} ?: true,
)
} else {
diff --git a/data/markets/build.gradle.kts b/data/markets/build.gradle.kts
index 5378b4b964..632a570f78 100644
--- a/data/markets/build.gradle.kts
+++ b/data/markets/build.gradle.kts
@@ -16,6 +16,7 @@ dependencies {
implementation(projects.core.pagination)
implementation(projects.core.analytics)
implementation(projects.core.analytics.models)
+ implementation(projects.core.configToggles)
implementation(projects.domain.legacy)
implementation(projects.domain.markets)
@@ -33,6 +34,7 @@ dependencies {
// region Others dependencies
implementation(deps.kotlin.coroutines)
+ implementation(deps.jodatime)
implementation(deps.moshi)
implementation(deps.moshi.kotlin)
implementation(deps.timber)
diff --git a/data/markets/src/main/java/com/tangem/data/markets/DefaultMarketsTokenRepository.kt b/data/markets/src/main/java/com/tangem/data/markets/DefaultMarketsTokenRepository.kt
index a329974a0d..4159ad1c21 100644
--- a/data/markets/src/main/java/com/tangem/data/markets/DefaultMarketsTokenRepository.kt
+++ b/data/markets/src/main/java/com/tangem/data/markets/DefaultMarketsTokenRepository.kt
@@ -3,8 +3,10 @@ package com.tangem.data.markets
import com.tangem.blockchain.common.Blockchain
import com.tangem.blockchainsdk.compatibility.applyL2Compatibility
import com.tangem.blockchainsdk.compatibility.getTokenIdIfL2Network
+import com.tangem.blockchainsdk.utils.ExcludedBlockchains
import com.tangem.blockchainsdk.utils.fromNetworkId
import com.tangem.core.analytics.api.AnalyticsEventHandler
+import com.tangem.data.common.cache.CacheRegistry
import com.tangem.data.common.currency.CryptoCurrencyFactory
import com.tangem.data.common.currency.getNetwork
import com.tangem.data.common.utils.retryOnError
@@ -13,8 +15,10 @@ import com.tangem.data.markets.converters.*
import com.tangem.datasource.api.common.response.ApiResponseError
import com.tangem.datasource.api.common.response.getOrThrow
import com.tangem.datasource.api.markets.TangemTechMarketsApi
+import com.tangem.datasource.api.markets.models.response.TokenMarketExchangesResponse
import com.tangem.datasource.api.tangemTech.TangemTechApi
import com.tangem.datasource.api.tangemTech.TangemTechApi.Companion.marketsQuoteFields
+import com.tangem.datasource.local.datastore.RuntimeStateStore
import com.tangem.datasource.local.userwallet.UserWalletsStore
import com.tangem.domain.markets.*
import com.tangem.domain.markets.repositories.MarketsTokenRepository
@@ -27,14 +31,21 @@ import kotlinx.coroutines.withContext
import java.util.concurrent.atomic.AtomicInteger
import java.util.concurrent.atomic.AtomicLong
+@Suppress("LongParameterList")
internal class DefaultMarketsTokenRepository(
private val marketsApi: TangemTechMarketsApi,
private val tangemTechApi: TangemTechApi,
private val userWalletsStore: UserWalletsStore,
private val dispatcherProvider: CoroutineDispatcherProvider,
private val analyticsEventHandler: AnalyticsEventHandler,
+ private val excludedBlockchains: ExcludedBlockchains,
+ private val cacheRegistry: CacheRegistry,
+ private val tokenExchangesStore: RuntimeStateStore>,
) : MarketsTokenRepository {
+ private val tokenMarketInfoConverter: TokenMarketInfoConverter = TokenMarketInfoConverter(excludedBlockchains)
+ private val cryptoCurrencyFactory = CryptoCurrencyFactory(excludedBlockchains)
+
private fun createTokenMarketsFetcher(firstBatchSize: Int, nextBatchSize: Int) = LimitOffsetBatchFetcher(
prefetchDistance = firstBatchSize,
batchSize = nextBatchSize,
@@ -198,7 +209,7 @@ internal class DefaultMarketsTokenRepository(
}
val resultResponse = result.applyL2Compatibility(tokenId)
- return@withContext TokenMarketInfoConverter.convert(resultResponse)
+ return@withContext tokenMarketInfoConverter.convert(resultResponse)
}
override suspend fun getTokenQuotes(fiatCurrencyCode: String, tokenId: String, tokenSymbol: String) =
@@ -228,7 +239,7 @@ internal class DefaultMarketsTokenRepository(
val blockchain = Blockchain.fromNetworkId(network.networkId) ?: error("Unknown network [${network.networkId}]")
return if (network.contractAddress == null) {
- CryptoCurrencyFactory().createCoin(
+ cryptoCurrencyFactory.createCoin(
blockchain = blockchain,
extraDerivationPath = null,
scanResponse = userWallet.scanResponse,
@@ -238,9 +249,10 @@ internal class DefaultMarketsTokenRepository(
blockchain = blockchain,
extraDerivationPath = null,
scanResponse = userWallet.scanResponse,
+ excludedBlockchains = excludedBlockchains,
) ?: return null
- CryptoCurrencyFactory().createToken(
+ cryptoCurrencyFactory.createToken(
network = currencyNetwork,
rawId = token.id,
name = token.name,
@@ -253,9 +265,13 @@ internal class DefaultMarketsTokenRepository(
override suspend fun getTokenExchanges(tokenId: String): List {
return withContext(dispatcherProvider.io) {
- val response = marketsApi.getCoinExchanges(coinId = tokenId).getOrThrow()
+ cacheRegistry.invokeOnExpire(key = "coins/$tokenId/exchanges", skipCache = false) {
+ val response = marketsApi.getCoinExchanges(coinId = tokenId).getOrThrow()
- TokenMarketExchangeConverter.convertList(input = response.exchanges)
+ tokenExchangesStore.store(value = response.exchanges)
+ }
+
+ TokenMarketExchangeConverter.convertList(input = tokenExchangesStore.get().value)
}
}
@@ -288,10 +304,11 @@ internal class DefaultMarketsTokenRepository(
}
private fun createListErrorEvent(error: ApiResponseError): MarketsDataAnalyticsEvent.List.Error {
- return createErrorEvent(error) { errorType, errorCode ->
+ return createErrorEvent(error) { errorType, errorCode, errorMessage ->
MarketsDataAnalyticsEvent.List.Error(
errorType = errorType,
errorCode = errorCode,
+ errorMessage = errorMessage,
)
}
}
@@ -301,10 +318,11 @@ internal class DefaultMarketsTokenRepository(
request: MarketsDataAnalyticsEvent.Details.Error.Request,
tokenSymbol: String,
): MarketsDataAnalyticsEvent.Details.Error {
- return createErrorEvent(error) { errorType, errorCode ->
+ return createErrorEvent(error) { errorType, errorCode, errorMessage ->
MarketsDataAnalyticsEvent.Details.Error(
errorType = errorType,
errorCode = errorCode,
+ errorMessage = errorMessage,
request = request,
tokenSymbol = tokenSymbol,
)
@@ -313,20 +331,20 @@ internal class DefaultMarketsTokenRepository(
private inline fun createErrorEvent(
error: ApiResponseError,
- createEvent: (MarketsDataAnalyticsEvent.Type, Int?) -> T,
+ createEvent: (MarketsDataAnalyticsEvent.Type, Int?, String) -> T,
): T {
return when (error) {
is ApiResponseError.HttpException -> {
- createEvent(MarketsDataAnalyticsEvent.Type.Http, error.code.code)
+ createEvent(MarketsDataAnalyticsEvent.Type.Http, error.code.code, error.message.orEmpty())
}
is ApiResponseError.TimeoutException -> {
- createEvent(MarketsDataAnalyticsEvent.Type.Timeout, null)
+ createEvent(MarketsDataAnalyticsEvent.Type.Timeout, null, error.message.orEmpty())
}
is ApiResponseError.NetworkException -> {
- createEvent(MarketsDataAnalyticsEvent.Type.Network, null)
+ createEvent(MarketsDataAnalyticsEvent.Type.Network, null, error.message.orEmpty())
}
is ApiResponseError.UnknownException -> {
- createEvent(MarketsDataAnalyticsEvent.Type.Unknown, null)
+ createEvent(MarketsDataAnalyticsEvent.Type.Unknown, null, error.message.orEmpty())
}
}
}
diff --git a/data/markets/src/main/java/com/tangem/data/markets/analytics/MarketsDataAnalyticsEvent.kt b/data/markets/src/main/java/com/tangem/data/markets/analytics/MarketsDataAnalyticsEvent.kt
index e0d27728a0..5d04e7511f 100644
--- a/data/markets/src/main/java/com/tangem/data/markets/analytics/MarketsDataAnalyticsEvent.kt
+++ b/data/markets/src/main/java/com/tangem/data/markets/analytics/MarketsDataAnalyticsEvent.kt
@@ -1,6 +1,7 @@
package com.tangem.data.markets.analytics
import com.tangem.core.analytics.models.AnalyticsEvent
+import com.tangem.core.analytics.models.AnalyticsParam
sealed interface MarketsDataAnalyticsEvent {
@@ -12,11 +13,13 @@ sealed interface MarketsDataAnalyticsEvent {
data class Error(
val errorType: Type,
val errorCode: Int? = null,
+ val errorMessage: String,
) : List(
event = "Data Error",
params = buildMap {
- put("Error Type", errorType.value)
- errorCode?.let { put("Error Code", it.toString()) }
+ put(AnalyticsParam.ERROR_TYPE, errorType.value)
+ put(AnalyticsParam.ERROR_CODE, errorCode?.toString() ?: IS_NOT_HTTP_ERROR)
+ put(AnalyticsParam.ERROR_MESSAGE, errorMessage)
},
)
}
@@ -31,13 +34,15 @@ sealed interface MarketsDataAnalyticsEvent {
val tokenSymbol: String,
val errorType: Type,
val errorCode: Int? = null,
+ val errorMessage: String,
) : Details(
event = "Data Error",
params = buildMap {
put("Source", request.source)
put("Token", tokenSymbol)
- errorCode?.let { put("Error Code", it.toString()) }
- put("Error Type", errorType.value)
+ put(AnalyticsParam.ERROR_TYPE, errorType.value)
+ put(AnalyticsParam.ERROR_CODE, errorCode?.toString() ?: IS_NOT_HTTP_ERROR)
+ put(AnalyticsParam.ERROR_MESSAGE, errorMessage)
},
) {
@@ -63,9 +68,9 @@ sealed interface MarketsDataAnalyticsEvent {
event = "Data Error",
params = buildMap {
put("Request path", requestPath)
- errorCode?.let { put("Error Code", it.toString()) }
- put("Error Type", errorType.value)
- put("Error Description", "Chart data contains null values from the API")
+ put(AnalyticsParam.ERROR_TYPE, errorType.value)
+ put(AnalyticsParam.ERROR_CODE, errorCode?.toString() ?: IS_NOT_HTTP_ERROR)
+ put(AnalyticsParam.ERROR_MESSAGE, "Chart data contains null values from the API")
},
),
MarketsDataAnalyticsEvent
@@ -77,4 +82,8 @@ sealed interface MarketsDataAnalyticsEvent {
Custom("Custom"),
Unknown("Unknown"),
}
+
+ private companion object {
+ const val IS_NOT_HTTP_ERROR = "Is not http error"
+ }
}
\ No newline at end of file
diff --git a/data/markets/src/main/java/com/tangem/data/markets/converters/TokenMarketInfoConverter.kt b/data/markets/src/main/java/com/tangem/data/markets/converters/TokenMarketInfoConverter.kt
index 7df1e1a203..2e0146f681 100644
--- a/data/markets/src/main/java/com/tangem/data/markets/converters/TokenMarketInfoConverter.kt
+++ b/data/markets/src/main/java/com/tangem/data/markets/converters/TokenMarketInfoConverter.kt
@@ -1,15 +1,19 @@
package com.tangem.data.markets.converters
+import android.net.Uri
import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchainsdk.utils.ExcludedBlockchains
import com.tangem.blockchainsdk.utils.fromNetworkId
-import com.tangem.blockchainsdk.utils.isSupportedInApp
import com.tangem.datasource.api.markets.models.response.TokenMarketInfoResponse
+import com.tangem.domain.markets.BuildConfig
import com.tangem.domain.markets.TokenMarketInfo
import com.tangem.domain.markets.TokenQuotes
import com.tangem.utils.converter.Converter
import java.math.BigDecimal
-internal object TokenMarketInfoConverter : Converter {
+internal class TokenMarketInfoConverter(
+ private val excludedBlockchains: ExcludedBlockchains,
+) : Converter {
override fun convert(value: TokenMarketInfoResponse): TokenMarketInfo {
return with(value) {
@@ -23,6 +27,7 @@ internal object TokenMarketInfoConverter : Converter {
+ blockchain != null && blockchain !in excludedBlockchains &&
+ blockchain.canHandleTokens() -> {
TokenMarketInfo.Network(
networkId = network.networkId,
exchangeable = network.exchangeable,
@@ -105,6 +111,31 @@ internal object TokenMarketInfoConverter : Converter= 2) {
+ parts.takeLast(2).joinToString(".")
+ } else {
+ host
+ }
+ }.getOrNull()
+ }
+
+ private fun getImageHost(): String {
+ return if (BuildConfig.TESTER_MENU_ENABLED) {
+ DEV_IMAGE_HOST
+ } else {
+ PROD_IMAGE_HOST
+ }
+ }
+
+ private companion object {
+
+ const val PROD_IMAGE_HOST = "https://s3.eu-central-1.amazonaws.com/tangem.api/security_provider/"
+ const val DEV_IMAGE_HOST = "https://s3.eu-central-1.amazonaws.com/tangem.api.dev/security_provider/"
+ }
}
\ No newline at end of file
diff --git a/data/markets/src/main/java/com/tangem/data/markets/di/MarketsDataModule.kt b/data/markets/src/main/java/com/tangem/data/markets/di/MarketsDataModule.kt
index fa4e3d492f..18ed2c4934 100644
--- a/data/markets/src/main/java/com/tangem/data/markets/di/MarketsDataModule.kt
+++ b/data/markets/src/main/java/com/tangem/data/markets/di/MarketsDataModule.kt
@@ -1,9 +1,12 @@
package com.tangem.data.markets.di
+import com.tangem.blockchainsdk.utils.ExcludedBlockchains
import com.tangem.core.analytics.api.AnalyticsEventHandler
+import com.tangem.data.common.cache.CacheRegistry
import com.tangem.data.markets.DefaultMarketsTokenRepository
import com.tangem.datasource.api.markets.TangemTechMarketsApi
import com.tangem.datasource.api.tangemTech.TangemTechApi
+import com.tangem.datasource.local.datastore.RuntimeStateStore
import com.tangem.datasource.local.userwallet.UserWalletsStore
import com.tangem.domain.markets.repositories.MarketsTokenRepository
import com.tangem.utils.coroutines.CoroutineDispatcherProvider
@@ -25,6 +28,8 @@ internal object MarketsDataModule {
userWalletsStore: UserWalletsStore,
dispatchers: CoroutineDispatcherProvider,
analyticsEventHandler: AnalyticsEventHandler,
+ cacheRegistry: CacheRegistry,
+ excludedBlockchains: ExcludedBlockchains,
): MarketsTokenRepository {
return DefaultMarketsTokenRepository(
marketsApi = marketsApi,
@@ -32,6 +37,9 @@ internal object MarketsDataModule {
dispatcherProvider = dispatchers,
userWalletsStore = userWalletsStore,
analyticsEventHandler = analyticsEventHandler,
+ cacheRegistry = cacheRegistry,
+ tokenExchangesStore = RuntimeStateStore(defaultValue = emptyList()),
+ excludedBlockchains = excludedBlockchains,
)
}
}
\ No newline at end of file
diff --git a/data/onboarding/build.gradle.kts b/data/onboarding/build.gradle.kts
index 91e15d90c9..2f080f54bd 100644
--- a/data/onboarding/build.gradle.kts
+++ b/data/onboarding/build.gradle.kts
@@ -26,5 +26,6 @@ dependencies {
// region Domain modules
implementation(projects.domain.onboarding)
+ implementation(projects.domain.models)
// endregion
}
\ No newline at end of file
diff --git a/data/onboarding/src/main/kotlin/com/tangem/data/onboarding/DefaultOnboardingRepository.kt b/data/onboarding/src/main/kotlin/com/tangem/data/onboarding/DefaultOnboardingRepository.kt
index 683ce6d376..f57267d002 100644
--- a/data/onboarding/src/main/kotlin/com/tangem/data/onboarding/DefaultOnboardingRepository.kt
+++ b/data/onboarding/src/main/kotlin/com/tangem/data/onboarding/DefaultOnboardingRepository.kt
@@ -2,9 +2,8 @@ package com.tangem.data.onboarding
import com.tangem.datasource.local.preferences.AppPreferencesStore
import com.tangem.datasource.local.preferences.PreferencesKeys
-import com.tangem.datasource.local.preferences.utils.get
-import com.tangem.datasource.local.preferences.utils.getSyncOrDefault
-import com.tangem.datasource.local.preferences.utils.store
+import com.tangem.datasource.local.preferences.utils.*
+import com.tangem.domain.models.scan.ScanResponse
import com.tangem.domain.onboarding.repository.OnboardingRepository
import kotlinx.coroutines.flow.Flow
@@ -30,4 +29,23 @@ internal class DefaultOnboardingRepository(
override suspend fun saveTwinsOnboardingShown() {
appPreferencesStore.store(key = PreferencesKeys.WAS_TWINS_ONBOARDING_SHOWN, value = true)
}
+
+ override suspend fun getUnfinishedFinalizeOnboarding(): ScanResponse? {
+ return appPreferencesStore
+ .getObjectSyncOrNull(PreferencesKeys.ONBOARDING_FINALIZE_SCAN_RESPONSE_KEY)
+ }
+
+ override suspend fun saveUnfinishedFinalizeOnboarding(scanResponse: ScanResponse) {
+ appPreferencesStore
+ .storeObject(
+ PreferencesKeys.ONBOARDING_FINALIZE_SCAN_RESPONSE_KEY,
+ scanResponse,
+ )
+ }
+
+ override suspend fun clearUnfinishedFinalizeOnboarding() {
+ appPreferencesStore.editData { mutablePreferences ->
+ mutablePreferences.remove(PreferencesKeys.ONBOARDING_FINALIZE_SCAN_RESPONSE_KEY)
+ }
+ }
}
\ No newline at end of file
diff --git a/data/onramp/build.gradle.kts b/data/onramp/build.gradle.kts
index 2745c0d132..8d28d658eb 100644
--- a/data/onramp/build.gradle.kts
+++ b/data/onramp/build.gradle.kts
@@ -14,12 +14,16 @@ dependencies {
/** Core modules */
implementation(projects.core.datasource)
implementation(projects.core.utils)
+ implementation(projects.core.deepLinks.global)
+ implementation(projects.core.analytics)
/** Common modules */
implementation(projects.data.common)
/** Domain modules */
implementation(projects.domain.onramp)
+ implementation(projects.domain.legacy)
+ implementation(projects.domain.appTheme.models)
// region DI
diff --git a/data/onramp/src/main/java/com/tangem/data/onramp/DefaultOnrampErrorResolver.kt b/data/onramp/src/main/java/com/tangem/data/onramp/DefaultOnrampErrorResolver.kt
index 0ec508bd89..09bc96ca6f 100644
--- a/data/onramp/src/main/java/com/tangem/data/onramp/DefaultOnrampErrorResolver.kt
+++ b/data/onramp/src/main/java/com/tangem/data/onramp/DefaultOnrampErrorResolver.kt
@@ -2,7 +2,9 @@ package com.tangem.data.onramp
import com.tangem.data.onramp.converters.error.OnrampErrorConverter
import com.tangem.datasource.api.common.response.ApiResponseError
-import com.tangem.domain.onramp.model.OnrampError
+import com.tangem.domain.onramp.model.error.OnrampError
+import com.tangem.domain.onramp.model.error.OnrampPairsError
+import com.tangem.domain.onramp.model.error.OnrampRedirectError
import com.tangem.domain.onramp.repositories.OnrampErrorResolver
internal class DefaultOnrampErrorResolver(
@@ -10,10 +12,16 @@ internal class DefaultOnrampErrorResolver(
) : OnrampErrorResolver {
override fun resolve(throwable: Throwable): OnrampError {
- return if (throwable is ApiResponseError.HttpException) {
- onrampErrorConverter.convert(throwable.errorBody.orEmpty())
- } else {
- OnrampError.UnknownError
+ return when (throwable) {
+ is ApiResponseError.HttpException -> {
+ onrampErrorConverter.convert(throwable.errorBody.orEmpty())
+ }
+ is OnrampRedirectError.WrongRequestId -> OnrampError.RedirectError.WrongRequestId
+ is OnrampRedirectError.VerificationFailed -> OnrampError.RedirectError.VerificationFailed
+ is OnrampPairsError.PairsNotFound -> OnrampError.PairsNotFound
+ else -> {
+ OnrampError.DomainError(throwable.message)
+ }
}
}
}
\ No newline at end of file
diff --git a/data/onramp/src/main/java/com/tangem/data/onramp/DefaultOnrampRepository.kt b/data/onramp/src/main/java/com/tangem/data/onramp/DefaultOnrampRepository.kt
index bdbb147344..ca78dbeca6 100644
--- a/data/onramp/src/main/java/com/tangem/data/onramp/DefaultOnrampRepository.kt
+++ b/data/onramp/src/main/java/com/tangem/data/onramp/DefaultOnrampRepository.kt
@@ -1,32 +1,493 @@
package com.tangem.data.onramp
+import com.squareup.moshi.Moshi
+import com.tangem.blockchain.extensions.toBigDecimalOrDefault
+import com.tangem.core.deeplink.global.BuyCurrencyDeepLink
+import com.tangem.data.common.api.safeApiCall
import com.tangem.data.onramp.converters.CountryConverter
import com.tangem.data.onramp.converters.CurrencyConverter
+import com.tangem.data.onramp.converters.PaymentMethodConverter
+import com.tangem.data.onramp.converters.StatusConverter
+import com.tangem.data.onramp.converters.error.OnrampErrorConverter
+import com.tangem.datasource.api.common.response.ApiResponseError
import com.tangem.datasource.api.common.response.getOrThrow
+import com.tangem.datasource.api.express.TangemExpressApi
+import com.tangem.datasource.api.express.models.TangemExpressValues
+import com.tangem.datasource.api.express.models.response.ExchangeProvider
+import com.tangem.datasource.api.express.models.response.ExchangeProviderType
+import com.tangem.datasource.api.express.models.response.ExpressErrorResponse
import com.tangem.datasource.api.onramp.OnrampApi
-import com.tangem.domain.onramp.model.OnrampCountry
-import com.tangem.domain.onramp.model.OnrampCurrency
+import com.tangem.datasource.api.onramp.models.common.OnrampDestinationDTO
+import com.tangem.datasource.api.onramp.models.request.OnrampPairsRequest
+import com.tangem.datasource.api.onramp.models.response.OnrampDataJson
+import com.tangem.datasource.api.onramp.models.response.model.OnrampCountryDTO
+import com.tangem.datasource.api.onramp.models.response.model.OnrampPairDTO
+import com.tangem.datasource.api.onramp.models.response.model.PaymentMethodDTO
+import com.tangem.datasource.crypto.DataSignatureVerifier
+import com.tangem.datasource.local.onramp.countries.OnrampCountriesStore
+import com.tangem.datasource.local.onramp.currencies.OnrampCurrenciesStore
+import com.tangem.datasource.local.onramp.pairs.OnrampPairsStore
+import com.tangem.datasource.local.onramp.paymentmethods.OnrampPaymentMethodsStore
+import com.tangem.datasource.local.onramp.quotes.OnrampQuotesStore
+import com.tangem.datasource.local.preferences.AppPreferencesStore
+import com.tangem.datasource.local.preferences.PreferencesKeys
+import com.tangem.datasource.local.preferences.utils.getObject
+import com.tangem.datasource.local.preferences.utils.getObjectSyncOrDefault
+import com.tangem.datasource.local.preferences.utils.getObjectSyncOrNull
+import com.tangem.datasource.local.preferences.utils.storeObject
+import com.tangem.domain.apptheme.model.AppThemeMode
+import com.tangem.domain.onramp.model.*
+import com.tangem.domain.onramp.model.cache.OnrampTransaction
+import com.tangem.domain.onramp.model.error.OnrampError
+import com.tangem.domain.onramp.model.error.OnrampPairsError
+import com.tangem.domain.onramp.model.error.OnrampRedirectError
import com.tangem.domain.onramp.repositories.OnrampRepository
+import com.tangem.domain.tokens.model.Amount
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.walletmanager.WalletManagersFacade
+import com.tangem.domain.wallets.models.UserWalletId
import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.mapNotNull
import kotlinx.coroutines.withContext
+import org.joda.time.DateTime
+import timber.log.Timber
+import java.util.UUID
+@Suppress("LongParameterList", "LargeClass", "TooManyFunctions")
internal class DefaultOnrampRepository(
private val onrampApi: OnrampApi,
+ private val expressApi: TangemExpressApi,
private val dispatchers: CoroutineDispatcherProvider,
+ private val appPreferencesStore: AppPreferencesStore,
+ private val paymentMethodsStore: OnrampPaymentMethodsStore,
+ private val pairsStore: OnrampPairsStore,
+ private val quotesStore: OnrampQuotesStore,
+ private val countriesStore: OnrampCountriesStore,
+ private val currenciesStore: OnrampCurrenciesStore,
+ private val walletManagersFacade: WalletManagersFacade,
+ private val dataSignatureVerifier: DataSignatureVerifier,
+ moshi: Moshi,
) : OnrampRepository {
private val currencyConverter = CurrencyConverter()
- private val countryConverter = CountryConverter()
+ private val countryConverter = CountryConverter(currencyConverter)
+ private val statusConverter = StatusConverter()
+ private val paymentMethodsConverter = PaymentMethodConverter()
+ private val onrampDataAdapter = moshi.adapter(OnrampDataJson::class.java)
+ private val onrampErrorAdapter = moshi.adapter(ExpressErrorResponse::class.java)
+ private val onrampErrorConverter = OnrampErrorConverter(onrampErrorAdapter)
- override suspend fun getCurrencies(): List = withContext(dispatchers.io) {
- onrampApi.getCurrencies()
+ override fun getCurrencies(): Flow> = currenciesStore.get(CURRENCIES_KEY)
+
+ override suspend fun fetchCurrencies() = withContext(dispatchers.io) {
+ if (!currenciesStore.getSyncOrNull(CURRENCIES_KEY).isNullOrEmpty()) return@withContext
+
+ val result = onrampApi.getCurrencies()
.getOrThrow()
.map(currencyConverter::convert)
+
+ currenciesStore.store(CURRENCIES_KEY, result)
}
- override suspend fun getCountries(): List = withContext(dispatchers.io) {
- onrampApi.getCountries()
+ override fun getCountries(): Flow> = countriesStore.get(COUNTRIES_KEY)
+
+ override suspend fun getCountriesSync(): List? {
+ return countriesStore.getSyncOrNull(COUNTRIES_KEY)
+ }
+
+ override suspend fun fetchCountries(): List = withContext(dispatchers.io) {
+ if (!countriesStore.getSyncOrNull(COUNTRIES_KEY).isNullOrEmpty()) return@withContext emptyList()
+
+ val result = onrampApi.getCountries()
.getOrThrow()
.map(countryConverter::convert)
+
+ countriesStore.store(COUNTRIES_KEY, result)
+
+ result
+ }
+
+ override suspend fun getCountryByIp(): OnrampCountry = withContext(dispatchers.io) {
+ onrampApi.getCountryByIp()
+ .getOrThrow()
+ .let(countryConverter::convert)
+ }
+
+ override suspend fun getStatus(txId: String): OnrampStatus = withContext(dispatchers.io) {
+ onrampApi.getStatus(txId)
+ .getOrThrow()
+ .let(statusConverter::convert)
+ }
+
+ override suspend fun saveDefaultCurrency(currency: OnrampCurrency) = withContext(dispatchers.io) {
+ val country = getDefaultCountrySync() ?: return@withContext
+ appPreferencesStore.storeObject(
+ key = PreferencesKeys.ONRAMP_DEFAULT_COUNTRY,
+ value = countryConverter.convertBack(country.copy(defaultCurrency = currency)),
+ )
+ }
+
+ override suspend fun getDefaultCurrencySync(): OnrampCurrency? = withContext(dispatchers.io) {
+ appPreferencesStore
+ .getObjectSyncOrNull(PreferencesKeys.ONRAMP_DEFAULT_COUNTRY)
+ ?.let(countryConverter::convert)?.defaultCurrency
+ }
+
+ override fun getDefaultCurrency(): Flow {
+ return appPreferencesStore
+ .getObject(PreferencesKeys.ONRAMP_DEFAULT_COUNTRY)
+ .map { it?.let(countryConverter::convert)?.defaultCurrency }
+ }
+
+ override suspend fun saveDefaultCountry(country: OnrampCountry) = withContext(dispatchers.io) {
+ appPreferencesStore.storeObject(
+ key = PreferencesKeys.ONRAMP_DEFAULT_COUNTRY,
+ value = countryConverter.convertBack(country),
+ )
+ }
+
+ override suspend fun getDefaultCountrySync(): OnrampCountry? = withContext(dispatchers.io) {
+ appPreferencesStore
+ .getObjectSyncOrNull(PreferencesKeys.ONRAMP_DEFAULT_COUNTRY)
+ ?.let(countryConverter::convert)
+ }
+
+ override fun getDefaultCountry(): Flow {
+ return appPreferencesStore
+ .getObject(PreferencesKeys.ONRAMP_DEFAULT_COUNTRY)
+ .map { it?.let(countryConverter::convert) }
+ }
+
+ override suspend fun fetchPaymentMethodsIfAbsent() = withContext(dispatchers.io) {
+ if (paymentMethodsStore.contains(PAYMENT_METHODS_KEY)) return@withContext
+
+ val response = safeApiCall(
+ call = { onrampApi.getPaymentMethods().bind() },
+ onError = {
+ Timber.w(it, "Unable to fetch onramp payment methods")
+ throw it
+ },
+ )
+ paymentMethodsStore.store(PAYMENT_METHODS_KEY, response.removeApplePay())
+ }
+
+ override suspend fun fetchPairs(currency: OnrampCurrency, country: OnrampCountry, cryptoCurrency: CryptoCurrency) =
+ withContext(dispatchers.io) {
+ val onrampPairs = async {
+ safeApiCall(
+ call = {
+ onrampApi.getPairs(
+ body = OnrampPairsRequest(
+ fromCurrencyCode = currency.code,
+ countryCode = country.code,
+ to = listOf(
+ OnrampDestinationDTO(
+ contractAddress = cryptoCurrency.getContractAddress(),
+ network = cryptoCurrency.network.backendId,
+ ),
+ ),
+ ),
+ ).bind()
+ },
+ onError = {
+ Timber.w(it, "Unable to fetch onramp pairs")
+ throw it
+ },
+ )
+ }
+ val providers = async {
+ safeApiCall(
+ call = { expressApi.getProviders().bind() },
+ onError = {
+ Timber.w(it, "Unable to fetch express providers")
+ throw it
+ },
+ )
+ }
+ storeOnrampPairs(pairs = onrampPairs.await(), providers = providers.await())
+ }
+
+ override suspend fun fetchQuotes(cryptoCurrency: CryptoCurrency, amount: Amount) = withContext(dispatchers.io) {
+ val pairs = requireNotNull(pairsStore.getSyncOrNull(PAIRS_KEY)) {
+ "Unable to get pairs. At this point they must not be null."
+ }
+ val amountValue = requireNotNull(amount.value) { "Amount value must not be null" }
+ val fromAmount = amountValue.movePointRight(amount.decimals).toString()
+ val currency = requireNotNull(getDefaultCurrencySync()) { "Default currency must not be null" }
+ val country = requireNotNull(getDefaultCountrySync()) { "Default country must not be null" }
+ val fromOnrampAmount = OnrampAmount(
+ value = fromAmount
+ .toBigDecimalOrDefault()
+ .movePointLeft(currency.precision),
+ decimals = currency.precision,
+ symbol = amount.currencySymbol,
+ )
+ val quotes: List = pairs.flatMap { pair ->
+ pair.providers.flatMap { provider ->
+ provider.paymentMethods.map { paymentMethod ->
+ async {
+ safeApiCall(
+ call = {
+ val response = onrampApi.getQuote(
+ fromCurrencyCode = currency.code,
+ fromPrecision = currency.precision,
+ toContractAddress = cryptoCurrency.getContractAddress(),
+ toNetwork = cryptoCurrency.network.backendId,
+ paymentMethod = paymentMethod.id,
+ countryCode = country.code,
+ fromAmount = fromAmount,
+ toDecimals = cryptoCurrency.decimals,
+ providerId = provider.id,
+ ).bind()
+ OnrampQuote.Data(
+ fromAmount = fromOnrampAmount,
+ toAmount = convertToAmount(response.toAmount, cryptoCurrency),
+ minFromAmount = convertToAmount(response.minFromAmount, cryptoCurrency),
+ maxFromAmount = convertToAmount(response.maxFromAmount, cryptoCurrency),
+ paymentMethod = paymentMethod,
+ provider = provider,
+ )
+ },
+ onError = { error ->
+ convertQuoteError(
+ error = error,
+ paymentMethod = paymentMethod,
+ provider = provider,
+ fromOnrampAmount = fromOnrampAmount,
+ )
+ },
+ )
+ }
+ }
+ }
+ }.awaitAll().filterNotNull()
+ quotesStore.store(QUOTES_KEY, quotes)
+ }
+
+ override fun getQuotes(): Flow> {
+ return quotesStore.get(QUOTES_KEY)
+ }
+
+ override suspend fun getQuotesSync(): List? {
+ return quotesStore.getSyncOrNull(QUOTES_KEY)
+ }
+
+ override suspend fun getOnrampData(
+ userWalletId: UserWalletId,
+ cryptoCurrency: CryptoCurrency,
+ quote: OnrampProviderWithQuote.Data,
+ ): OnrampTransaction = withContext(dispatchers.io) {
+ try {
+ val address = requireNotNull(
+ value = walletManagersFacade.getDefaultAddress(userWalletId, cryptoCurrency.network),
+ lazyMessage = { "Address must not be null" },
+ )
+ val fromAmountString = quote.fromAmount.value.movePointRight(quote.fromAmount.decimals).toString()
+ val currency = requireNotNull(getDefaultCurrencySync()) { "Default currency must not be null" }
+ val country = requireNotNull(getDefaultCountrySync()) { "Default country must not be null" }
+ val requestId = UUID.randomUUID().toString()
+ val data = safeApiCall(
+ call = {
+ onrampApi.getData(
+ fromCurrencyCode = currency.code,
+ fromPrecision = currency.precision,
+ toContractAddress = cryptoCurrency.getContractAddress(),
+ toNetwork = cryptoCurrency.network.backendId,
+ paymentMethod = quote.paymentMethod.id,
+ countryCode = country.code,
+ fromAmount = fromAmountString,
+ toDecimals = cryptoCurrency.decimals,
+ providerId = quote.provider.id,
+ toAddress = address,
+ redirectUrl = BuyCurrencyDeepLink.ONRAMP_REDIRECT_DEEPLINK,
+ language = null,
+ theme = getTheme(),
+ requestId = requestId,
+ ).bind()
+ },
+ onError = { e ->
+ Timber.e(e)
+ throw e
+ },
+ )
+ if (dataSignatureVerifier.verifySignature(data.signature, data.dataJson)) {
+ val dataJson = requireNotNull(onrampDataAdapter.fromJson(data.dataJson)) {
+ "Can not parse dataJson. ${data.dataJson}"
+ }
+ if (requestId != dataJson.requestId) throw OnrampRedirectError.WrongRequestId
+
+ createOnrampTransaction(
+ txId = data.txId,
+ quote = quote,
+ onrampDataJson = dataJson,
+ userWalletId = userWalletId,
+ currency = currency,
+ cryptoCurrency = cryptoCurrency,
+ residency = country.name,
+ )
+ } else {
+ throw OnrampRedirectError.VerificationFailed
+ }
+ } catch (e: Exception) {
+ Timber.e(e)
+ throw e
+ }
+ }
+
+ override suspend fun getAvailablePaymentMethods(): Set {
+ val quotes = requireNotNull(quotesStore.getSyncOrNull(QUOTES_KEY)) { "Quotes must not be null" }
+ return quotes.mapTo(hashSetOf(), OnrampQuote::paymentMethod)
+ }
+
+ override suspend fun saveSelectedPaymentMethod(paymentMethod: OnrampPaymentMethod) {
+ val dto = paymentMethodsConverter.convertBack(paymentMethod)
+ paymentMethodsStore.store(SELECTED_PAYMENT_METHOD_KEY, listOf(dto))
+ }
+
+ override fun getSelectedPaymentMethod(): Flow {
+ return paymentMethodsStore
+ .get(SELECTED_PAYMENT_METHOD_KEY)
+ .mapNotNull { paymentMethods -> paymentMethods.firstOrNull()?.let(paymentMethodsConverter::convert) }
+ }
+
+ override suspend fun clearCache() = withContext(NonCancellable) {
+ paymentMethodsStore.clear()
+ pairsStore.clear()
+ quotesStore.clear()
+ countriesStore.clear()
+ currenciesStore.clear()
+ }
+
+ private suspend fun storeOnrampPairs(pairs: List, providers: List) {
+ if (pairs.isEmpty() || providers.isEmpty()) throw OnrampPairsError.PairsNotFound
+ val onrampPaymentMethods = getPaymentMethods()
+ val onrampPairs = pairs.map { pair ->
+ val onrampProviders = pair.providers.mapNotNull { onrampProviderDTO ->
+ val providerInfo = providers.find { provider ->
+ provider.id == onrampProviderDTO.providerId
+ } ?: return@mapNotNull null
+
+ OnrampProvider(
+ id = onrampProviderDTO.providerId,
+ info = OnrampProviderInfo(
+ name = providerInfo.name,
+ imageLarge = providerInfo.imageLargeUrl,
+ termsOfUseLink = providerInfo.termsOfUse,
+ privacyPolicyLink = providerInfo.privacyPolicy,
+ ),
+ paymentMethods = onrampPaymentMethods.filter { paymentMethod ->
+ onrampProviderDTO.paymentMethods.any { paymentMethod.id == it }
+ },
+ )
+ }
+
+ if (onrampProviders.isEmpty()) throw OnrampPairsError.PairsNotFound
+
+ OnrampPair(onrampProviders)
+ }
+ pairsStore.store(PAIRS_KEY, onrampPairs)
+ }
+
+ private suspend fun getPaymentMethods(): List {
+ return requireNotNull(paymentMethodsStore.getSyncOrNull(PAYMENT_METHODS_KEY)) {
+ "Onramp payment methods is absent in storage"
+ }.let(paymentMethodsConverter::convertList)
+ }
+
+ private fun createOnrampTransaction(
+ txId: String,
+ quote: OnrampProviderWithQuote.Data,
+ onrampDataJson: OnrampDataJson,
+ userWalletId: UserWalletId,
+ currency: OnrampCurrency,
+ cryptoCurrency: CryptoCurrency,
+ residency: String,
+ ): OnrampTransaction {
+ return OnrampTransaction(
+ txId = txId,
+ userWalletId = userWalletId,
+ fromAmount = quote.fromAmount.value,
+ fromCurrency = currency,
+ toAmount = quote.toAmount.value,
+ toCurrencyId = cryptoCurrency.id.value,
+ status = OnrampStatus.Status.Expired,
+ externalTxUrl = onrampDataJson.externalTxUrl,
+ externalTxId = onrampDataJson.externalTxId,
+ timestamp = DateTime.now().millis,
+ providerName = quote.provider.info.name,
+ providerImageUrl = quote.provider.info.imageLarge,
+ providerType = ExchangeProviderType.ONRAMP.name,
+ redirectUrl = onrampDataJson.widgetUrl,
+ paymentMethod = quote.paymentMethod.name,
+ residency = residency,
+ )
+ }
+
+ private fun CryptoCurrency.getContractAddress(): String = when (this) {
+ is CryptoCurrency.Coin -> TangemExpressValues.EMPTY_CONTRACT_ADDRESS_VALUE
+ is CryptoCurrency.Token -> this.contractAddress
+ }
+
+ private fun convertToAmount(value: String, cryptoCurrency: CryptoCurrency): OnrampAmount {
+ val cryptoValue = requireNotNull(value.toBigDecimalOrNull()) { "Can not parse $value to BigDecimal" }
+ return OnrampAmount(
+ value = cryptoValue.movePointLeft(cryptoCurrency.decimals),
+ symbol = cryptoCurrency.symbol,
+ decimals = cryptoCurrency.decimals,
+ )
+ }
+
+ private suspend fun getTheme(): String {
+ val appTheme = appPreferencesStore.getObjectSyncOrDefault(
+ key = PreferencesKeys.APP_THEME_MODE_KEY,
+ default = AppThemeMode.DEFAULT,
+ )
+ return when (appTheme) {
+ AppThemeMode.FORCE_DARK -> PROVIDER_THEME_DARK
+ AppThemeMode.FORCE_LIGHT,
+ AppThemeMode.FOLLOW_SYSTEM,
+ -> PROVIDER_THEME_LIGHT
+ }
+ }
+
+ private fun List.removeApplePay(): List = filterNot { it.id == "apple-pay" }
+
+ private fun convertQuoteError(
+ error: Throwable,
+ paymentMethod: OnrampPaymentMethod,
+ provider: OnrampProvider,
+ fromOnrampAmount: OnrampAmount,
+ ) = if (error is ApiResponseError.HttpException) {
+ val onrampError = onrampErrorConverter.convert(value = error.errorBody.orEmpty())
+ if (onrampError is OnrampError.AmountError) {
+ OnrampQuote.Error(
+ paymentMethod = paymentMethod,
+ provider = provider,
+ fromAmount = fromOnrampAmount,
+ error = onrampError,
+ )
+ } else {
+ Timber.w(error, "Unable to fetch onramp quotes for ${provider.id}. $error")
+ null
+ }
+ } else {
+ Timber.w(error, "Unable to fetch onramp quotes for ${provider.id}. $error")
+ null
+ }
+
+ private companion object {
+ const val PAYMENT_METHODS_KEY = "onramp_payment_methods"
+ const val SELECTED_PAYMENT_METHOD_KEY = "onramp_selected_payment_method"
+ const val PAIRS_KEY = "onramp_pairs"
+ const val QUOTES_KEY = "onramp_quotes"
+ const val COUNTRIES_KEY = "onramp_countries"
+ const val CURRENCIES_KEY = "onramp_currencies"
+ const val PROVIDER_THEME_DARK = "dark"
+ const val PROVIDER_THEME_LIGHT = "light"
}
}
\ No newline at end of file
diff --git a/data/onramp/src/main/java/com/tangem/data/onramp/DefaultOnrampTransactionRepository.kt b/data/onramp/src/main/java/com/tangem/data/onramp/DefaultOnrampTransactionRepository.kt
new file mode 100644
index 0000000000..d4fbe4d861
--- /dev/null
+++ b/data/onramp/src/main/java/com/tangem/data/onramp/DefaultOnrampTransactionRepository.kt
@@ -0,0 +1,90 @@
+package com.tangem.data.onramp
+
+import com.tangem.data.onramp.converters.TransactionConverter
+import com.tangem.data.onramp.models.OnrampTransactionDTO
+import com.tangem.datasource.local.preferences.AppPreferencesStore
+import com.tangem.datasource.local.preferences.PreferencesKeys
+import com.tangem.datasource.local.preferences.utils.getObjectSet
+import com.tangem.datasource.local.preferences.utils.getObjectSetSync
+import com.tangem.domain.onramp.model.OnrampStatus
+import com.tangem.domain.onramp.model.cache.OnrampTransaction
+import com.tangem.domain.onramp.repositories.OnrampTransactionRepository
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import com.tangem.utils.extensions.addOrReplace
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.withContext
+
+internal class DefaultOnrampTransactionRepository(
+ private val appPreferencesStore: AppPreferencesStore,
+ private val dispatchers: CoroutineDispatcherProvider,
+) : OnrampTransactionRepository {
+
+ private val transactionConverter = TransactionConverter()
+
+ override suspend fun storeTransaction(transaction: OnrampTransaction) {
+ withContext(dispatchers.io) {
+ appPreferencesStore.editData { mutablePreferences ->
+ val stored = mutablePreferences.getObjectSet(
+ PreferencesKeys.ONRAMP_TRANSACTIONS_STATUSES_KEY,
+ )?.map(transactionConverter::convert) ?: mutableSetOf()
+
+ val updated = stored.toMutableSet()
+ .addOrReplace(transaction) { it.externalTxId == transaction.externalTxId }
+ .map(transactionConverter::convertBack)
+ .toSet()
+
+ mutablePreferences.setObjectSet(
+ key = PreferencesKeys.ONRAMP_TRANSACTIONS_STATUSES_KEY,
+ value = updated,
+ )
+ }
+ }
+ }
+
+ override suspend fun getTransactionById(externalTxId: String): OnrampTransaction? = withContext(dispatchers.io) {
+ val stored = appPreferencesStore.getObjectSetSync(
+ PreferencesKeys.ONRAMP_TRANSACTIONS_STATUSES_KEY,
+ ).map(transactionConverter::convert)
+
+ stored.firstOrNull { it.externalTxId == externalTxId }
+ }
+
+ override fun getTransactions(
+ userWalletId: UserWalletId,
+ cryptoCurrencyId: CryptoCurrency.ID,
+ ): Flow> = appPreferencesStore
+ .getObjectSet(PreferencesKeys.ONRAMP_TRANSACTIONS_STATUSES_KEY)
+ .map { transactions ->
+ transactions.filter {
+ it.userWalletId == userWalletId && it.toCurrencyId == cryptoCurrencyId.value
+ }.map(transactionConverter::convert)
+ }
+
+ override suspend fun updateTransactionStatus(externalTxId: String, status: OnrampStatus.Status) =
+ withContext(dispatchers.io) {
+ val updatedTx = getTransactionById(externalTxId)?.copy(status = status) ?: return@withContext
+ storeTransaction(updatedTx)
+ }
+
+ override suspend fun removeTransaction(externalTxId: String) {
+ withContext(dispatchers.io) {
+ appPreferencesStore.editData { mutablePreferences ->
+ runCatching {
+ val stored = mutablePreferences.getObjectSet(
+ PreferencesKeys.ONRAMP_TRANSACTIONS_STATUSES_KEY,
+ )?.toMutableSet()
+
+ stored?.removeIf { it.externalTxId == externalTxId }
+
+ mutablePreferences.setObjectSet(
+ key = PreferencesKeys.ONRAMP_TRANSACTIONS_STATUSES_KEY,
+ value = stored ?: emptySet(),
+ )
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/data/onramp/src/main/java/com/tangem/data/onramp/converters/CountryConverter.kt b/data/onramp/src/main/java/com/tangem/data/onramp/converters/CountryConverter.kt
index 6d1c21f2d8..97099c62b1 100644
--- a/data/onramp/src/main/java/com/tangem/data/onramp/converters/CountryConverter.kt
+++ b/data/onramp/src/main/java/com/tangem/data/onramp/converters/CountryConverter.kt
@@ -2,13 +2,14 @@ package com.tangem.data.onramp.converters
import com.tangem.datasource.api.onramp.models.response.model.OnrampCountryDTO
import com.tangem.domain.onramp.model.OnrampCountry
-import com.tangem.utils.converter.Converter
+import com.tangem.utils.converter.TwoWayConverter
-internal class CountryConverter : Converter {
-
- private val currencyConverter = CurrencyConverter()
+internal class CountryConverter(
+ private val currencyConverter: CurrencyConverter,
+) : TwoWayConverter {
override fun convert(value: OnrampCountryDTO) = OnrampCountry(
+ id = "${value.alpha3}-${value.name}",
name = value.name,
code = value.code,
image = value.image,
@@ -17,4 +18,14 @@ internal class CountryConverter : Converter {
defaultCurrency = currencyConverter.convert(value.defaultCurrency),
onrampAvailable = value.onrampAvailable,
)
+
+ override fun convertBack(value: OnrampCountry): OnrampCountryDTO = OnrampCountryDTO(
+ name = value.name,
+ code = value.code,
+ image = value.image,
+ alpha3 = value.alpha3,
+ continent = value.continent,
+ defaultCurrency = currencyConverter.convertBack(value.defaultCurrency),
+ onrampAvailable = value.onrampAvailable,
+ )
}
\ No newline at end of file
diff --git a/data/onramp/src/main/java/com/tangem/data/onramp/converters/CurrencyConverter.kt b/data/onramp/src/main/java/com/tangem/data/onramp/converters/CurrencyConverter.kt
index 01e8ee6309..876e4ba880 100644
--- a/data/onramp/src/main/java/com/tangem/data/onramp/converters/CurrencyConverter.kt
+++ b/data/onramp/src/main/java/com/tangem/data/onramp/converters/CurrencyConverter.kt
@@ -2,14 +2,23 @@ package com.tangem.data.onramp.converters
import com.tangem.datasource.api.onramp.models.response.model.OnrampCurrencyDTO
import com.tangem.domain.onramp.model.OnrampCurrency
-import com.tangem.utils.converter.Converter
+import com.tangem.utils.converter.TwoWayConverter
-internal class CurrencyConverter : Converter {
+internal class CurrencyConverter : TwoWayConverter {
override fun convert(value: OnrampCurrencyDTO) = OnrampCurrency(
name = value.name,
code = value.code,
image = value.image,
precision = value.precision,
+ unit = value.unit ?: value.code,
+ )
+
+ override fun convertBack(value: OnrampCurrency): OnrampCurrencyDTO = OnrampCurrencyDTO(
+ name = value.name,
+ code = value.code,
+ image = value.image,
+ precision = value.precision,
+ unit = value.unit,
)
}
\ No newline at end of file
diff --git a/data/onramp/src/main/java/com/tangem/data/onramp/converters/PaymentMethodConverter.kt b/data/onramp/src/main/java/com/tangem/data/onramp/converters/PaymentMethodConverter.kt
new file mode 100644
index 0000000000..6371ca03bd
--- /dev/null
+++ b/data/onramp/src/main/java/com/tangem/data/onramp/converters/PaymentMethodConverter.kt
@@ -0,0 +1,21 @@
+package com.tangem.data.onramp.converters
+
+import com.tangem.datasource.api.onramp.models.response.model.PaymentMethodDTO
+import com.tangem.domain.onramp.model.OnrampPaymentMethod
+import com.tangem.domain.onramp.model.PaymentMethodType
+import com.tangem.utils.converter.TwoWayConverter
+
+internal class PaymentMethodConverter : TwoWayConverter {
+ override fun convert(value: PaymentMethodDTO): OnrampPaymentMethod = OnrampPaymentMethod(
+ id = value.id,
+ name = value.name,
+ imageUrl = value.image,
+ type = PaymentMethodType.getType(value.id),
+ )
+
+ override fun convertBack(value: OnrampPaymentMethod): PaymentMethodDTO = PaymentMethodDTO(
+ id = value.id,
+ name = value.name,
+ image = value.imageUrl,
+ )
+}
\ No newline at end of file
diff --git a/data/onramp/src/main/java/com/tangem/data/onramp/converters/StatusConverter.kt b/data/onramp/src/main/java/com/tangem/data/onramp/converters/StatusConverter.kt
new file mode 100644
index 0000000000..70805a77fe
--- /dev/null
+++ b/data/onramp/src/main/java/com/tangem/data/onramp/converters/StatusConverter.kt
@@ -0,0 +1,30 @@
+package com.tangem.data.onramp.converters
+
+import com.tangem.datasource.api.onramp.models.response.OnrampStatusResponse
+import com.tangem.domain.onramp.model.OnrampStatus
+import com.tangem.utils.converter.Converter
+
+internal class StatusConverter : Converter {
+ override fun convert(value: OnrampStatusResponse): OnrampStatus {
+ return OnrampStatus(
+ txId = value.txId,
+ providerId = value.providerId,
+ payoutAddress = value.payoutAddress,
+ status = OnrampStatus.Status.valueOf(value.status.name),
+ failReason = value.failReason,
+ externalTxId = value.externalTxId,
+ externalTxUrl = value.externalTxUrl,
+ payoutHash = value.payoutHash,
+ createdAt = value.createdAt,
+ fromCurrencyCode = value.fromCurrencyCode,
+ fromAmount = value.fromAmount,
+ toContractAddress = value.toContractAddress,
+ toNetwork = value.toNetwork,
+ toDecimals = value.toDecimals,
+ toAmount = value.toAmount,
+ toActualAmount = value.toActualAmount,
+ paymentMethod = value.paymentMethod,
+ countryCode = value.countryCode,
+ )
+ }
+}
\ No newline at end of file
diff --git a/data/onramp/src/main/java/com/tangem/data/onramp/converters/TransactionConverter.kt b/data/onramp/src/main/java/com/tangem/data/onramp/converters/TransactionConverter.kt
new file mode 100644
index 0000000000..1ca843a50e
--- /dev/null
+++ b/data/onramp/src/main/java/com/tangem/data/onramp/converters/TransactionConverter.kt
@@ -0,0 +1,53 @@
+package com.tangem.data.onramp.converters
+
+import com.tangem.data.onramp.models.OnrampTransactionDTO
+import com.tangem.datasource.api.onramp.models.response.Status
+import com.tangem.domain.onramp.model.OnrampStatus
+import com.tangem.domain.onramp.model.cache.OnrampTransaction
+import com.tangem.utils.converter.TwoWayConverter
+
+internal class TransactionConverter : TwoWayConverter {
+
+ private val currencyConverter = CurrencyConverter()
+
+ override fun convert(value: OnrampTransactionDTO): OnrampTransaction {
+ return OnrampTransaction(
+ txId = value.txId,
+ userWalletId = value.userWalletId,
+ fromAmount = value.fromAmount,
+ fromCurrency = currencyConverter.convert(value.fromCurrency),
+ toAmount = value.toAmount,
+ toCurrencyId = value.toCurrencyId,
+ status = OnrampStatus.Status.valueOf(value.status.name),
+ externalTxUrl = value.externalTxUrl,
+ externalTxId = value.externalTxId,
+ timestamp = value.timestamp,
+ providerName = value.providerName,
+ providerImageUrl = value.providerImageUrl,
+ providerType = value.providerType,
+ redirectUrl = "", // not necessary field
+ paymentMethod = value.paymentMethod,
+ residency = value.residency,
+ )
+ }
+
+ override fun convertBack(value: OnrampTransaction): OnrampTransactionDTO {
+ return OnrampTransactionDTO(
+ txId = value.txId,
+ userWalletId = value.userWalletId,
+ fromAmount = value.fromAmount,
+ fromCurrency = currencyConverter.convertBack(value.fromCurrency),
+ toAmount = value.toAmount,
+ toCurrencyId = value.toCurrencyId,
+ status = Status.valueOf(value.status.name),
+ externalTxUrl = value.externalTxUrl,
+ externalTxId = value.externalTxId,
+ timestamp = value.timestamp,
+ providerName = value.providerName,
+ providerImageUrl = value.providerImageUrl,
+ providerType = value.providerType,
+ paymentMethod = value.paymentMethod,
+ residency = value.residency,
+ )
+ }
+}
\ No newline at end of file
diff --git a/data/onramp/src/main/java/com/tangem/data/onramp/converters/error/OnrampErrorConverter.kt b/data/onramp/src/main/java/com/tangem/data/onramp/converters/error/OnrampErrorConverter.kt
index b676ed5006..895da30c18 100644
--- a/data/onramp/src/main/java/com/tangem/data/onramp/converters/error/OnrampErrorConverter.kt
+++ b/data/onramp/src/main/java/com/tangem/data/onramp/converters/error/OnrampErrorConverter.kt
@@ -1,11 +1,44 @@
package com.tangem.data.onramp.converters.error
-import com.tangem.domain.onramp.model.OnrampError
+import com.squareup.moshi.JsonAdapter
+import com.tangem.datasource.api.express.models.response.ExpressError
+import com.tangem.datasource.api.express.models.response.ExpressErrorResponse
+import com.tangem.domain.onramp.model.error.OnrampError
import com.tangem.utils.converter.Converter
-internal class OnrampErrorConverter : Converter {
+internal class OnrampErrorConverter(
+ private val jsonAdapter: JsonAdapter,
+) : Converter {
+ @Suppress("MagicNumber")
override fun convert(value: String): OnrampError {
- return OnrampError.UnknownError
+ try {
+ val error = jsonAdapter.fromJson(value)?.error ?: return OnrampError.DomainError(value)
+ return when (error.code) {
+ 2250 -> tryParseExchangeTooSmallAmountError(error = error)
+ 2251 -> tryParseExchangeTooBigAmountError(error = error)
+ else -> OnrampError.DataError(error.code.toString(), error.description)
+ }
+ } catch (e: Exception) {
+ return OnrampError.DomainError(e.message)
+ }
+ }
+
+ private fun tryParseExchangeTooSmallAmountError(error: ExpressError): OnrampError {
+ val minAmount = error.value?.minAmount ?: return OnrampError.DataError(error.code.toString(), error.description)
+ val decimals = error.value?.decimals ?: return OnrampError.DataError(error.code.toString(), error.description)
+ val requiredAmount = minAmount.toBigDecimalOrNull()?.movePointLeft(decimals)
+ ?: return OnrampError.DataError(error.code.toString(), error.description)
+
+ return OnrampError.AmountError.TooSmallError(requiredAmount = requiredAmount)
+ }
+
+ private fun tryParseExchangeTooBigAmountError(error: ExpressError): OnrampError {
+ val maxAmount = error.value?.maxAmount ?: return OnrampError.DataError(error.code.toString(), error.description)
+ val decimals = error.value?.decimals ?: return OnrampError.DataError(error.code.toString(), error.description)
+ val requiredAmount = maxAmount.toBigDecimalOrNull()?.movePointLeft(decimals)
+ ?: return OnrampError.DataError(error.code.toString(), error.description)
+
+ return OnrampError.AmountError.TooBigError(requiredAmount = requiredAmount)
}
}
\ No newline at end of file
diff --git a/data/onramp/src/main/java/com/tangem/data/onramp/di/OnrampDataModule.kt b/data/onramp/src/main/java/com/tangem/data/onramp/di/OnrampDataModule.kt
index c1b0d24e4b..febd5c21c9 100644
--- a/data/onramp/src/main/java/com/tangem/data/onramp/di/OnrampDataModule.kt
+++ b/data/onramp/src/main/java/com/tangem/data/onramp/di/OnrampDataModule.kt
@@ -1,8 +1,25 @@
package com.tangem.data.onramp.di
+import com.squareup.moshi.Moshi
+import com.tangem.data.onramp.DefaultOnrampErrorResolver
import com.tangem.data.onramp.DefaultOnrampRepository
+import com.tangem.data.onramp.DefaultOnrampTransactionRepository
+import com.tangem.data.onramp.converters.error.OnrampErrorConverter
+import com.tangem.datasource.api.express.TangemExpressApi
+import com.tangem.datasource.api.express.models.response.ExpressErrorResponse
import com.tangem.datasource.api.onramp.OnrampApi
+import com.tangem.datasource.crypto.DataSignatureVerifier
+import com.tangem.datasource.di.NetworkMoshi
+import com.tangem.datasource.local.onramp.countries.OnrampCountriesStore
+import com.tangem.datasource.local.onramp.currencies.OnrampCurrenciesStore
+import com.tangem.datasource.local.onramp.pairs.OnrampPairsStore
+import com.tangem.datasource.local.onramp.paymentmethods.OnrampPaymentMethodsStore
+import com.tangem.datasource.local.onramp.quotes.OnrampQuotesStore
+import com.tangem.datasource.local.preferences.AppPreferencesStore
+import com.tangem.domain.onramp.repositories.OnrampErrorResolver
import com.tangem.domain.onramp.repositories.OnrampRepository
+import com.tangem.domain.onramp.repositories.OnrampTransactionRepository
+import com.tangem.domain.walletmanager.WalletManagersFacade
import com.tangem.utils.coroutines.CoroutineDispatcherProvider
import dagger.Module
import dagger.Provides
@@ -16,10 +33,54 @@ internal object OnrampDataModule {
@Provides
@Singleton
- fun provideOnrampRepository(onrampApi: OnrampApi, dispatchers: CoroutineDispatcherProvider): OnrampRepository {
+ fun provideOnrampRepository(
+ onrampApi: OnrampApi,
+ expressApi: TangemExpressApi,
+ dispatchers: CoroutineDispatcherProvider,
+ appPreferencesStore: AppPreferencesStore,
+ paymentMethodsStore: OnrampPaymentMethodsStore,
+ pairsStore: OnrampPairsStore,
+ quotesStore: OnrampQuotesStore,
+ countriesStore: OnrampCountriesStore,
+ currenciesStore: OnrampCurrenciesStore,
+ walletManagersFacade: WalletManagersFacade,
+ dataSignatureVerifier: DataSignatureVerifier,
+ @NetworkMoshi moshi: Moshi,
+ ): OnrampRepository {
return DefaultOnrampRepository(
onrampApi = onrampApi,
+ expressApi = expressApi,
+ dispatchers = dispatchers,
+ appPreferencesStore = appPreferencesStore,
+ paymentMethodsStore = paymentMethodsStore,
+ pairsStore = pairsStore,
+ quotesStore = quotesStore,
+ currenciesStore = currenciesStore,
+ countriesStore = countriesStore,
+ walletManagersFacade = walletManagersFacade,
+ dataSignatureVerifier = dataSignatureVerifier,
+ moshi = moshi,
+ )
+ }
+
+ @Provides
+ @Singleton
+ fun provideOnrampTransactionRepository(
+ appPreferencesStore: AppPreferencesStore,
+ dispatchers: CoroutineDispatcherProvider,
+ ): OnrampTransactionRepository {
+ return DefaultOnrampTransactionRepository(
+ appPreferencesStore = appPreferencesStore,
dispatchers = dispatchers,
)
}
+
+ @Provides
+ @Singleton
+ fun provideOnrampErrorResolver(@NetworkMoshi moshi: Moshi): OnrampErrorResolver {
+ val jsonAdapter = moshi.adapter(ExpressErrorResponse::class.java)
+ return DefaultOnrampErrorResolver(
+ OnrampErrorConverter(jsonAdapter),
+ )
+ }
}
\ No newline at end of file
diff --git a/data/onramp/src/main/java/com/tangem/data/onramp/models/OnrampTransactionDTO.kt b/data/onramp/src/main/java/com/tangem/data/onramp/models/OnrampTransactionDTO.kt
new file mode 100644
index 0000000000..bf4ceee745
--- /dev/null
+++ b/data/onramp/src/main/java/com/tangem/data/onramp/models/OnrampTransactionDTO.kt
@@ -0,0 +1,59 @@
+package com.tangem.data.onramp.models
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import com.tangem.datasource.api.onramp.models.response.Status
+import com.tangem.datasource.api.onramp.models.response.model.OnrampCurrencyDTO
+import com.tangem.domain.core.serialization.SerializedBigDecimal
+import com.tangem.domain.wallets.models.UserWalletId
+
+/**
+ * Model for local storing onramp transaction
+ *
+ * @property txId Inner express tx id
+ * @property userWalletId Wallet where tx was performed
+ * @property fromAmount Onramp amount to buy crypto
+ * @property fromCurrency Onramp currency
+ * @property toAmount Receiving crypto amount
+ * @property toCurrencyId Receiving crypto currency id [CryptoCurrency.ID.value]
+ * @property status Transaction status
+ * @property externalTxUrl Link to transaction on provider side
+ * @property externalTxId Id of transaction on provider side
+ * @property timestamp Transaction create time
+ * @property providerName Provider name
+ * @property providerImageUrl Provider image link
+ * @property providerType Provider type
+ */
+@JsonClass(generateAdapter = true)
+data class OnrampTransactionDTO(
+ @Json(name = "txId")
+ val txId: String,
+ @Json(name = "userWalletId")
+ val userWalletId: UserWalletId,
+ @Json(name = "fromAmount")
+ val fromAmount: SerializedBigDecimal,
+ @Json(name = "fromCurrency")
+ val fromCurrency: OnrampCurrencyDTO,
+ @Json(name = "toAmount")
+ val toAmount: SerializedBigDecimal,
+ @Json(name = "toCurrencyId")
+ val toCurrencyId: String,
+ @Json(name = "status")
+ val status: Status,
+ @Json(name = "externalTxUrl")
+ val externalTxUrl: String?,
+ @Json(name = "externalTxId")
+ val externalTxId: String?,
+ @Json(name = "timestamp")
+ val timestamp: Long,
+ @Json(name = "providerName")
+ val providerName: String, // todo onramp fix after SwapProvider moved to own module
+ @Json(name = "providerImageUrl")
+ val providerImageUrl: String, // todo onramp fix after SwapProvider moved to own module
+ @Json(name = "providerType")
+ val providerType: String, // todo onramp fix after SwapProvider moved to own module
+ @Json(name = "paymentMethod")
+ val paymentMethod: String,
+ @Json(name = "residency")
+ val residency: String,
+)
\ No newline at end of file
diff --git a/data/promo/src/main/java/com/tangem/data/promo/DefaultPromoRepository.kt b/data/promo/src/main/java/com/tangem/data/promo/DefaultPromoRepository.kt
index fbd89738aa..0a81c2200c 100644
--- a/data/promo/src/main/java/com/tangem/data/promo/DefaultPromoRepository.kt
+++ b/data/promo/src/main/java/com/tangem/data/promo/DefaultPromoRepository.kt
@@ -23,15 +23,6 @@ internal class DefaultPromoRepository(
}.getOrNull()
}
- override suspend fun getTravalaPromoBanner(): PromoBanner? {
- return runCatching(dispatchers.io) {
- promoResponseConverter.convert(
- tangemApi.getPromotionInfo(TRAVALA)
- .getOrThrow(),
- )
- }.getOrNull()
- }
-
override suspend fun getOkxPromoBanner(): PromoBanner? {
return runCatching(dispatchers.io) {
promoResponseConverter.convert(
@@ -52,7 +43,6 @@ internal class DefaultPromoRepository(
private companion object {
private const val CHANGELLY_NAME = "changelly"
- private const val TRAVALA = "travala"
private const val OKX = "okx"
private const val RING = "ring"
}
diff --git a/data/settings/src/main/java/com/tangem/data/settings/DefaultPromoSettingsRepository.kt b/data/settings/src/main/java/com/tangem/data/settings/DefaultPromoSettingsRepository.kt
index ecd647ae73..8a2b5aa1d9 100644
--- a/data/settings/src/main/java/com/tangem/data/settings/DefaultPromoSettingsRepository.kt
+++ b/data/settings/src/main/java/com/tangem/data/settings/DefaultPromoSettingsRepository.kt
@@ -4,7 +4,6 @@ import com.tangem.datasource.local.preferences.AppPreferencesStore
import com.tangem.datasource.local.preferences.PreferencesKeys.ADDED_WALLETS_WITH_RING_KEY
import com.tangem.datasource.local.preferences.PreferencesKeys.IS_TOKEN_SWAP_PROMO_OKX_SHOW_KEY
import com.tangem.datasource.local.preferences.PreferencesKeys.IS_WALLET_SWAP_PROMO_OKX_SHOW_KEY
-import com.tangem.datasource.local.preferences.PreferencesKeys.IS_WALLET_TRAVALA_PROMO_SHOWN_KEY
import com.tangem.datasource.local.preferences.PreferencesKeys.SHOULD_SHOW_RING_PROMO_KEY
import com.tangem.datasource.local.preferences.utils.get
import com.tangem.datasource.local.preferences.utils.store
@@ -42,17 +41,6 @@ class DefaultPromoSettingsRepository(
)
}
- override fun isReadyToShowWalletTravalaPromo(): Flow {
- return appPreferencesStore.get(IS_WALLET_TRAVALA_PROMO_SHOWN_KEY, true)
- }
-
- override suspend fun setNeverToShowWalletTravalaPromo() {
- appPreferencesStore.store(
- key = IS_WALLET_TRAVALA_PROMO_SHOWN_KEY,
- value = false,
- )
- }
-
override fun isReadyToShowRingPromo(userWalletId: UserWalletId): Flow {
return combine(
flow = appPreferencesStore
diff --git a/data/settings/src/main/java/com/tangem/data/settings/DefaultSettingsRepository.kt b/data/settings/src/main/java/com/tangem/data/settings/DefaultSettingsRepository.kt
index 6ea8cb2b4d..3c6c740e2e 100644
--- a/data/settings/src/main/java/com/tangem/data/settings/DefaultSettingsRepository.kt
+++ b/data/settings/src/main/java/com/tangem/data/settings/DefaultSettingsRepository.kt
@@ -17,6 +17,7 @@ import kotlinx.coroutines.withContext
import timber.log.Timber
import java.util.Locale
+@Suppress("TooManyFunctions")
internal class DefaultSettingsRepository(
private val appPreferencesStore: AppPreferencesStore,
private val appLogsStore: AppLogsStore,
@@ -147,4 +148,26 @@ internal class DefaultSettingsRepository(
userCountryFlow.value = code
}
}
+
+ override suspend fun setGoogleServicesAvailability(value: Boolean) {
+ appPreferencesStore.store(key = PreferencesKeys.IS_GOOGLE_SERVICES_AVAILABLE_KEY, value = value)
+ }
+
+ override suspend fun isGoogleServicesAvailability(): Boolean {
+ return appPreferencesStore.getSyncOrDefault(
+ key = PreferencesKeys.IS_GOOGLE_SERVICES_AVAILABLE_KEY,
+ default = false,
+ )
+ }
+
+ override suspend fun setGooglePayAvailability(value: Boolean) {
+ appPreferencesStore.store(key = PreferencesKeys.IS_GOOGLE_PAY_AVAILABLE_KEY, value = value)
+ }
+
+ override suspend fun isGooglePayAvailability(): Boolean {
+ return appPreferencesStore.getSyncOrDefault(
+ key = PreferencesKeys.IS_GOOGLE_PAY_AVAILABLE_KEY,
+ default = false,
+ )
+ }
}
\ No newline at end of file
diff --git a/data/staking/src/main/java/com/tangem/data/staking/DefaultStakingRepository.kt b/data/staking/src/main/java/com/tangem/data/staking/DefaultStakingRepository.kt
index 0e66a0da16..f2f8cf8090 100644
--- a/data/staking/src/main/java/com/tangem/data/staking/DefaultStakingRepository.kt
+++ b/data/staking/src/main/java/com/tangem/data/staking/DefaultStakingRepository.kt
@@ -10,7 +10,7 @@ import com.tangem.blockchain.common.TransactionStatus
import com.tangem.blockchain.common.transaction.Fee
import com.tangem.blockchainsdk.utils.fromNetworkId
import com.tangem.blockchainsdk.utils.toCoinId
-import com.tangem.blockchainsdk.utils.toMigratedCointId
+import com.tangem.blockchainsdk.utils.toMigratedCoinId
import com.tangem.common.extensions.hexToBytes
import com.tangem.common.extensions.toCompressedPublicKey
import com.tangem.data.common.api.safeApiCall
@@ -49,7 +49,6 @@ import com.tangem.domain.tokens.model.Network
import com.tangem.domain.walletmanager.WalletManagersFacade
import com.tangem.domain.wallets.models.UserWalletId
import com.tangem.domain.wallets.usecase.GetUserWalletUseCase
-import com.tangem.features.staking.api.featuretoggles.StakingFeatureToggles
import com.tangem.lib.crypto.BlockchainUtils.isSolana
import com.tangem.utils.coroutines.CoroutineDispatcherProvider
import com.tangem.utils.extensions.orZero
@@ -68,7 +67,6 @@ internal class DefaultStakingRepository(
private val stakingBalanceStore: StakingBalanceStore,
private val cacheRegistry: CacheRegistry,
private val dispatchers: CoroutineDispatcherProvider,
- private val stakingFeatureToggle: StakingFeatureToggles,
private val walletManagersFacade: WalletManagersFacade,
private val getUserWalletUseCase: GetUserWalletUseCase,
moshi: Moshi,
@@ -323,8 +321,6 @@ internal class DefaultStakingRepository(
cryptoCurrency: CryptoCurrency,
refresh: Boolean,
) = withContext(dispatchers.io) {
- if (!stakingFeatureToggle.isStakingEnabled) return@withContext
-
cacheRegistry.invokeOnExpire(
key = getYieldBalancesKey(userWalletId),
skipCache = refresh,
@@ -364,30 +360,26 @@ internal class DefaultStakingRepository(
userWalletId: UserWalletId,
cryptoCurrency: CryptoCurrency,
): Flow = channelFlow {
- if (!stakingFeatureToggle.isStakingEnabled) {
- send(YieldBalance.Empty)
- } else {
- launch(dispatchers.io) {
- val address = walletManagersFacade.getDefaultAddress(userWalletId, cryptoCurrency.network).orEmpty()
- val integrationId = integrationIdMap[getIntegrationKey(cryptoCurrency.id)]
- ?: error("Could not get integrationId")
- stakingBalanceStore.get(userWalletId, address, integrationId)
- .distinctUntilChanged()
- .collectLatest {
- if (it != null) {
- send(yieldBalanceConverter.convert(it))
- } else {
- error("No yield balance available for currency ${cryptoCurrency.id.value}")
- }
+ launch(dispatchers.io) {
+ val address = walletManagersFacade.getDefaultAddress(userWalletId, cryptoCurrency.network).orEmpty()
+ val integrationId = integrationIdMap[getIntegrationKey(cryptoCurrency.id)]
+ ?: error("Could not get integrationId")
+ stakingBalanceStore.get(userWalletId, address, integrationId)
+ .distinctUntilChanged()
+ .collectLatest {
+ if (it != null) {
+ send(yieldBalanceConverter.convert(it))
+ } else {
+ error("No yield balance available for currency ${cryptoCurrency.id.value}")
}
- }
+ }
+ }
- withContext(dispatchers.io) {
- fetchSingleYieldBalance(
- userWalletId,
- cryptoCurrency,
- )
- }
+ withContext(dispatchers.io) {
+ fetchSingleYieldBalance(
+ userWalletId,
+ cryptoCurrency,
+ )
}
}.cancellable()
@@ -395,21 +387,17 @@ internal class DefaultStakingRepository(
userWalletId: UserWalletId,
cryptoCurrency: CryptoCurrency,
): YieldBalance = withContext(dispatchers.io) {
- if (!stakingFeatureToggle.isStakingEnabled) {
- YieldBalance.Empty
- } else {
- fetchSingleYieldBalance(userWalletId, cryptoCurrency)
+ fetchSingleYieldBalance(userWalletId, cryptoCurrency)
- val address = walletManagersFacade.getDefaultAddress(userWalletId, cryptoCurrency.network).orEmpty()
+ val address = walletManagersFacade.getDefaultAddress(userWalletId, cryptoCurrency.network).orEmpty()
- val integrationId = integrationIdMap[getIntegrationKey(cryptoCurrency.id)]
- ?: error("Could not get integrationId")
+ val integrationId = integrationIdMap[getIntegrationKey(cryptoCurrency.id)]
+ ?: error("Could not get integrationId")
- val result = stakingBalanceStore.getSyncOrNull(userWalletId, address, integrationId)
- ?: return@withContext YieldBalance.Error
+ val result = stakingBalanceStore.getSyncOrNull(userWalletId, address, integrationId)
+ ?: return@withContext YieldBalance.Error
- yieldBalanceConverter.convert(result)
- }
+ yieldBalanceConverter.convert(result)
}
override suspend fun fetchMultiYieldBalance(
@@ -417,8 +405,6 @@ internal class DefaultStakingRepository(
cryptoCurrencies: List,
refresh: Boolean,
) = withContext(dispatchers.io) {
- if (!stakingFeatureToggle.isStakingEnabled) return@withContext
-
cacheRegistry.invokeOnExpire(
key = getYieldBalancesKey(userWalletId),
skipCache = refresh,
@@ -484,19 +470,15 @@ internal class DefaultStakingRepository(
userWalletId: UserWalletId,
cryptoCurrencies: List,
): Flow = channelFlow {
- if (!stakingFeatureToggle.isStakingEnabled) {
- send(YieldBalanceList.Empty)
- } else {
- stakingBalanceStore.get(userWalletId)
- .onEach {
- val balances = yieldBalanceListConverter.convert(it)
- send(balances)
- }
- .launchIn(scope = this + dispatchers.io)
-
- withContext(dispatchers.io) {
- fetchMultiYieldBalance(userWalletId, cryptoCurrencies, refresh = false)
+ stakingBalanceStore.get(userWalletId)
+ .onEach {
+ val balances = yieldBalanceListConverter.convert(it)
+ send(balances)
}
+ .launchIn(scope = this + dispatchers.io)
+
+ withContext(dispatchers.io) {
+ fetchMultiYieldBalance(userWalletId, cryptoCurrencies, refresh = false)
}
}
@@ -504,13 +486,9 @@ internal class DefaultStakingRepository(
userWalletId: UserWalletId,
cryptoCurrencies: List,
): YieldBalanceList = withContext(dispatchers.io) {
- if (!stakingFeatureToggle.isStakingEnabled) {
- YieldBalanceList.Empty
- } else {
- fetchMultiYieldBalance(userWalletId, cryptoCurrencies)
- val result = stakingBalanceStore.getSyncOrNull(userWalletId) ?: return@withContext YieldBalanceList.Error
- yieldBalanceListConverter.convert(result)
- }
+ fetchMultiYieldBalance(userWalletId, cryptoCurrencies)
+ val result = stakingBalanceStore.getSyncOrNull(userWalletId) ?: return@withContext YieldBalanceList.Error
+ yieldBalanceListConverter.convert(result)
}
override suspend fun isAnyTokenStaked(userWalletId: UserWalletId): Boolean {
@@ -577,7 +555,7 @@ internal class DefaultStakingRepository(
override fun getStakingApproval(cryptoCurrency: CryptoCurrency): StakingApproval {
return when (getIntegrationKey(cryptoCurrency.id)) {
Blockchain.Ethereum.id + Blockchain.Polygon.toCoinId(),
- Blockchain.Ethereum.id + Blockchain.Polygon.toMigratedCointId(),
+ Blockchain.Ethereum.id + Blockchain.Polygon.toMigratedCoinId(),
-> StakingApproval.Needed(ETHEREUM_POLYGON_APPROVE_SPENDER)
else -> StakingApproval.Empty
}
@@ -666,7 +644,7 @@ internal class DefaultStakingRepository(
Blockchain.Solana.run { id + toCoinId() } to SOLANA_INTEGRATION_ID,
Blockchain.Cosmos.run { id + toCoinId() } to COSMOS_INTEGRATION_ID,
Blockchain.Tron.run { id + toCoinId() } to TRON_INTEGRATION_ID,
- Blockchain.Ethereum.id + Blockchain.Polygon.toMigratedCointId() to ETHEREUM_POLYGON_INTEGRATION_ID,
+ Blockchain.Ethereum.id + Blockchain.Polygon.toMigratedCoinId() to ETHEREUM_POLYGON_INTEGRATION_ID,
// Blockchain.Ethereum.id + Blockchain.Polygon.toCoinId() to ETHEREUM_POLYGON_INTEGRATION_ID,
Blockchain.BSC.run { id + toCoinId() } to BINANCE_INTEGRATION_ID,
// Blockchain.Polkadot.run { id + toCoinId() } to POLKADOT_INTEGRATION_ID,
diff --git a/data/staking/src/main/java/com/tangem/data/staking/di/StakingDataModule.kt b/data/staking/src/main/java/com/tangem/data/staking/di/StakingDataModule.kt
index f3a7879d5a..336bcb651e 100644
--- a/data/staking/src/main/java/com/tangem/data/staking/di/StakingDataModule.kt
+++ b/data/staking/src/main/java/com/tangem/data/staking/di/StakingDataModule.kt
@@ -18,7 +18,6 @@ import com.tangem.datasource.local.token.StakingYieldsStore
import com.tangem.domain.staking.repositories.*
import com.tangem.domain.walletmanager.WalletManagersFacade
import com.tangem.domain.wallets.usecase.GetUserWalletUseCase
-import com.tangem.features.staking.api.featuretoggles.StakingFeatureToggles
import com.tangem.utils.coroutines.CoroutineDispatcherProvider
import dagger.Module
import dagger.Provides
@@ -38,7 +37,6 @@ internal object StakingDataModule {
stakingBalanceStore: StakingBalanceStore,
cacheRegistry: CacheRegistry,
dispatchers: CoroutineDispatcherProvider,
- stakingFeatureToggle: StakingFeatureToggles,
walletManagersFacade: WalletManagersFacade,
getUserWalletUseCase: GetUserWalletUseCase,
@NetworkMoshi moshi: Moshi,
@@ -49,7 +47,6 @@ internal object StakingDataModule {
stakingBalanceStore = stakingBalanceStore,
cacheRegistry = cacheRegistry,
dispatchers = dispatchers,
- stakingFeatureToggle = stakingFeatureToggle,
walletManagersFacade = walletManagersFacade,
getUserWalletUseCase = getUserWalletUseCase,
moshi = moshi,
diff --git a/data/tokens/build.gradle.kts b/data/tokens/build.gradle.kts
index 7585dedc01..bf90a79e76 100644
--- a/data/tokens/build.gradle.kts
+++ b/data/tokens/build.gradle.kts
@@ -19,6 +19,7 @@ dependencies {
implementation(projects.domain.tokens.models)
implementation(projects.domain.txhistory.models)
implementation(projects.domain.wallets.models)
+ implementation(projects.domain.staking.models)
/** Project - Data */
implementation(projects.core.datasource)
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/di/TokensDataModule.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/di/TokensDataModule.kt
index cc7bb7a3fe..4250ccab0e 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/di/TokensDataModule.kt
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/di/TokensDataModule.kt
@@ -1,13 +1,13 @@
package com.tangem.data.tokens.di
+import com.tangem.blockchainsdk.utils.ExcludedBlockchains
import com.tangem.data.common.cache.CacheRegistry
import com.tangem.data.tokens.repository.*
-import com.tangem.datasource.api.express.TangemExpressApi
import com.tangem.datasource.api.tangemTech.TangemTechApi
+import com.tangem.datasource.exchangeservice.swap.ExpressServiceLoader
import com.tangem.datasource.local.network.NetworksStatusesStore
import com.tangem.datasource.local.preferences.AppPreferencesStore
import com.tangem.datasource.local.quote.QuotesStore
-import com.tangem.datasource.local.token.ExpressAssetsStore
import com.tangem.datasource.local.userwallet.UserWalletsStore
import com.tangem.domain.tokens.repository.*
import com.tangem.domain.walletmanager.WalletManagersFacade
@@ -26,23 +26,23 @@ internal object TokensDataModule {
@Singleton
fun provideCurrenciesRepository(
tangemTechApi: TangemTechApi,
- tangemExpressApi: TangemExpressApi,
appPreferencesStore: AppPreferencesStore,
userWalletsStore: UserWalletsStore,
walletManagersFacade: WalletManagersFacade,
- expressAssetsStore: ExpressAssetsStore,
cacheRegistry: CacheRegistry,
dispatchers: CoroutineDispatcherProvider,
+ expressServiceLoader: ExpressServiceLoader,
+ excludedBlockchains: ExcludedBlockchains,
): CurrenciesRepository {
return DefaultCurrenciesRepository(
tangemTechApi = tangemTechApi,
- tangemExpressApi = tangemExpressApi,
- appPreferencesStore = appPreferencesStore,
- walletManagersFacade = walletManagersFacade,
userWalletsStore = userWalletsStore,
- expressAssetsStore = expressAssetsStore,
+ walletManagersFacade = walletManagersFacade,
cacheRegistry = cacheRegistry,
+ appPreferencesStore = appPreferencesStore,
dispatchers = dispatchers,
+ expressServiceLoader = expressServiceLoader,
+ excludedBlockchains = excludedBlockchains,
)
}
@@ -73,6 +73,7 @@ internal object TokensDataModule {
appPreferencesStore: AppPreferencesStore,
cacheRegistry: CacheRegistry,
dispatchers: CoroutineDispatcherProvider,
+ excludedBlockchains: ExcludedBlockchains,
): NetworksRepository {
return DefaultNetworksRepository(
networksStatusesStore = networksStatusesStore,
@@ -81,18 +82,10 @@ internal object TokensDataModule {
appPreferencesStore = appPreferencesStore,
cacheRegistry = cacheRegistry,
dispatchers = dispatchers,
+ excludedBlockchains = excludedBlockchains,
)
}
- @Provides
- @Singleton
- fun provideDefaultMarketCoinsRepository(
- expressAssetsStore: ExpressAssetsStore,
- coroutineDispatcherProvider: CoroutineDispatcherProvider,
- ): MarketCryptoCurrencyRepository {
- return DefaultMarketCryptoCurrencyRepository(expressAssetsStore, coroutineDispatcherProvider)
- }
-
@Provides
@Singleton
fun provideCurrencyChecksRepository(
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt
index a739407505..ea747277bc 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt
@@ -2,8 +2,7 @@ package com.tangem.data.tokens.repository
import com.tangem.blockchain.common.Blockchain
import com.tangem.blockchainsdk.compatibility.getL2CompatibilityTokenComparison
-import com.tangem.blockchainsdk.utils.toCoinId
-import com.tangem.blockchainsdk.utils.toNetworkId
+import com.tangem.blockchainsdk.utils.*
import com.tangem.data.common.api.safeApiCall
import com.tangem.data.common.cache.CacheRegistry
import com.tangem.data.common.currency.*
@@ -12,18 +11,16 @@ import com.tangem.data.tokens.utils.CustomTokensMerger
import com.tangem.data.tokens.utils.UserTokensBackwardCompatibility
import com.tangem.datasource.api.common.response.ApiResponseError
import com.tangem.datasource.api.common.response.getOrThrow
-import com.tangem.datasource.api.express.TangemExpressApi
import com.tangem.datasource.api.express.models.TangemExpressValues.EMPTY_CONTRACT_ADDRESS_VALUE
-import com.tangem.datasource.api.express.models.request.AssetsRequestBody
import com.tangem.datasource.api.express.models.request.LeastTokenInfo
import com.tangem.datasource.api.tangemTech.TangemTechApi
import com.tangem.datasource.api.tangemTech.models.UserTokensResponse
+import com.tangem.datasource.exchangeservice.swap.ExpressServiceLoader
import com.tangem.datasource.local.preferences.AppPreferencesStore
import com.tangem.datasource.local.preferences.PreferencesKeys
import com.tangem.datasource.local.preferences.utils.getObject
import com.tangem.datasource.local.preferences.utils.getObjectSyncOrNull
import com.tangem.datasource.local.preferences.utils.storeObject
-import com.tangem.datasource.local.token.ExpressAssetsStore
import com.tangem.datasource.local.userwallet.UserWalletsStore
import com.tangem.domain.core.error.DataError
import com.tangem.domain.demo.DemoConfig
@@ -46,19 +43,19 @@ import com.tangem.blockchain.common.FeePaidCurrency as FeePaidSdkCurrency
@Suppress("LargeClass", "LongParameterList", "TooManyFunctions")
internal class DefaultCurrenciesRepository(
private val tangemTechApi: TangemTechApi,
- private val tangemExpressApi: TangemExpressApi,
private val userWalletsStore: UserWalletsStore,
private val walletManagersFacade: WalletManagersFacade,
- private val expressAssetsStore: ExpressAssetsStore,
private val cacheRegistry: CacheRegistry,
private val appPreferencesStore: AppPreferencesStore,
+ private val expressServiceLoader: ExpressServiceLoader,
private val dispatchers: CoroutineDispatcherProvider,
+ excludedBlockchains: ExcludedBlockchains,
) : CurrenciesRepository {
private val demoConfig = DemoConfig()
- private val responseCurrenciesFactory = ResponseCryptoCurrenciesFactory()
- private val cryptoCurrencyFactory = CryptoCurrencyFactory()
- private val cardCurrenciesFactory = CardCryptoCurrenciesFactory(demoConfig)
+ private val responseCurrenciesFactory = ResponseCryptoCurrenciesFactory(excludedBlockchains)
+ private val cryptoCurrencyFactory = CryptoCurrencyFactory(excludedBlockchains)
+ private val cardCurrenciesFactory = CardCryptoCurrenciesFactory(demoConfig, excludedBlockchains)
private val userTokensResponseFactory = UserTokensResponseFactory()
private val userTokensBackwardCompatibility = UserTokensBackwardCompatibility()
private val customTokensMerger = CustomTokensMerger(tangemTechApi, dispatchers)
@@ -81,91 +78,94 @@ internal class DefaultCurrenciesRepository(
}
override suspend fun saveNewCurrenciesList(userWalletId: UserWalletId, currencies: List) {
- val savedResponse = requireNotNull(
- value = getSavedUserTokensResponseSync(key = userWalletId),
- lazyMessage = { "Saved tokens empty. Can not perform add currencies action" },
- )
- val newCoins = createCoinsForNewTokenList(
- userWalletId = userWalletId,
- newTokens = currencies.filterIsInstance(),
- )
- val newCurrencies = (newCoins + currencies).distinct()
- val updatedResponse = savedResponse.copy(
- tokens = newCurrencies.map(userTokensResponseFactory::createResponseToken),
- )
- storeAndPushTokens(
- userWalletId = userWalletId,
- response = updatedResponse,
- )
- fetchExchangeableUserMarketCoinsByIds(userWalletId, updatedResponse)
- }
-
- override suspend fun addCurrencies(userWalletId: UserWalletId, currencies: List) {
- return withContext(dispatchers.io) {
- val savedCurrencies = requireNotNull(
+ withContext(dispatchers.io) {
+ val savedResponse = requireNotNull(
value = getSavedUserTokensResponseSync(key = userWalletId),
- lazyMessage = { "Saved tokens empty. Can not perform add currencies action" },
+ lazyMessage = { "Saved tokens empty. Can not perform add currencies action." },
)
- val filteredCurrencies = currencies.toMutableList()
- filteredCurrencies.filterNot { currency ->
- val blockchain = getBlockchain(networkId = currency.network.id)
- val networkId = blockchain.toNetworkId()
- val contractAddress = (currency as? CryptoCurrency.Token)?.contractAddress
- savedCurrencies.tokens.firstOrNull { token ->
- token.contractAddress == contractAddress &&
- token.networkId == networkId &&
- token.derivationPath == currency.network.derivationPath.value
- } != null
- }
+ val newCurrencies = populateCurrenciesWithMissedCoins(currencies)
- val newCoins = createCoinsForNewTokens(
- userWalletId = userWalletId,
- newTokens = filteredCurrencies.filterIsInstance(),
- savedCurrencies = savedCurrencies.tokens,
- )
-
- val newCurrencies = (newCoins + filteredCurrencies).distinct()
-
- val updatedResponse = savedCurrencies.copy(
- tokens = savedCurrencies.tokens + newCurrencies.map(userTokensResponseFactory::createResponseToken),
+ val updatedResponse = savedResponse.copy(
+ tokens = newCurrencies.map(userTokensResponseFactory::createResponseToken),
)
storeAndPushTokens(
userWalletId = userWalletId,
response = updatedResponse,
)
- fetchExchangeableUserMarketCoinsByIds(userWalletId, updatedResponse)
+
+ fetchExpressAssetsByNetworkIds(userWalletId, updatedResponse)
}
}
- private suspend fun createCoinsForNewTokenList(
- userWalletId: UserWalletId,
- newTokens: List,
- ): List {
- return newTokens.mapNotNull {
- cryptoCurrencyFactory.createCoin(
- blockchain = getBlockchain(networkId = it.network.id),
- extraDerivationPath = it.network.derivationPath.value,
- scanResponse = getUserWallet(userWalletId).scanResponse,
+ override suspend fun addCurrencies(userWalletId: UserWalletId, currencies: List) {
+ withContext(dispatchers.io) {
+ val savedCurrencies = requireNotNull(
+ value = getSavedUserTokensResponseSync(key = userWalletId),
+ lazyMessage = { "Saved tokens empty. Can not perform add currencies action" },
)
- }.distinct()
+
+ val currenciesToAdd = populateCurrenciesWithMissedCoins(
+ currencies = filterAlreadyAddedCurrencies(savedCurrencies.tokens, currencies),
+ )
+
+ val updatedResponse = savedCurrencies.copy(
+ tokens = savedCurrencies.tokens + currenciesToAdd.map(userTokensResponseFactory::createResponseToken),
+ )
+ storeAndPushTokens(
+ userWalletId = userWalletId,
+ response = updatedResponse,
+ )
+ fetchExpressAssetsByNetworkIds(userWalletId, updatedResponse)
+ }
}
- private suspend fun createCoinsForNewTokens(
- userWalletId: UserWalletId,
- newTokens: List,
+ private fun filterAlreadyAddedCurrencies(
savedCurrencies: List,
- ): List {
- return newTokens
- .filterNot { savedCurrencies.hasCoinForToken(it.network) } // tokens without coins
- .mapNotNull {
- cryptoCurrencyFactory.createCoin(
- blockchain = getBlockchain(networkId = it.network.id),
- extraDerivationPath = it.network.derivationPath.value,
- scanResponse = getUserWallet(userWalletId).scanResponse,
- )
+ currenciesToAdd: List,
+ ): List {
+ return currenciesToAdd.filter { currency ->
+ val blockchain = getBlockchain(networkId = currency.network.id)
+ val networkId = blockchain.toNetworkId()
+ val contractAddress = (currency as? CryptoCurrency.Token)?.contractAddress
+
+ savedCurrencies.none { token ->
+ token.contractAddress == contractAddress &&
+ token.networkId == networkId &&
+ token.derivationPath == currency.network.derivationPath.value
}
- .distinct()
+ }
+ }
+
+ private fun populateCurrenciesWithMissedCoins(currencies: List): List {
+ val networkToCoin = mutableMapOf()
+ val networkToTokens = mutableMapOf>()
+
+ currencies.forEach { currency ->
+ when (currency) {
+ is CryptoCurrency.Coin -> {
+ networkToCoin[currency.network] = currency
+ }
+ is CryptoCurrency.Token -> {
+ val tokens = networkToTokens.getOrElse(currency.network, ::emptyList)
+ networkToTokens[currency.network] = tokens + currency
+ }
+ }
+ }
+
+ return buildList {
+ if (networkToTokens.isEmpty()) {
+ // add only coin here
+ addAll(networkToCoin.values)
+ } else {
+ networkToTokens.forEach { (network, networkTokens) ->
+ val networkCoin = networkToCoin[network] ?: cryptoCurrencyFactory.createCoin(network)
+
+ add(networkCoin)
+ addAll(networkTokens)
+ }
+ }
+ }
}
override suspend fun removeCurrency(userWalletId: UserWalletId, currency: CryptoCurrency) =
@@ -213,21 +213,33 @@ internal class DefaultCurrenciesRepository(
}
}
- override suspend fun getSingleCurrencyWalletPrimaryCurrency(userWalletId: UserWalletId): CryptoCurrency {
+ override suspend fun getSingleCurrencyWalletPrimaryCurrency(
+ userWalletId: UserWalletId,
+ refresh: Boolean,
+ ): CryptoCurrency {
return withContext(dispatchers.io) {
val userWallet = getUserWallet(userWalletId)
ensureIsCorrectUserWallet(userWallet, isMultiCurrencyWalletExpected = false)
- cardCurrenciesFactory.createPrimaryCurrencyForSingleCurrencyCard(userWallet.scanResponse)
+ val currency = cardCurrenciesFactory.createPrimaryCurrencyForSingleCurrencyCard(userWallet.scanResponse)
+ fetchExpressAssetsByNetworkIds(userWalletId, listOf(currency), refresh)
+ currency
}
}
- override suspend fun getSingleCurrencyWalletWithCardCurrencies(userWalletId: UserWalletId): List {
+ override suspend fun getSingleCurrencyWalletWithCardCurrencies(
+ userWalletId: UserWalletId,
+ refresh: Boolean,
+ ): List {
return withContext(dispatchers.io) {
val userWallet = getUserWallet(userWalletId)
ensureIsCorrectUserWallet(userWallet, isMultiCurrencyWalletExpected = false)
- cardCurrenciesFactory.createCurrenciesForSingleCurrencyCardWithToken(userWallet.scanResponse)
+ val currencies = cardCurrenciesFactory.createCurrenciesForSingleCurrencyCardWithToken(
+ userWallet.scanResponse,
+ )
+ fetchExpressAssetsByNetworkIds(userWalletId, currencies, refresh)
+ currencies
}
}
@@ -242,6 +254,8 @@ internal class DefaultCurrenciesRepository(
val currency = cardCurrenciesFactory.createCurrenciesForSingleCurrencyCardWithToken(userWallet.scanResponse)
.find { it.id == id }
requireNotNull(currency) { "Unable to find currency with provided ID: $id" }
+ fetchExpressAssetsByNetworkIds(userWalletId, listOf(currency))
+ currency
}
}
@@ -298,23 +312,28 @@ internal class DefaultCurrenciesRepository(
userWalletId: UserWalletId,
id: CryptoCurrency.ID,
): CryptoCurrency = withContext(dispatchers.io) {
- val userWallet = getUserWallet(userWalletId)
- ensureIsCorrectUserWallet(userWallet, isMultiCurrencyWalletExpected = true)
-
- val response = requireNotNull(
- value = getSavedUserTokensResponseSync(key = userWalletId),
- lazyMessage = {
- "Unable to find tokens response for user wallet with provided ID: $userWalletId"
- },
- )
-
- responseCurrenciesFactory.createCurrency(
- currencyId = id,
- response = response,
- scanResponse = userWallet.scanResponse,
- )
+ getMultiCurrencyWalletCurrency(userWalletId, id.value)
}
+ override suspend fun getMultiCurrencyWalletCurrency(userWalletId: UserWalletId, id: String): CryptoCurrency =
+ withContext(dispatchers.io) {
+ val userWallet = getUserWallet(userWalletId)
+ ensureIsCorrectUserWallet(userWallet, isMultiCurrencyWalletExpected = true)
+
+ val response = requireNotNull(
+ value = getSavedUserTokensResponseSync(key = userWalletId),
+ lazyMessage = {
+ "Unable to find tokens response for user wallet with provided ID: $userWalletId"
+ },
+ )
+
+ responseCurrenciesFactory.createCurrency(
+ currencyId = id,
+ response = response,
+ scanResponse = userWallet.scanResponse,
+ )
+ }
+
override suspend fun getNetworkCoin(
userWalletId: UserWalletId,
networkId: Network.ID,
@@ -338,7 +357,9 @@ internal class DefaultCurrenciesRepository(
val storedCoin = storedTokens.tokens
.find {
- it.networkId == blockchainNetworkId && it.id == coinId && it.derivationPath == derivationPath.value
+ it.networkId == blockchainNetworkId &&
+ compareIdWithMigrations(it, coinId) &&
+ it.derivationPath == derivationPath.value
} ?: error("Coin in this network $networkId not found")
val coin = responseCurrenciesFactory.createCurrency(storedCoin, userWallet.scanResponse)
@@ -504,6 +525,11 @@ internal class DefaultCurrenciesRepository(
}
}
+ override fun isNetworkFeeZero(userWalletId: UserWalletId, network: Network): Boolean {
+ val blockchain = Blockchain.fromNetworkId(network.backendId)
+ return blockchain?.isNetworkFeeZero() ?: false
+ }
+
private fun getMultiCurrencyWalletCurrencies(userWallet: UserWallet): Flow> {
return getSavedUserTokensResponse(userWallet.walletId).map { storedTokens ->
responseCurrenciesFactory.createCurrencies(
@@ -521,6 +547,13 @@ internal class DefaultCurrenciesRepository(
)
}
+ private fun compareIdWithMigrations(token: UserTokensResponse.Token, coinId: String): Boolean {
+ return when {
+ token.id == OLD_POLYGON_NAME -> NEW_POLYGON_NAME == coinId
+ else -> token.id == coinId
+ }
+ }
+
private suspend fun fetchTokens(userWallet: UserWallet) {
val userWalletId = userWallet.walletId
@@ -542,7 +575,7 @@ internal class DefaultCurrenciesRepository(
value = compatibleUserTokensResponse,
)
- fetchExchangeableUserMarketCoinsByIds(userWalletId, compatibleUserTokensResponse)
+ fetchExpressAssetsByNetworkIds(userWalletId, compatibleUserTokensResponse)
}
private suspend fun checkIsEmptyDemoWallet(userWallet: UserWallet): Boolean {
@@ -561,33 +594,37 @@ internal class DefaultCurrenciesRepository(
pushTokens(userWalletId, response)
}
- private suspend fun fetchExchangeableUserMarketCoinsByIds(
- userWalletId: UserWalletId,
- userTokens: UserTokensResponse,
- ) {
- try {
- val tokensList = userTokens.tokens
- .map {
- LeastTokenInfo(
- contractAddress = it.contractAddress ?: EMPTY_CONTRACT_ADDRESS_VALUE,
- network = it.networkId,
- )
- }
-
- if (tokensList.isNotEmpty()) {
- val response = tangemExpressApi.getAssets(
- AssetsRequestBody(
- tokensList = tokensList,
- ),
- )
-
- expressAssetsStore.store(userWalletId, response.getOrThrow())
- }
- } catch (e: Throwable) {
- Timber.e(e, "Unable to fetch assets for: ${userWalletId.stringValue}")
+ private suspend fun fetchExpressAssetsByNetworkIds(userWalletId: UserWalletId, userTokens: UserTokensResponse) {
+ val tokens = userTokens.tokens.map { token ->
+ LeastTokenInfo(
+ contractAddress = token.contractAddress ?: EMPTY_CONTRACT_ADDRESS_VALUE,
+ network = token.networkId,
+ )
}
+ expressServiceLoader.update(userWalletId, tokens)
}
+ private suspend fun fetchExpressAssetsByNetworkIds(
+ userWalletId: UserWalletId,
+ cryptoCurrencies: List,
+ refresh: Boolean = false,
+ ) {
+ val tokens = cryptoCurrencies.map { currency ->
+ val tokenCurrency = currency as? CryptoCurrency.Token
+ LeastTokenInfo(
+ contractAddress = tokenCurrency?.contractAddress ?: EMPTY_CONTRACT_ADDRESS_VALUE,
+ network = currency.network.backendId,
+ )
+ }
+ cacheRegistry.invokeOnExpire(
+ key = getAssetsCacheKey(userWalletId),
+ skipCache = refresh,
+ block = { expressServiceLoader.update(userWalletId, tokens) },
+ )
+ }
+
+ private fun getAssetsCacheKey(userWalletId: UserWalletId): String = "assets_cache_key_${userWalletId.stringValue}"
+
private suspend fun handleFetchTokensError(userWallet: UserWallet, e: ApiResponseError): UserTokensResponse {
val userWalletId = userWallet.walletId
val response = appPreferencesStore.getObjectSyncOrNull(
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrencyChecksRepository.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrencyChecksRepository.kt
index a62d70a3f8..f72dea5b6d 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrencyChecksRepository.kt
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrencyChecksRepository.kt
@@ -6,13 +6,18 @@ import com.tangem.blockchain.common.MinimumSendAmountProvider
import com.tangem.blockchain.common.ReserveAmountProvider
import com.tangem.blockchain.common.UtxoAmountLimitProvider
import com.tangem.data.tokens.converters.UtxoConverter
+import com.tangem.domain.staking.model.stakekit.YieldBalance
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.CryptoCurrencyStatus
import com.tangem.domain.tokens.model.CurrencyAmount
import com.tangem.domain.tokens.model.Network
import com.tangem.domain.tokens.model.blockchains.UtxoAmountLimit
+import com.tangem.domain.tokens.model.warnings.CryptoCurrencyWarning
import com.tangem.domain.tokens.repository.CurrencyChecksRepository
import com.tangem.domain.walletmanager.WalletManagersFacade
import com.tangem.domain.wallets.models.UserWalletId
import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import com.tangem.utils.extensions.isZero
import kotlinx.coroutines.withContext
import java.math.BigDecimal
@@ -20,6 +25,7 @@ internal class DefaultCurrencyChecksRepository(
private val walletManagersFacade: WalletManagersFacade,
private val coroutineDispatchers: CoroutineDispatcherProvider,
) : CurrencyChecksRepository {
+
override suspend fun getExistentialDeposit(userWalletId: UserWalletId, network: Network): BigDecimal? {
val manager = walletManagersFacade.getOrCreateWalletManager(
userWalletId = userWalletId,
@@ -104,6 +110,7 @@ internal class DefaultCurrencyChecksRepository(
override suspend fun checkUtxoAmountLimit(
userWalletId: UserWalletId,
network: Network,
+ currency: CryptoCurrency,
amount: BigDecimal,
fee: BigDecimal,
): UtxoAmountLimit? {
@@ -118,4 +125,36 @@ internal class DefaultCurrencyChecksRepository(
}
return utxoAmount?.let(UtxoConverter()::convert)
}
+
+ override suspend fun getRentInfoWarning(
+ userWalletId: UserWalletId,
+ currencyStatus: CryptoCurrencyStatus,
+ ): CryptoCurrencyWarning.Rent? {
+ val rentData = walletManagersFacade.getRentInfo(userWalletId, currencyStatus.currency.network) ?: return null
+ val balanceValue = currencyStatus.value as? CryptoCurrencyStatus.Loaded ?: return null
+ val stakingTotalBalance =
+ (balanceValue.yieldBalance as? YieldBalance.Data)?.getTotalStakingBalance() ?: BigDecimal.ZERO
+ return when {
+ balanceValue.amount.isZero() && stakingTotalBalance.isZero() -> null
+ balanceValue.amount < rentData.exemptionAmount && stakingTotalBalance.isZero() -> {
+ CryptoCurrencyWarning.Rent(rentData.rent, rentData.exemptionAmount)
+ }
+ else -> null
+ }
+ }
+
+ override suspend fun getRentExemptionError(
+ userWalletId: UserWalletId,
+ currencyStatus: CryptoCurrencyStatus,
+ balanceAfterTransaction: BigDecimal,
+ ): CryptoCurrencyWarning.Rent? {
+ val rentData = walletManagersFacade.getRentInfo(userWalletId, currencyStatus.currency.network) ?: return null
+ return when {
+ balanceAfterTransaction.isZero() -> null
+ balanceAfterTransaction < rentData.exemptionAmount -> {
+ CryptoCurrencyWarning.Rent(rentData.rent, rentData.exemptionAmount)
+ }
+ else -> null
+ }
+ }
}
\ No newline at end of file
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultMarketCryptoCurrencyRepository.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultMarketCryptoCurrencyRepository.kt
deleted file mode 100644
index 83f30079f3..0000000000
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultMarketCryptoCurrencyRepository.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.tangem.data.tokens.repository
-
-import com.tangem.datasource.api.express.models.TangemExpressValues.EMPTY_CONTRACT_ADDRESS_VALUE
-import com.tangem.datasource.local.token.ExpressAssetsStore
-import com.tangem.domain.tokens.model.CryptoCurrency
-import com.tangem.domain.tokens.repository.MarketCryptoCurrencyRepository
-import com.tangem.domain.wallets.models.UserWalletId
-import com.tangem.utils.coroutines.CoroutineDispatcherProvider
-import kotlinx.coroutines.withContext
-
-class DefaultMarketCryptoCurrencyRepository(
- private val expressAssetsStore: ExpressAssetsStore,
- private val dispatchers: CoroutineDispatcherProvider,
-) : MarketCryptoCurrencyRepository {
-
- override suspend fun isExchangeable(userWalletId: UserWalletId, cryptoCurrency: CryptoCurrency): Boolean {
- return getExchangeableFlag(userWalletId, cryptoCurrency) && !cryptoCurrency.isCustom
- }
-
- private suspend fun getExchangeableFlag(userWalletId: UserWalletId, cryptoCurrency: CryptoCurrency): Boolean {
- return withContext(dispatchers.io) {
- val contractAddress =
- (cryptoCurrency as? CryptoCurrency.Token)?.contractAddress ?: EMPTY_CONTRACT_ADDRESS_VALUE
-
- val asset = expressAssetsStore.getSyncOrNull(userWalletId)?.find {
- it.network == cryptoCurrency.network.backendId &&
- it.contractAddress.equals(contractAddress, ignoreCase = true)
- }
-
- asset?.exchangeAvailable ?: false
- }
- }
-}
\ No newline at end of file
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultNetworksRepository.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultNetworksRepository.kt
index 26ab1470f2..fce7b9ce1b 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultNetworksRepository.kt
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultNetworksRepository.kt
@@ -2,6 +2,7 @@ package com.tangem.data.tokens.repository
import com.tangem.blockchain.common.Blockchain
import com.tangem.blockchain.common.address.AddressType
+import com.tangem.blockchainsdk.utils.ExcludedBlockchains
import com.tangem.blockchainsdk.utils.fromNetworkId
import com.tangem.data.common.cache.CacheRegistry
import com.tangem.data.common.currency.ResponseCryptoCurrenciesFactory
@@ -39,12 +40,13 @@ internal class DefaultNetworksRepository(
private val appPreferencesStore: AppPreferencesStore,
private val cacheRegistry: CacheRegistry,
private val dispatchers: CoroutineDispatcherProvider,
+ excludedBlockchains: ExcludedBlockchains,
) : NetworksRepository {
- private val demoConfig by lazy { DemoConfig() }
- private val cardCurrenciesFactory by lazy { CardCryptoCurrenciesFactory(demoConfig) }
- private val responseCurrenciesFactory by lazy { ResponseCryptoCurrenciesFactory() }
- private val networkStatusFactory by lazy { NetworkStatusFactory() }
+ private val demoConfig = DemoConfig()
+ private val cardCurrenciesFactory = CardCryptoCurrenciesFactory(demoConfig, excludedBlockchains)
+ private val responseCurrenciesFactory = ResponseCryptoCurrenciesFactory(excludedBlockchains)
+ private val networkStatusFactory = NetworkStatusFactory()
override fun getNetworkStatusesUpdates(
userWalletId: UserWalletId,
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/CardCryptoCurrenciesFactory.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/CardCryptoCurrenciesFactory.kt
index 2b7352adff..1e3ed23c01 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/CardCryptoCurrenciesFactory.kt
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/CardCryptoCurrenciesFactory.kt
@@ -1,6 +1,7 @@
package com.tangem.data.tokens.utils
import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchainsdk.utils.ExcludedBlockchains
import com.tangem.data.common.currency.CryptoCurrencyFactory
import com.tangem.domain.common.TapWorkarounds.isTestCard
import com.tangem.domain.common.util.cardTypesResolver
@@ -8,9 +9,12 @@ import com.tangem.domain.demo.DemoConfig
import com.tangem.domain.models.scan.ScanResponse
import com.tangem.domain.tokens.model.CryptoCurrency
-class CardCryptoCurrenciesFactory(private val demoConfig: DemoConfig) {
+class CardCryptoCurrenciesFactory(
+ private val demoConfig: DemoConfig,
+ excludedBlockchains: ExcludedBlockchains,
+) {
- private val cryptoCurrencyFactory = CryptoCurrencyFactory()
+ private val cryptoCurrencyFactory = CryptoCurrencyFactory(excludedBlockchains)
fun createDefaultCoinsForMultiCurrencyCard(scanResponse: ScanResponse): List {
val card = scanResponse.card
diff --git a/domain/legacy/build.gradle.kts b/domain/legacy/build.gradle.kts
index f01a2e6a96..ab9922a279 100644
--- a/domain/legacy/build.gradle.kts
+++ b/domain/legacy/build.gradle.kts
@@ -14,6 +14,7 @@ dependencies {
implementation(projects.common)
implementation(projects.libs.auth)
implementation(projects.libs.blockchainSdk)
+ implementation(projects.domain.core)
implementation(projects.domain.demo)
implementation(projects.domain.models)
implementation(projects.domain.tokens.models)
diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/CardSdk.kt b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/CardSdk.kt
index cf827af989..a5129bbb52 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/CardSdk.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/CardSdk.kt
@@ -1,7 +1,7 @@
package com.tangem.domain.common.extensions
import com.tangem.blockchain.common.Blockchain
-import com.tangem.blockchainsdk.utils.isSupportedInApp
+import com.tangem.blockchainsdk.utils.ExcludedBlockchains
import com.tangem.common.card.EllipticCurve
import com.tangem.common.card.FirmwareVersion
import com.tangem.domain.common.CardTypesResolver
@@ -15,7 +15,10 @@ import com.tangem.domain.models.scan.CardDTO
val FirmwareVersion.Companion.SolanaTokensAvailable
get() = FirmwareVersion(4, 52)
-fun CardDTO.supportedBlockchains(cardTypesResolver: CardTypesResolver): List {
+fun CardDTO.supportedBlockchains(
+ cardTypesResolver: CardTypesResolver,
+ excludedBlockchains: ExcludedBlockchains,
+): List {
val supportedBlockchains = if (firmwareVersion < FirmwareVersion.MultiWalletAvailable) {
Blockchain.fromCurve(EllipticCurve.Secp256k1).toMutableList()
} else if (!cardTypesResolver.isWallet2() && !cardTypesResolver.isTangemWallet()) {
@@ -27,11 +30,14 @@ fun CardDTO.supportedBlockchains(cardTypesResolver: CardTypesResolver): List {
- val tokensSupportedByBlockchain = supportedBlockchains(cardTypesResolver)
+fun CardDTO.supportedTokens(
+ cardTypesResolver: CardTypesResolver,
+ excludedBlockchains: ExcludedBlockchains,
+): List {
+ val tokensSupportedByBlockchain = supportedBlockchains(cardTypesResolver, excludedBlockchains)
.filter { it.canHandleTokens() }
.toMutableList()
val tokensSupportedByCard = when {
@@ -68,10 +74,14 @@ fun CardDTO.canHandleToken(
}
}
-fun CardDTO.canHandleToken(blockchain: Blockchain, cardTypesResolver: CardTypesResolver): Boolean {
+fun CardDTO.canHandleToken(
+ blockchain: Blockchain,
+ cardTypesResolver: CardTypesResolver,
+ excludedBlockchains: ExcludedBlockchains,
+): Boolean {
val cardConfig = CardConfig.createConfig(this)
val primaryCurveForBlockchain = cardConfig.primaryCurve(blockchain)
- val isContainsBlockchain = this.supportedTokens(cardTypesResolver).contains(blockchain)
+ val isContainsBlockchain = blockchain in supportedTokens(cardTypesResolver, excludedBlockchains)
val isWalletForCurveExists = wallets.any { it.curve == primaryCurveForBlockchain }
// fixme: check for first wallets with 1 curve and remove condition
return if (cardTypesResolver.isTangemWallet() || cardTypesResolver.isWallet2()) {
@@ -82,10 +92,14 @@ fun CardDTO.canHandleToken(blockchain: Blockchain, cardTypesResolver: CardTypesR
}
}
-fun CardDTO.canHandleBlockchain(blockchain: Blockchain, cardTypesResolver: CardTypesResolver): Boolean {
+fun CardDTO.canHandleBlockchain(
+ blockchain: Blockchain,
+ cardTypesResolver: CardTypesResolver,
+ excludedBlockchains: ExcludedBlockchains,
+): Boolean {
val cardConfig = CardConfig.createConfig(this)
val primaryCurveForBlockchain = cardConfig.primaryCurve(blockchain)
- val isContainsBlockchain = this.supportedBlockchains(cardTypesResolver).contains(blockchain)
+ val isContainsBlockchain = blockchain in supportedBlockchains(cardTypesResolver, excludedBlockchains)
val isWalletForCurveExists = wallets.any { it.curve == primaryCurveForBlockchain }
// fixme: check for first wallets with 1 curve and remove condition
return if (cardTypesResolver.isTangemWallet() || cardTypesResolver.isWallet2()) {
diff --git a/domain/legacy/src/main/java/com/tangem/domain/exchange/RampStateManager.kt b/domain/legacy/src/main/java/com/tangem/domain/exchange/RampStateManager.kt
index 2536d78ea9..0adb568906 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/exchange/RampStateManager.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/exchange/RampStateManager.kt
@@ -1,14 +1,43 @@
package com.tangem.domain.exchange
+import com.tangem.domain.core.lce.Lce
import com.tangem.domain.models.scan.ScanResponse
import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.CryptoCurrencyStatus
+import com.tangem.domain.wallets.models.UserWalletId
+import kotlinx.coroutines.flow.Flow
/**
* Manager that holds info about available actions as Sell and Buy
*/
interface RampStateManager {
- fun availableForBuy(scanResponse: ScanResponse, cryptoCurrency: CryptoCurrency): Boolean
+ /** Check if sell service is supported for given [CryptoCurrency] */
+ fun isSellSupportedByService(cryptoCurrency: CryptoCurrency): Boolean
- fun availableForSell(cryptoCurrency: CryptoCurrency): Boolean
+ suspend fun availableForBuy(
+ scanResponse: ScanResponse,
+ userWalletId: UserWalletId,
+ cryptoCurrency: CryptoCurrency,
+ ): Boolean
+
+ /**
+ * Check if [CryptoCurrency] is available for sell
+ *
+ * @param userWalletId id of multi-currency wallet
+ * @param status crypto currency status
+ */
+ suspend fun availableForSell(userWalletId: UserWalletId, status: CryptoCurrencyStatus): Boolean
+
+ suspend fun availableForSwap(userWalletId: UserWalletId, cryptoCurrency: CryptoCurrency): Boolean
+
+ suspend fun fetchBuyServiceData()
+
+ fun getBuyInitializationStatus(): Flow>
+
+ suspend fun fetchSellServiceData()
+
+ fun getSellInitializationStatus(): Flow>
+
+ fun getExpressInitializationStatus(userWalletId: UserWalletId): Flow>
}
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/DefaultWalletManagersFacade.kt b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/DefaultWalletManagersFacade.kt
index 5a531976c7..440e818d8f 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/DefaultWalletManagersFacade.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/DefaultWalletManagersFacade.kt
@@ -25,11 +25,11 @@ import com.tangem.domain.common.util.hasDerivation
import com.tangem.domain.demo.DemoConfig
import com.tangem.domain.tokens.model.CryptoCurrency
import com.tangem.domain.tokens.model.Network
-import com.tangem.domain.tokens.model.warnings.CryptoCurrencyWarning
import com.tangem.domain.transaction.models.AssetRequirementsCondition
import com.tangem.domain.txhistory.models.PaginationWrapper
import com.tangem.domain.txhistory.models.TxHistoryItem
import com.tangem.domain.txhistory.models.TxHistoryState
+import com.tangem.domain.walletmanager.model.RentData
import com.tangem.domain.walletmanager.model.SmartContractMethod
import com.tangem.domain.walletmanager.model.TokenInfo
import com.tangem.domain.walletmanager.model.UpdateWalletManagerResult
@@ -413,7 +413,7 @@ class DefaultWalletManagersFacade(
return manager?.wallet?.addresses.orEmpty()
}
- override suspend fun getRentInfo(userWalletId: UserWalletId, network: Network): CryptoCurrencyWarning.Rent? {
+ override suspend fun getRentInfo(userWalletId: UserWalletId, network: Network): RentData? {
val manager = getOrCreateWalletManager(
userWalletId = userWalletId,
network = network,
@@ -422,24 +422,7 @@ class DefaultWalletManagersFacade(
return when (val result = manager.minimalBalanceForRentExemption()) {
is Result.Success -> {
- val balance = manager.wallet.fundsAvailable(AmountType.Coin)
- val outgoingTxs = manager.wallet.recentTransactions
- .filter {
- it.sourceAddress == manager.wallet.address &&
- it.amount.type == AmountType.Coin &&
- it.status != TransactionStatus.Confirmed
- }
-
- val rentExempt = result.data
- val setRent = if (outgoingTxs.isEmpty()) {
- balance < rentExempt
- } else {
- val outgoingAmount = outgoingTxs.sumOf { it.amount.value ?: BigDecimal.ZERO }
- val rest = balance.minus(outgoingAmount)
- balance < rest
- }
-
- if (setRent) CryptoCurrencyWarning.Rent(manager.rentAmount(), rentExempt) else null
+ RentData(manager.rentAmount(), result.data)
}
is Result.Failure -> null
}
@@ -602,7 +585,7 @@ class DefaultWalletManagersFacade(
return withContext(dispatchers.io) {
val walletManager = getOrCreateWalletManager(userWalletId = userWalletId, network = currency.network)
val currencyType = cryptoCurrencyTypeConverter.convert(currency)
- if (walletManager !is AssetRequirementsManager || !walletManager.hasRequirements(currencyType)) {
+ if (walletManager !is AssetRequirementsManager) {
return@withContext null
}
@@ -611,7 +594,7 @@ class DefaultWalletManagersFacade(
}
}
- override suspend fun associateAsset(
+ override suspend fun fulfillRequirements(
userWalletId: UserWalletId,
currency: CryptoCurrency,
signer: TransactionSigner,
@@ -630,6 +613,21 @@ class DefaultWalletManagersFacade(
}
}
+ override suspend fun discardRequirements(userWalletId: UserWalletId, currency: CryptoCurrency): SimpleResult {
+ return withContext(dispatchers.io) {
+ val walletManager = getOrCreateWalletManager(userWalletId = userWalletId, network = currency.network)
+ val currencyType = cryptoCurrencyTypeConverter.convert(currency)
+
+ if (walletManager !is AssetRequirementsManager) {
+ return@withContext SimpleResult.Failure(
+ BlockchainSdkError.CustomError("WalletManager is not implemented AssetRequirementsManager"),
+ )
+ }
+
+ walletManager.discardRequirements(currencyType)
+ }
+ }
+
override suspend fun checkUtxoConsolidationAvailability(userWalletId: UserWalletId, network: Network): Boolean {
val blockchain = Blockchain.fromId(network.id.value)
val walletManager = getOrCreateWalletManager(
diff --git a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/WalletManagersFacade.kt b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/WalletManagersFacade.kt
index 2f6317a316..7eb56b21c8 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/WalletManagersFacade.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/WalletManagersFacade.kt
@@ -12,11 +12,11 @@ import com.tangem.blockchain.extensions.Result
import com.tangem.blockchain.extensions.SimpleResult
import com.tangem.domain.tokens.model.CryptoCurrency
import com.tangem.domain.tokens.model.Network
-import com.tangem.domain.tokens.model.warnings.CryptoCurrencyWarning
import com.tangem.domain.transaction.models.AssetRequirementsCondition
import com.tangem.domain.txhistory.models.PaginationWrapper
import com.tangem.domain.txhistory.models.TxHistoryItem
import com.tangem.domain.txhistory.models.TxHistoryState
+import com.tangem.domain.walletmanager.model.RentData
import com.tangem.domain.walletmanager.model.TokenInfo
import com.tangem.domain.walletmanager.model.UpdateWalletManagerResult
import com.tangem.domain.wallets.models.UserWalletId
@@ -140,7 +140,7 @@ interface WalletManagersFacade {
* @param userWalletId selected wallet id
* @param network network of currency
*/
- suspend fun getRentInfo(userWalletId: UserWalletId, network: Network): CryptoCurrencyWarning.Rent?
+ suspend fun getRentInfo(userWalletId: UserWalletId, network: Network): RentData?
@Deprecated("Will be removed in future")
fun getAll(userWalletId: UserWalletId): Flow>
@@ -233,12 +233,14 @@ interface WalletManagersFacade {
*/
suspend fun getAssetRequirements(userWalletId: UserWalletId, currency: CryptoCurrency): AssetRequirementsCondition?
- suspend fun associateAsset(
+ suspend fun fulfillRequirements(
userWalletId: UserWalletId,
currency: CryptoCurrency,
signer: TransactionSigner,
): SimpleResult
+ suspend fun discardRequirements(userWalletId: UserWalletId, currency: CryptoCurrency): SimpleResult
+
/**
* Indicates UTXO consolidation availability
*
diff --git a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/model/RentData.kt b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/model/RentData.kt
new file mode 100644
index 0000000000..05973c0c00
--- /dev/null
+++ b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/model/RentData.kt
@@ -0,0 +1,11 @@
+package com.tangem.domain.walletmanager.model
+
+import java.math.BigDecimal
+
+/**
+ * Represents wallet blockchain rent
+ * @param rent Amount that will be charged in overtime if the blockchain does not have an amount greater than
+ * the [exemptionAmount]
+ * @param exemptionAmount Amount that should be on the blockchain balance not to pay rent
+ */
+data class RentData(val rent: BigDecimal, val exemptionAmount: BigDecimal)
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/SdkRequirementsConditionConverter.kt b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/SdkRequirementsConditionConverter.kt
index 7c84120470..92b365f3f3 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/SdkRequirementsConditionConverter.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/SdkRequirementsConditionConverter.kt
@@ -7,12 +7,20 @@ import com.tangem.blockchain.common.trustlines.AssetRequirementsCondition as Sdk
internal class SdkRequirementsConditionConverter : Converter {
override fun convert(value: SdkRequirementsCondition): AssetRequirementsCondition {
return when (value) {
- SdkRequirementsCondition.PaidTransaction -> AssetRequirementsCondition.PaidTransaction
+ is SdkRequirementsCondition.PaidTransaction -> AssetRequirementsCondition.PaidTransaction
is SdkRequirementsCondition.PaidTransactionWithFee -> AssetRequirementsCondition.PaidTransactionWithFee(
feeAmount = requireNotNull(value.feeAmount.value),
feeCurrencySymbol = value.feeAmount.currencySymbol,
decimals = value.feeAmount.decimals,
)
+ is SdkRequirementsCondition.IncompleteTransaction -> AssetRequirementsCondition.IncompleteTransaction(
+ amount = requireNotNull(value.amount.value),
+ currencySymbol = value.amount.currencySymbol,
+ currencyDecimals = value.amount.decimals,
+ feeAmount = requireNotNull(value.feeAmount.value),
+ feeCurrencySymbol = value.feeAmount.currencySymbol,
+ feeCurrencyDecimals = value.feeAmount.decimals,
+ )
}
}
}
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/UpdateWalletManagerResultFactory.kt b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/UpdateWalletManagerResultFactory.kt
index df5aa57530..e3a15932b4 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/UpdateWalletManagerResultFactory.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/UpdateWalletManagerResultFactory.kt
@@ -48,7 +48,7 @@ internal class UpdateWalletManagerResultFactory {
val wallet = walletManager.wallet
val blockchain = wallet.blockchain
val firstWalletToken = wallet.getTokens().firstOrNull()
- val amount = amountToCreateAccount ?: blockchain.amountToCreateAccount(firstWalletToken)
+ val amount = amountToCreateAccount ?: blockchain.amountToCreateAccount(walletManager, firstWalletToken)
return if (amount == null) {
Timber.w("Unable to get required amount to create account for: $blockchain")
diff --git a/domain/manage-tokens/src/main/kotlin/com/tangem/domain/managetokens/SaveManagedTokensUseCase.kt b/domain/manage-tokens/src/main/kotlin/com/tangem/domain/managetokens/SaveManagedTokensUseCase.kt
index cb42f40234..dd2f977457 100644
--- a/domain/manage-tokens/src/main/kotlin/com/tangem/domain/managetokens/SaveManagedTokensUseCase.kt
+++ b/domain/manage-tokens/src/main/kotlin/com/tangem/domain/managetokens/SaveManagedTokensUseCase.kt
@@ -24,32 +24,32 @@ class SaveManagedTokensUseCase(
userWalletId: UserWalletId,
currenciesToAdd: Map>,
currenciesToRemove: Map>,
- ): Either {
- return Either.catch {
- val removingCurrencies = currenciesToRemove.mapToCryptoCurrencies(userWalletId)
- val addingCurrencies = currenciesToAdd.mapToCryptoCurrencies(userWalletId)
- derivationsRepository.derivePublicKeysByNetworks(
- userWalletId = userWalletId,
- networks = currenciesToAdd.values.flatten(),
- )
- val newCurrenciesList = currenciesRepository
- .getMultiCurrencyWalletCurrenciesSync(userWalletId)
- .filterNot(removingCurrencies::contains)
- .toMutableList()
- .also { it.addAll(addingCurrencies) }
- currenciesRepository.saveNewCurrenciesList(userWalletId, newCurrenciesList)
+ ): Either