diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 9d98629279..8f2af51f2d 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -5,39 +5,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/domain/wallets/models/src/main/java/com/tangem/domain/wallets/models/Test.kt b/domain/wallets/models/src/main/java/com/tangem/domain/wallets/models/Test.kt deleted file mode 100644 index 1a984b127a..0000000000 --- a/domain/wallets/models/src/main/java/com/tangem/domain/wallets/models/Test.kt +++ /dev/null @@ -1,66 +0,0 @@ -package com.tangem.domain.wallets.models - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass -import com.tangem.crypto.hdWallet.DerivationPath -import com.tangem.domain.models.scan.ScanResponse -import kotlinx.serialization.Serializable - -sealed interface NewUserWallet { - - val name: String - val walletId: UserWalletId - - @JsonClass(generateAdapter = true) - data class Cold( - @Json(name = "name") - override val name: String, - @Json(name = "walletId") - override val walletId: UserWalletId, - @Json(name = "cardsInWallet") - val cardsInWallet: Set, - @Json(name = "isMultiCurrency") - val isMultiCurrency: Boolean, - @Json(name = "hasBackupError") - val hasBackupError: Boolean, - @Json(name = "scanResponse") - val scanResponse: ScanResponse, - ) : NewUserWallet - - @JsonClass(generateAdapter = true) - data class Hot( - @Json(name = "name") - override val name: String, - @Json(name = "walletId") - override val walletId: UserWalletId, - ) : NewUserWallet - - @JsonClass(generateAdapter = true) - data class Pay( - @Json(name = "name") - override val name: String, - @Json(name = "walletId") - override val walletId: UserWalletId, - @Json(name = "cardsInWallet") - val cardsInWallet: Set, - @Json(name = "scanResponse") - val scanResponse: ScanResponse, - ) : NewUserWallet -} - -@JsonClass(generateAdapter = true) -data class UserWalletAccount( - val accountId: AccountId, - val userWalletId: UserWalletId, - val name: String, - val derivationPath: DerivationPath, - val otherInfo: String, -) - -@Serializable -@JvmInline -@JsonClass(generateAdapter = true) -value class AccountId( - @Json(name = "stringValue") - val stringValue: String, -) \ No newline at end of file diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/entry/impl/ui/OnboardingEntry.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/entry/impl/ui/OnboardingEntry.kt index 65dd778fc4..c8a1c938fd 100644 --- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/entry/impl/ui/OnboardingEntry.kt +++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/entry/impl/ui/OnboardingEntry.kt @@ -21,8 +21,8 @@ internal inline fun OnboardingEntry( Column( modifier = modifier .fillMaxSize() - .statusBarsPadding() - .background(TangemTheme.colors.background.primary), + .background(TangemTheme.colors.background.primary) + .statusBarsPadding(), ) { stepperContent(Modifier.fillMaxWidth())