diff --git a/app/src/main/assets/tangem-app-config b/app/src/main/assets/tangem-app-config index d3ba082fad..ad46a043f9 160000 --- a/app/src/main/assets/tangem-app-config +++ b/app/src/main/assets/tangem-app-config @@ -1 +1 @@ -Subproject commit d3ba082fadbdb583a45cc1c714c57b382cbbe6ef +Subproject commit ad46a043f9b98b4f4577f906920532cb370c15d4 diff --git a/data/wallet-connect/src/main/kotlin/com/tangem/data/walletconnect/network/solana/WcSolanaSignAllTransactionUseCase.kt b/data/wallet-connect/src/main/kotlin/com/tangem/data/walletconnect/network/solana/WcSolanaSignAllTransactionUseCase.kt index d8b9e39468..8e91c2c8dd 100644 --- a/data/wallet-connect/src/main/kotlin/com/tangem/data/walletconnect/network/solana/WcSolanaSignAllTransactionUseCase.kt +++ b/data/wallet-connect/src/main/kotlin/com/tangem/data/walletconnect/network/solana/WcSolanaSignAllTransactionUseCase.kt @@ -10,7 +10,7 @@ import com.tangem.data.walletconnect.sign.SignCollector import com.tangem.data.walletconnect.sign.SignStateConverter.toResult import com.tangem.data.walletconnect.sign.WcMethodUseCaseContext import com.tangem.data.walletconnect.utils.BlockAidVerificationDelegate -import com.tangem.domain.transaction.usecase.PrepareAndSignUseCase +import com.tangem.domain.transaction.usecase.PrepareForSendUseCase import com.tangem.domain.walletconnect.error.parseSendError import com.tangem.domain.walletconnect.model.WcSolanaMethod import com.tangem.domain.walletconnect.usecase.method.BlockAidTransactionCheck @@ -29,7 +29,7 @@ import org.json.JSONObject internal class WcSolanaSignAllTransactionUseCase @AssistedInject constructor( override val respondService: WcRespondService, override val analytics: AnalyticsEventHandler, - private val prepareAndSign: PrepareAndSignUseCase, + private val prepareForSend: PrepareForSendUseCase, @Assisted override val context: WcMethodUseCaseContext, @Assisted override val method: WcSolanaMethod.SignAllTransaction, blockAidDelegate: BlockAidVerificationDelegate, @@ -46,7 +46,7 @@ internal class WcSolanaSignAllTransactionUseCase @AssistedInject constructor( ).map { lce -> lce.map { result -> BlockAidTransactionCheck.Result.Plain(result) } } override suspend fun SignCollector>.onSign(state: WcSignState>) { - val hash = prepareAndSign.invoke(transactionData = state.signModel, userWallet = wallet, network = network) + val hash = prepareForSend.invoke(transactionData = state.signModel, userWallet = wallet, network = network) .onLeft { error -> emit(state.toResult(parseSendError(error).left())) } diff --git a/data/wallet-connect/src/main/kotlin/com/tangem/data/walletconnect/pair/WcPairSdkDelegate.kt b/data/wallet-connect/src/main/kotlin/com/tangem/data/walletconnect/pair/WcPairSdkDelegate.kt index 85ebda3168..b647a6e959 100644 --- a/data/wallet-connect/src/main/kotlin/com/tangem/data/walletconnect/pair/WcPairSdkDelegate.kt +++ b/data/wallet-connect/src/main/kotlin/com/tangem/data/walletconnect/pair/WcPairSdkDelegate.kt @@ -112,7 +112,12 @@ internal class WcPairSdkDelegate : WcSdkObserver { sessionProposal: Wallet.Model.SessionProposal, verifyContext: Wallet.Model.VerifyContext, ) { - val sessionProposalWithRealUrl = sessionProposal.copy(url = verifyContext.origin) + val url = if (verifyContext.validation == Wallet.Model.Validation.INVALID || verifyContext.isScam == true) { + verifyContext.origin + } else { + verifyContext.origin.ifEmpty { verifyContext.verifyUrl } + } + val sessionProposalWithRealUrl = sessionProposal.copy(url = url) // Triggered when wallet receives the session proposal sent by a Dapp onSessionProposal.trySend(sessionProposalWithRealUrl to verifyContext) } diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/Wallet2CobrandImage.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/Wallet2CobrandImage.kt index 22e0d2f345..15dc39b149 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/Wallet2CobrandImage.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/Wallet2CobrandImage.kt @@ -362,4 +362,22 @@ internal enum class Wallet2CobrandImage( cards3ResId = R.drawable.ill_ghoad_card3_120_106, batchIds = setOf("AF89"), ), + + BlushSky( + cards2ResId = R.drawable.ill_blush_sky_card2_120_106, + cards3ResId = R.drawable.ill_blush_sky_card3_120_106, + batchIds = setOf("AF990020", "AF990021", "AF990022"), + ), + + ElectraSea( + cards2ResId = R.drawable.ill_electra_sea_card2_120_106, + cards3ResId = R.drawable.ill_electra_sea_card3_120_106, + batchIds = setOf("AF990023", "AF990024", "AF990025"), + ), + + HyperBlue( + cards2ResId = R.drawable.ill_hyperblue_card2_120_106, + cards3ResId = R.drawable.ill_hyperblue_card3_120_106, + batchIds = setOf("AF990026", "AF990027", "AF990028"), + ), } \ No newline at end of file diff --git a/features/wallet/impl/src/main/res/drawable/ill_blush_sky_card2_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_blush_sky_card2_120_106.webp new file mode 100644 index 0000000000..c1c26ff962 Binary files /dev/null and b/features/wallet/impl/src/main/res/drawable/ill_blush_sky_card2_120_106.webp differ diff --git a/features/wallet/impl/src/main/res/drawable/ill_blush_sky_card3_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_blush_sky_card3_120_106.webp new file mode 100644 index 0000000000..826352711a Binary files /dev/null and b/features/wallet/impl/src/main/res/drawable/ill_blush_sky_card3_120_106.webp differ diff --git a/features/wallet/impl/src/main/res/drawable/ill_electra_sea_card2_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_electra_sea_card2_120_106.webp new file mode 100644 index 0000000000..85562db319 Binary files /dev/null and b/features/wallet/impl/src/main/res/drawable/ill_electra_sea_card2_120_106.webp differ diff --git a/features/wallet/impl/src/main/res/drawable/ill_electra_sea_card3_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_electra_sea_card3_120_106.webp new file mode 100644 index 0000000000..c596ae0e29 Binary files /dev/null and b/features/wallet/impl/src/main/res/drawable/ill_electra_sea_card3_120_106.webp differ diff --git a/features/wallet/impl/src/main/res/drawable/ill_hyperblue_card2_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_hyperblue_card2_120_106.webp new file mode 100644 index 0000000000..a3f4a3914b Binary files /dev/null and b/features/wallet/impl/src/main/res/drawable/ill_hyperblue_card2_120_106.webp differ diff --git a/features/wallet/impl/src/main/res/drawable/ill_hyperblue_card3_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_hyperblue_card3_120_106.webp new file mode 100644 index 0000000000..3b95c95e3e Binary files /dev/null and b/features/wallet/impl/src/main/res/drawable/ill_hyperblue_card3_120_106.webp differ