From b056bc60e4469bfcdc60b789f7b478a45af81158 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Thu, 1 Jun 2023 16:43:45 +0300
Subject: [PATCH 01/21] Updated on 2026-08-14

---
 core/res/src/main/res/values/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/res/src/main/res/values/strings.xml b/core/res/src/main/res/values/strings.xml
index aa3dd033f5..fa2b1dfecf 100644
--- a/core/res/src/main/res/values/strings.xml
+++ b/core/res/src/main/res/values/strings.xml
@@ -356,7 +356,6 @@
     <string name="shop_other_payment_methods">Other payment methods</string>
     <string name="shop_sold_out_description_prefix">Due to the high volume of orders we are receiving, Shipping and Local Delivery orders may be delayed.</string>
     <string name="shop_pre_order_now">Pre-order now</string>
-    <string name="shop_sold_out_description">Due to the high volume of orders we are receiving shipping may be delayed up to 5 weeks depending on your location</string>
     <string name="shop_total">Total</string>
     <string name="solana_rent_warning">Solana network charges a rent of %1$s every 2 days. Accounts that can\'t afford the rent are purged from the network. Deposit your account with more than %2$s to use it for free.</string>
     <string name="story_awe_description">Store your crypto assets secure while keeping private keys contained in your card</string>

From 99e6086bf58cdace68c4c8fd07ca3f2ecb40aa89 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 19 Jun 2023 08:51:46 +0300
Subject: [PATCH 02/21] Updated on 2026-08-14

---
 app/src/main/AndroidManifest.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 13d09bd76f..7b6142a534 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -140,6 +140,8 @@
 
         <activity android:name="com.tangem.feature.learn2earn.presentation.Learn2earnWebViewActivity"/>
 
+        <activity android:name="com.tangem.feature.learn2earn.presentation.Learn2earnWebViewActivity"/>
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"

From 6fa52223582fe59d13f46ebcb8da6678b506121b Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 21 Jun 2023 13:25:40 +0300
Subject: [PATCH 03/21] Updated on 2026-08-14

---
 .idea/codeStyles/Project.xml                                  | 3 ---
 .../java/com/tangem/tap/features/home/redux/HomeReducer.kt    | 4 +---
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index ac3eeb6f5d..0db8c6d7c9 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -13,9 +13,6 @@
           <package name="io.ktor" alias="false" withSubpackages="true" />
         </value>
       </option>
-      <option name="LINE_BREAK_AFTER_MULTILINE_WHEN_ENTRY" value="false" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="5" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="3" />
       <option name="ALLOW_TRAILING_COMMA" value="true" />
       <option name="BLANK_LINES_BEFORE_DECLARATION_WITH_COMMENT_OR_ANNOTATION_ON_SEPARATE_LINE" value="0" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
diff --git a/app/src/main/java/com/tangem/tap/features/home/redux/HomeReducer.kt b/app/src/main/java/com/tangem/tap/features/home/redux/HomeReducer.kt
index 6843253f5a..e2c0210706 100644
--- a/app/src/main/java/com/tangem/tap/features/home/redux/HomeReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/redux/HomeReducer.kt
@@ -14,9 +14,7 @@ private fun internalReduce(action: Action, state: AppState): HomeState {
     when (action) {
         is HomeAction.InsertStory -> {
             state = state.copy(
-                stories = state.stories.toMutableList().apply {
-                    add(action.position, action.story)
-                },
+                stories = listOf(action.story) + state.stories,
             )
         }
         is HomeAction.ScanInProgress -> {

From 407337ed00a42277edf99beb27953083a25703fe Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 26 Jun 2023 15:18:40 +0300
Subject: [PATCH 04/21] Updated on 2026-08-14

---
 .idea/codeStyles/Project.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 0db8c6d7c9..ac3eeb6f5d 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -13,6 +13,9 @@
           <package name="io.ktor" alias="false" withSubpackages="true" />
         </value>
       </option>
+      <option name="LINE_BREAK_AFTER_MULTILINE_WHEN_ENTRY" value="false" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="5" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="3" />
       <option name="ALLOW_TRAILING_COMMA" value="true" />
       <option name="BLANK_LINES_BEFORE_DECLARATION_WITH_COMMENT_OR_ANNOTATION_ON_SEPARATE_LINE" value="0" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />

From 144876bd4b5de120babc8f31495804099addd062 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 26 Jun 2023 19:37:57 +0300
Subject: [PATCH 05/21] Updated on 2026-08-14

---
 .../tap/network/auth/LazyAuthProviderImpl.kt  | 16 ++++++++++++++
 .../network/auth/TangemBasicAuthProvider.kt   | 12 -----------
 .../tangem/tap/network/auth/di/AuthModule.kt  |  9 ++++----
 .../datasource/api/promotion/PromotionApi.kt  |  2 +-
 .../models/AbstractPromotionResponse.kt       |  2 +-
 .../api/promotion/models/AwardRequestBody.kt  |  1 +
 .../promotion/models/PromotionInfoResponse.kt | 21 +++++++------------
 .../com/tangem/datasource/di/NetworkModule.kt | 15 ++++++-------
 .../tangem/datasource/utils/HttpClientExt.kt  | 14 +++++++++++++
 .../tangem/datasource/utils/RequestHeader.kt  | 13 +++++++++++-
 .../com/tangem/lib/auth/BasicAuthProvider.kt  |  9 --------
 .../com/tangem/lib/auth/LazyAuthProvider.kt   | 14 +++++++++++++
 12 files changed, 79 insertions(+), 49 deletions(-)
 create mode 100644 app/src/main/java/com/tangem/tap/network/auth/LazyAuthProviderImpl.kt
 delete mode 100644 app/src/main/java/com/tangem/tap/network/auth/TangemBasicAuthProvider.kt
 delete mode 100644 libs/auth/src/main/java/com/tangem/lib/auth/BasicAuthProvider.kt
 create mode 100644 libs/auth/src/main/java/com/tangem/lib/auth/LazyAuthProvider.kt

diff --git a/app/src/main/java/com/tangem/tap/network/auth/LazyAuthProviderImpl.kt b/app/src/main/java/com/tangem/tap/network/auth/LazyAuthProviderImpl.kt
new file mode 100644
index 0000000000..dfe9d32307
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/network/auth/LazyAuthProviderImpl.kt
@@ -0,0 +1,16 @@
+package com.tangem.tap.network.auth
+
+import com.tangem.common.extensions.toHexString
+import com.tangem.lib.auth.LazyAuthProvider
+import com.tangem.tap.proxy.AppStateHolder
+
+class LazyAuthProviderImpl(private val appStateHolder: AppStateHolder) : LazyAuthProvider {
+
+    override fun getCardPublicKeyProvider(): () -> String {
+        return { appStateHolder.getActualCard()?.cardPublicKey?.toHexString() ?: "" }
+    }
+
+    override fun getCardIdProvider(): () -> String {
+        return { appStateHolder.getActualCard()?.cardId ?: "" }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/network/auth/TangemBasicAuthProvider.kt b/app/src/main/java/com/tangem/tap/network/auth/TangemBasicAuthProvider.kt
deleted file mode 100644
index 32b29fa4f9..0000000000
--- a/app/src/main/java/com/tangem/tap/network/auth/TangemBasicAuthProvider.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.tangem.tap.network.auth
-
-import com.tangem.lib.auth.BasicAuthProvider
-
-class TangemBasicAuthProvider(private val credentials: String?) : BasicAuthProvider {
-
-    override fun getCredentials(): Map<String, String> = if (credentials == null) {
-        mapOf()
-    } else {
-        mapOf("Authorization" to "Basic $credentials")
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt b/app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt
index 6ccf6b29b1..b36bc1f85c 100644
--- a/app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt
+++ b/app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt
@@ -1,10 +1,9 @@
 package com.tangem.tap.network.auth.di
 
-import com.tangem.datasource.config.ConfigManager
 import com.tangem.lib.auth.AuthProvider
-import com.tangem.lib.auth.BasicAuthProvider
+import com.tangem.lib.auth.LazyAuthProvider
 import com.tangem.tap.network.auth.AuthProviderImpl
-import com.tangem.tap.network.auth.TangemBasicAuthProvider
+import com.tangem.tap.network.auth.LazyAuthProviderImpl
 import com.tangem.tap.proxy.AppStateHolder
 import dagger.Module
 import dagger.Provides
@@ -24,7 +23,7 @@ class AuthModule {
 
     @Provides
     @Singleton
-    fun provideTangemBasicAuthProvider(configManager: ConfigManager): BasicAuthProvider {
-        return TangemBasicAuthProvider(configManager.config.tangemComAuthorization)
+    fun provideLazyAuthProvider(appStateHolder: AppStateHolder): LazyAuthProvider {
+        return LazyAuthProviderImpl(appStateHolder)
     }
 }
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/promotion/PromotionApi.kt b/core/datasource/src/main/java/com/tangem/datasource/api/promotion/PromotionApi.kt
index dce9e044b7..d71061c21a 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/promotion/PromotionApi.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/promotion/PromotionApi.kt
@@ -24,6 +24,6 @@ interface PromotionApi {
     @POST("promotion/validate")
     suspend fun validate(@Body request: ValidateRequestBody): ValidateResponse
 
-    @GET("promotion/award")
+    @POST("promotion/award")
     suspend fun requestAward(@Body request: AwardRequestBody): AwardResponse
 }
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/promotion/models/AbstractPromotionResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/promotion/models/AbstractPromotionResponse.kt
index 064dc71a96..5f6282ad76 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/promotion/models/AbstractPromotionResponse.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/promotion/models/AbstractPromotionResponse.kt
@@ -13,6 +13,6 @@ abstract class AbstractPromotionResponse {
 
     data class Error(
         @Json(name = "code") val code: Int,
-        @Json(name = "description") val description: String,
+        @Json(name = "description") val message: String,
     )
 }
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/promotion/models/AwardRequestBody.kt b/core/datasource/src/main/java/com/tangem/datasource/api/promotion/models/AwardRequestBody.kt
index 4ce66c7d76..c8ac7faed1 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/promotion/models/AwardRequestBody.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/promotion/models/AwardRequestBody.kt
@@ -7,5 +7,6 @@ import com.squareup.moshi.Json
  */
 data class AwardRequestBody(
     @Json(name = "walletId") val walletId: String,
+    @Json(name = "address") val address: String,
     @Json(name = "programName") val programName: String,
 )
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/promotion/models/PromotionInfoResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/promotion/models/PromotionInfoResponse.kt
index 2caaaacf14..ed7089f9e4 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/promotion/models/PromotionInfoResponse.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/promotion/models/PromotionInfoResponse.kt
@@ -7,9 +7,9 @@ import com.squareup.moshi.Json
  */
 data class PromotionInfoResponse(
     @Json(name = "status") val status: Status?,
-    @Json(name = "awardForNewCard") val awardForNewCard: Float?,
-    @Json(name = "awardForOldCard") val awardForOldCard: Float?,
-    @Json(name = "awardPaymentToken") val awardPaymentToken: TokenInfo?,
+    @Json(name = "awardForNewCard") val awardForNewCard: Double?,
+    @Json(name = "awardForOldCard") val awardForOldCard: Double?,
+    @Json(name = "awardPaymentToken") val awardPaymentToken: TokenData?,
     @Json(name = "error") override val error: Error? = null,
 ) : AbstractPromotionResponse() {
 
@@ -24,18 +24,13 @@ data class PromotionInfoResponse(
         FINISHED("finished"),
     }
 
-    data class TokenInfo(
+    data class TokenData(
         @Json(name = "id") val id: String,
         @Json(name = "name") val name: String,
         @Json(name = "symbol") val symbol: String,
         @Json(name = "active") val active: Boolean,
-        @Json(name = "networks") val networks: List<Network>,
-    ) {
-        data class Network(
-            @Json(name = "networkId") val networkId: String,
-            @Json(name = "exchangeable") val exchangeable: Boolean,
-            @Json(name = "contractAddress") val contractAddress: String,
-            @Json(name = "decimalCount") val decimalCount: Int,
-        )
-    }
+        @Json(name = "networkId") val networkId: String,
+        @Json(name = "contractAddress") val contractAddress: String,
+        @Json(name = "decimalCount") val decimalCount: Int,
+    )
 }
\ No newline at end of file
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 905d1373d9..595ddbdca9 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
@@ -4,10 +4,13 @@ import com.squareup.moshi.Moshi
 import com.tangem.datasource.api.paymentology.PaymentologyApi
 import com.tangem.datasource.api.promotion.PromotionApi
 import com.tangem.datasource.api.tangemTech.TangemTechApi
+import com.tangem.datasource.utils.LazyRequestHeader
 import com.tangem.datasource.utils.RequestHeader.*
 import com.tangem.datasource.utils.addHeaders
+import com.tangem.datasource.utils.addLazyHeaders
 import com.tangem.datasource.utils.allowLogging
-import com.tangem.lib.auth.AuthProvider
+import com.tangem.lib.auth.BuildConfig
+import com.tangem.lib.auth.LazyAuthProvider
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -60,10 +63,10 @@ class NetworkModule {
     @Provides
     @Singleton
     @PromotionOneInch
-    fun providePromotionOneInchApi(authProvider: AuthProvider, @NetworkMoshi moshi: Moshi): PromotionApi {
+    fun providePromotionOneInchApi(authProvider: LazyAuthProvider, @NetworkMoshi moshi: Moshi): PromotionApi {
         val okClient = OkHttpClient.Builder()
-            .addHeaders(
-                AuthenticationHeader(authProvider),
+            .addLazyHeaders(
+                LazyRequestHeader.LazyAuthenticationHeader(authProvider),
             )
             .allowLogging()
             .callTimeout(API_ONE_INCH_TIMEOUT_MS, TimeUnit.MILLISECONDS)
@@ -77,7 +80,7 @@ class NetworkModule {
     private fun createBasePromotionRetrofit(okHttpClient: OkHttpClient, moshi: Moshi): PromotionApi {
         return Retrofit.Builder()
             .addConverterFactory(MoshiConverterFactory.create(moshi))
-            .baseUrl(PROMOTION_BASE_URL)
+            .baseUrl(if (BuildConfig.DEBUG) DEV_TANGEM_TECH_BASE_URL else PROD_TANGEM_TECH_BASE_URL)
             .client(okHttpClient)
             .build()
             .create(PromotionApi::class.java)
@@ -87,8 +90,6 @@ class NetworkModule {
         const val PROD_TANGEM_TECH_BASE_URL = "https://api.tangem-tech.com/v1/"
         const val DEV_TANGEM_TECH_BASE_URL = "https://devapi.tangem-tech.com/v1/"
 
-        const val PROMOTION_BASE_URL = "https://tangem.com/v1/"
-
         const val PAYMENTOLOGY_BASE_URL: String = "https://paymentologygate.oa.r.appspot.com/"
         const val API_ONE_INCH_TIMEOUT_MS = 5000L
     }
diff --git a/core/datasource/src/main/java/com/tangem/datasource/utils/HttpClientExt.kt b/core/datasource/src/main/java/com/tangem/datasource/utils/HttpClientExt.kt
index dffc98c05a..db1c1f0e13 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/utils/HttpClientExt.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/utils/HttpClientExt.kt
@@ -21,6 +21,20 @@ internal fun OkHttpClient.Builder.addHeaders(vararg requestHeaders: RequestHeade
     )
 }
 
+internal fun OkHttpClient.Builder.addLazyHeaders(vararg requestHeaders: LazyRequestHeader): OkHttpClient.Builder {
+    return addInterceptor(
+        Interceptor { chain ->
+            val request = chain.request().newBuilder().apply {
+                requestHeaders
+                    .flatMap(LazyRequestHeader::values)
+                    .forEach { addHeader(it.first, it.second.invoke()) }
+            }.build()
+
+            chain.proceed(request)
+        },
+    )
+}
+
 /**
  * Extension for logging each [OkHttpClient] request
  *
diff --git a/core/datasource/src/main/java/com/tangem/datasource/utils/RequestHeader.kt b/core/datasource/src/main/java/com/tangem/datasource/utils/RequestHeader.kt
index 66d6c0f90b..3c460035f5 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/utils/RequestHeader.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/utils/RequestHeader.kt
@@ -1,6 +1,7 @@
 package com.tangem.datasource.utils
 
 import com.tangem.lib.auth.AuthProvider
+import com.tangem.lib.auth.LazyAuthProvider
 
 /**
  * Presentation of request header
@@ -15,7 +16,17 @@ sealed class RequestHeader(vararg pairs: Pair<String, String>) {
     object CacheControlHeader : RequestHeader("Cache-Control" to "max-age=600")
 
     class AuthenticationHeader(authProvider: AuthProvider) : RequestHeader(
-        "card_public_key" to authProvider.getCardPublicKey(),
         "card_id" to authProvider.getCardId(),
+        "card_public_key" to authProvider.getCardPublicKey(),
+    )
+}
+
+sealed class LazyRequestHeader(vararg pairs: Pair<String, () -> String>) {
+
+    val values: List<Pair<String, () -> String>> = pairs.toList()
+
+    class LazyAuthenticationHeader(authProvider: LazyAuthProvider) : LazyRequestHeader(
+        "card_id" to authProvider.getCardIdProvider(),
+        "card_public_key" to authProvider.getCardPublicKeyProvider(),
     )
 }
\ No newline at end of file
diff --git a/libs/auth/src/main/java/com/tangem/lib/auth/BasicAuthProvider.kt b/libs/auth/src/main/java/com/tangem/lib/auth/BasicAuthProvider.kt
deleted file mode 100644
index 1d4a6c7e14..0000000000
--- a/libs/auth/src/main/java/com/tangem/lib/auth/BasicAuthProvider.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.tangem.lib.auth
-
-/**
- * Provides auth for Tangem WebView
- */
-interface BasicAuthProvider {
-
-    fun getCredentials(): Map<String, String>
-}
\ No newline at end of file
diff --git a/libs/auth/src/main/java/com/tangem/lib/auth/LazyAuthProvider.kt b/libs/auth/src/main/java/com/tangem/lib/auth/LazyAuthProvider.kt
new file mode 100644
index 0000000000..8dcc383e30
--- /dev/null
+++ b/libs/auth/src/main/java/com/tangem/lib/auth/LazyAuthProvider.kt
@@ -0,0 +1,14 @@
+package com.tangem.lib.auth
+
+/**
+ * Provides auth for tangemTech API
+ */
+interface LazyAuthProvider {
+
+    /**
+     * Returns authToken for tangem tech api
+     */
+    fun getCardPublicKeyProvider(): () -> String
+
+    fun getCardIdProvider(): () -> String
+}
\ No newline at end of file

From 7b68f938a8ba4314a62bdf45ce821111c2c5d435 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 26 Jun 2023 19:41:43 +0300
Subject: [PATCH 06/21] Updated on 2026-08-14

---
 .../data/DefaultLearn2earnRepository.kt       | 55 +++++++++++++------
 .../data/DefaultPreferenceStorage.kt          |  5 +-
 .../data/DefaultUsedCardsPreferenceStorage.kt | 14 -----
 .../data/api/Learn2earnPreferenceStorage.kt   |  4 +-
 .../data/api/Learn2earnRepository.kt          | 11 ++--
 .../data/api/UsedCardsPreferenceStorage.kt    |  9 ---
 .../data/di/Learn2earnDataModule.kt           | 15 +----
 .../learn2earn/data/models/PromoUserData.kt   | 10 ++++
 8 files changed, 54 insertions(+), 69 deletions(-)
 delete mode 100644 features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultUsedCardsPreferenceStorage.kt
 delete mode 100644 features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/api/UsedCardsPreferenceStorage.kt
 create mode 100644 features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/models/PromoUserData.kt

diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultLearn2earnRepository.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultLearn2earnRepository.kt
index 3275265a73..4e82732da2 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultLearn2earnRepository.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultLearn2earnRepository.kt
@@ -5,7 +5,7 @@ import com.tangem.datasource.api.promotion.PromotionApi
 import com.tangem.datasource.api.promotion.models.*
 import com.tangem.feature.learn2earn.data.api.Learn2earnPreferenceStorage
 import com.tangem.feature.learn2earn.data.api.Learn2earnRepository
-import com.tangem.feature.learn2earn.data.api.UsedCardsPreferenceStorage
+import com.tangem.feature.learn2earn.data.models.PromoUserData
 import com.tangem.utils.coroutines.AppCoroutineDispatcherProvider
 import kotlinx.coroutines.withContext
 import timber.log.Timber
@@ -15,38 +15,32 @@ import timber.log.Timber
  */
 internal class DefaultLearn2earnRepository(
     private val preferencesStorage: Learn2earnPreferenceStorage,
-    private val usedCardsPreferenceStorage: UsedCardsPreferenceStorage,
-    private val moshi: Moshi,
     private val api: PromotionApi,
     private val dispatchers: AppCoroutineDispatcherProvider,
+    moshi: Moshi,
 ) : Learn2earnRepository {
 
     private val promotionInfoAdapter = moshi.adapter(PromotionInfoResponse::class.java)
+    private val userInfoAdapter = moshi.adapter(PromoUserData::class.java)
 
-    override fun isHadActivatedCards(): Boolean {
-        return usedCardsPreferenceStorage.isHadActivatedCards()
+    private var userData: PromoUserData = restoreUserData()
+
+    override fun getUserData(): PromoUserData {
+        return userData
     }
 
-    override fun getPromoCode(): String? {
-        return preferencesStorage.promoCode
-    }
-
-    override fun savePromoCode(code: String) {
-        preferencesStorage.promoCode = code
+    override fun updateUserData(userData: PromoUserData) {
+        this.userData = userData
+        saveUserData(userData)
     }
 
     override fun getProgramName(): String {
         return PROGRAM_NAME
     }
 
-    override fun isAlreadyReceivedAward(): Boolean {
-        return preferencesStorage.alreadyReceivedAward
-    }
-
     override suspend fun getPromotionInfo(): Result<PromotionInfoResponse> {
         return withContext(dispatchers.io) {
             val info = restorePromotionInfo()
-
             if (info?.status == PromotionInfoResponse.Status.FINISHED) {
                 Result.success(info)
             } else {
@@ -68,9 +62,9 @@ internal class DefaultLearn2earnRepository(
         }
     }
 
-    override suspend fun requestAward(walletId: String): AwardResponse {
+    override suspend fun requestAward(walletId: String, address: String): AwardResponse {
         return withContext(dispatchers.io) {
-            api.requestAward(AwardRequestBody(walletId, getProgramName()))
+            api.requestAward(AwardRequestBody(walletId, address, getProgramName()))
         }
     }
 
@@ -104,6 +98,31 @@ internal class DefaultLearn2earnRepository(
         }
     }
 
+    private fun restoreUserData(): PromoUserData {
+        return try {
+            preferencesStorage.userData?.let { userInfoAdapter.fromJson(it) }
+                ?: createNewUser().apply { saveUserData(this) }
+        } catch (ex: Exception) {
+            Timber.e(ex)
+            createNewUser().apply { saveUserData(this) }
+        }
+    }
+
+    private fun saveUserData(userData: PromoUserData) {
+        try {
+            preferencesStorage.userData = userInfoAdapter.toJson(userData)
+        } catch (ex: Exception) {
+            Timber.e(ex)
+            preferencesStorage.userData = null
+        }
+    }
+
+    private fun createNewUser(): PromoUserData = PromoUserData(
+        promoCode = null,
+        isRegisteredInPromotion = false,
+        alreadyReceivedAward = false,
+    )
+
     private companion object {
         const val PROGRAM_NAME: String = "1inch"
     }
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultPreferenceStorage.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultPreferenceStorage.kt
index 1df706746e..4c3e39b9ae 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultPreferenceStorage.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultPreferenceStorage.kt
@@ -3,7 +3,6 @@ package com.tangem.feature.learn2earn.data
 import android.content.Context
 import com.tangem.feature.learn2earn.data.api.Learn2earnPreferenceStorage
 import hu.autsoft.krate.SimpleKrate
-import hu.autsoft.krate.booleanPref
 import hu.autsoft.krate.default.withDefault
 import hu.autsoft.krate.stringPref
 
@@ -14,9 +13,7 @@ internal class DefaultPreferenceStorage(
     context: Context,
 ) : SimpleKrate(context = context, name = "Lear2earnPromotion"), Learn2earnPreferenceStorage {
 
-    override var promoCode: String? by stringPref().withDefault(null)
-
     override var promotionInfo: String? by stringPref().withDefault(null)
 
-    override var alreadyReceivedAward: Boolean by booleanPref().withDefault(false)
+    override var userData: String? by stringPref().withDefault(null)
 }
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultUsedCardsPreferenceStorage.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultUsedCardsPreferenceStorage.kt
deleted file mode 100644
index a2f3a8cab4..0000000000
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultUsedCardsPreferenceStorage.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.tangem.feature.learn2earn.data
-
-import com.tangem.data.source.preferences.storage.UsedCardsPrefStorage
-import com.tangem.feature.learn2earn.data.api.UsedCardsPreferenceStorage
-
-/**
-[REDACTED_AUTHOR]
- */
-class DefaultUsedCardsPreferenceStorage(
-    private val usedCardsPrefStorage: UsedCardsPrefStorage,
-) : UsedCardsPreferenceStorage {
-
-    override fun isHadActivatedCards(): Boolean = usedCardsPrefStorage.hadFinishedActivation()
-}
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/api/Learn2earnPreferenceStorage.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/api/Learn2earnPreferenceStorage.kt
index b1a251712c..8c8840bb74 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/api/Learn2earnPreferenceStorage.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/api/Learn2earnPreferenceStorage.kt
@@ -5,9 +5,7 @@ package com.tangem.feature.learn2earn.data.api
  */
 interface Learn2earnPreferenceStorage {
 
-    var promoCode: String?
-
     var promotionInfo: String?
 
-    var alreadyReceivedAward: Boolean
+    var userData: String?
 }
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/api/Learn2earnRepository.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/api/Learn2earnRepository.kt
index 2a8d8811dd..06e95628d7 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/api/Learn2earnRepository.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/api/Learn2earnRepository.kt
@@ -1,27 +1,24 @@
 package com.tangem.feature.learn2earn.data.api
 
 import com.tangem.datasource.api.promotion.models.*
+import com.tangem.feature.learn2earn.data.models.PromoUserData
 
 /**
 [REDACTED_AUTHOR]
  */
 interface Learn2earnRepository {
 
-    fun isHadActivatedCards(): Boolean
+    fun getUserData(): PromoUserData
 
-    fun getPromoCode(): String?
-
-    fun savePromoCode(code: String)
+    fun updateUserData(userData: PromoUserData)
 
     fun getProgramName(): String
 
-    fun isAlreadyReceivedAward(): Boolean
-
     suspend fun getPromotionInfo(): Result<PromotionInfoResponse>
 
     suspend fun validate(walletId: String): ValidateResponse
 
-    suspend fun requestAward(walletId: String): AwardResponse
+    suspend fun requestAward(walletId: String, address: String): AwardResponse
 
     suspend fun validateCode(walletId: String, code: String?): CodeValidateResponse
 
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/api/UsedCardsPreferenceStorage.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/api/UsedCardsPreferenceStorage.kt
deleted file mode 100644
index c7d1174496..0000000000
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/api/UsedCardsPreferenceStorage.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.tangem.feature.learn2earn.data.api
-
-/**
-[REDACTED_AUTHOR]
- * An interface that encapsulates access to deprecated PreferencesDataSource.usedCardsPrefStorage.
- */
-interface UsedCardsPreferenceStorage {
-    fun isHadActivatedCards(): Boolean
-}
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/di/Learn2earnDataModule.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/di/Learn2earnDataModule.kt
index b6b32a203b..98cb9f1b9c 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/di/Learn2earnDataModule.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/di/Learn2earnDataModule.kt
@@ -2,16 +2,13 @@ package com.tangem.feature.learn2earn.data.di
 
 import android.content.Context
 import com.squareup.moshi.Moshi
-import com.tangem.data.source.preferences.PreferencesDataSource
 import com.tangem.datasource.api.promotion.PromotionApi
 import com.tangem.datasource.di.NetworkMoshi
 import com.tangem.datasource.di.PromotionOneInch
 import com.tangem.feature.learn2earn.data.DefaultLearn2earnRepository
 import com.tangem.feature.learn2earn.data.DefaultPreferenceStorage
-import com.tangem.feature.learn2earn.data.DefaultUsedCardsPreferenceStorage
 import com.tangem.feature.learn2earn.data.api.Learn2earnPreferenceStorage
 import com.tangem.feature.learn2earn.data.api.Learn2earnRepository
-import com.tangem.feature.learn2earn.data.api.UsedCardsPreferenceStorage
 import com.tangem.utils.coroutines.AppCoroutineDispatcherProvider
 import dagger.Module
 import dagger.Provides
@@ -30,29 +27,19 @@ class Learn2earnDataModule {
         return DefaultPreferenceStorage(context)
     }
 
-    @Provides
-    @Singleton
-    fun provideDeprecatedPreferenceDataSource(
-        preferenceDataSource: PreferencesDataSource,
-    ): UsedCardsPreferenceStorage {
-        return DefaultUsedCardsPreferenceStorage(preferenceDataSource.usedCardsPrefStorage)
-    }
-
     @Provides
     @Singleton
     fun provideRepository(
         preferenceStorage: Learn2earnPreferenceStorage,
-        usedCardsPreferenceStorage: UsedCardsPreferenceStorage,
         @NetworkMoshi moshi: Moshi,
         @PromotionOneInch promotionApi: PromotionApi,
         dispatchers: AppCoroutineDispatcherProvider,
     ): Learn2earnRepository {
         return DefaultLearn2earnRepository(
             preferencesStorage = preferenceStorage,
-            usedCardsPreferenceStorage = usedCardsPreferenceStorage,
-            moshi = moshi,
             api = promotionApi,
             dispatchers = dispatchers,
+            moshi = moshi,
         )
     }
 }
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/models/PromoUserData.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/models/PromoUserData.kt
new file mode 100644
index 0000000000..a982239d0a
--- /dev/null
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/models/PromoUserData.kt
@@ -0,0 +1,10 @@
+package com.tangem.feature.learn2earn.data.models
+
+/**
+[REDACTED_AUTHOR]
+ */
+data class PromoUserData(
+    val promoCode: String?,
+    val isRegisteredInPromotion: Boolean,
+    val alreadyReceivedAward: Boolean,
+)
\ No newline at end of file

From ae0783b2539ec816d5bb5780d451b8ac55a5e219 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 26 Jun 2023 19:53:17 +0300
Subject: [PATCH 07/21] Updated on 2026-08-14

---
 features/learn2earn/impl/build.gradle.kts     |  13 +-
 .../domain/DefaultLearn2earnInteractor.kt     | 208 +++++++++++++++---
 .../learn2earn/domain/HeadersConverter.kt     |  25 +++
 .../learn2earn/domain/WebViewUriBuilder.kt    |  55 +++--
 .../domain/api/Learn2earnInteractor.kt        |  24 +-
 .../domain/api/WebViewRedirectHandler.kt      |  19 ++
 .../domain/api/WebViewResultHandler.kt        |  15 ++
 .../domain/di/Learn2earnDomainModule.kt       |  18 +-
 .../learn2earn/domain/models/CardType.kt      |   9 -
 .../learn2earn/domain/models/MockModels.kt    |  76 -------
 .../learn2earn/domain/models/Promotion.kt     |   8 +-
 .../domain/models/PromotionError.kt           |  32 ++-
 .../learn2earn/domain/models/WebViewHelper.kt |  17 --
 13 files changed, 326 insertions(+), 193 deletions(-)
 create mode 100644 features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/HeadersConverter.kt
 create mode 100644 features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/WebViewRedirectHandler.kt
 create mode 100644 features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/WebViewResultHandler.kt
 delete mode 100644 features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/models/CardType.kt
 delete mode 100644 features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/models/MockModels.kt
 delete mode 100644 features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/models/WebViewHelper.kt

diff --git a/features/learn2earn/impl/build.gradle.kts b/features/learn2earn/impl/build.gradle.kts
index bd20fe9bf6..b1c4ef9a5a 100644
--- a/features/learn2earn/impl/build.gradle.kts
+++ b/features/learn2earn/impl/build.gradle.kts
@@ -17,31 +17,28 @@ dependencies {
     implementation(project(":core:res"))
     implementation(project(":data:source:preferences"))
     implementation(project(":libs:auth"))
+    implementation(project(":libs:crypto"))
 
     implementation(deps.material)
 
     /** AndroidX */
     implementation(deps.androidx.core.ktx)
     implementation(deps.androidx.appCompat)
+    implementation(deps.androidx.fragment.ktx)
     implementation(deps.androidx.activity.compose)
-    implementation(deps.androidx.constraintLayout)
     implementation(deps.androidx.browser)
 
     /** Compose */
     implementation(deps.compose.material)
+    implementation(deps.compose.material3)
     implementation(deps.compose.foundation)
     implementation(deps.compose.ui)
     implementation(deps.compose.ui.tooling)
 
-    /** Tangem libraries */
-    // TODO: 1inch: delete if later it doesn't needed
-    // implementation(deps.tangem.card.core)
-    // implementation(deps.tangem.card.android) {
-    //     exclude(module = "joda-time")
-    // }
+    /** Preferences */
+    implementation(deps.krateSharedPref)
 
     /** Network */
-    implementation(deps.krateSharedPref)
     implementation(deps.moshi)
     implementation(deps.moshi.kotlin)
     implementation(deps.retrofit)
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt
index e6446305d0..36ef5522e9 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt
@@ -1,77 +1,200 @@
 package com.tangem.feature.learn2earn.domain
 
 import android.net.Uri
+import com.tangem.datasource.api.promotion.models.AbstractPromotionResponse
 import com.tangem.datasource.api.promotion.models.PromotionInfoResponse
 import com.tangem.feature.learn2earn.data.api.Learn2earnRepository
+import com.tangem.feature.learn2earn.data.models.PromoUserData
 import com.tangem.feature.learn2earn.domain.api.Learn2earnInteractor
-import com.tangem.feature.learn2earn.domain.models.CardType
+import com.tangem.feature.learn2earn.domain.api.RedirectConsequences
+import com.tangem.feature.learn2earn.domain.api.WebViewResult
+import com.tangem.feature.learn2earn.domain.api.WebViewResultHandler
 import com.tangem.feature.learn2earn.domain.models.Promotion
 import com.tangem.feature.learn2earn.domain.models.PromotionError
-import com.tangem.feature.learn2earn.domain.models.PromotionError.Companion.toDomainError
-import com.tangem.feature.learn2earn.domain.models.RedirectConsequences
-import com.tangem.lib.auth.BasicAuthProvider
+import com.tangem.feature.learn2earn.domain.models.toDomainError
+import com.tangem.lib.crypto.DerivationManager
+import com.tangem.lib.crypto.UserWalletManager
+import com.tangem.lib.crypto.models.Currency
+import java.text.DecimalFormat
 
 /**
 [REDACTED_AUTHOR]
  */
 class DefaultLearn2earnInteractor(
     private val repository: Learn2earnRepository,
-    basicAuthProvider: BasicAuthProvider,
-    userCountryCodeProvider: () -> String,
+    private val userWalletManager: UserWalletManager,
+    private val derivationManager: DerivationManager,
 ) : Learn2earnInteractor {
 
-    private val webViewUriBuilder = WebViewUriBuilder(
-        basicAuthProvider = basicAuthProvider,
-        userCountryCodeProvider = userCountryCodeProvider,
-        promoCodeProvider = { repository.getPromoCode() },
-        promoNameProvider = { repository.getProgramName() },
-    )
+    override var webViewResultHandler: WebViewResultHandler? = null
 
+    private lateinit var webViewUriBuilder: WebViewUriBuilder
     private lateinit var promotion: Promotion
 
+    override fun setupDependencies(authCredentials: String?, countryCodeProvider: () -> String) {
+        webViewUriBuilder = WebViewUriBuilder(
+            authCredentials = authCredentials,
+            userCountryCodeProvider = countryCodeProvider,
+            promoCodeProvider = { repository.getUserData().promoCode },
+        )
+    }
+
     override suspend fun init() {
         initPromotionInfo()
     }
 
+    override fun isUserHadPromoCode(): Boolean {
+        return repository.getUserData().promoCode != null
+    }
+
     override fun isNeedToShowViewOnStoriesScreen(): Boolean {
         return promotionIsActive()
     }
 
-    override fun getBasicAuthHeaders(): Map<String, String> {
-        return webViewUriBuilder.getBasicAuthHeaders()
+    override suspend fun isNeedToShowViewOnMainScreen(): Boolean {
+        if (!promotionIsActive()) return false
+
+        val response = repository.validate(userWalletManager.getWalletId())
+        return response.valid == true
     }
 
-    override suspend fun isNeedToShowViewOnWalletScreen(walletId: String): Boolean {
-        val response = repository.validate(walletId)
+    override fun isUserRegisteredInPromotion(): Boolean {
+        return repository.getUserData().isRegisteredInPromotion
+    }
 
-        return if (response.valid == false && response.isError()) {
-            false
+    override fun getAwardAmount(): String {
+        val userInfo = repository.getUserData()
+        val promotionInfo = promotion.getPromotionInfo()
+
+        val awardAmount = if (userInfo.promoCode == null) {
+            promotionInfo.awardForOldCard
         } else {
-            promotionIsActive()
+            promotionInfo.awardForNewCard
+        }
+
+        return DecimalFormat("0.#").format(awardAmount)
+    }
+
+    @Throws(IllegalArgumentException::class)
+    override suspend fun requestAward(): Result<Unit> {
+        val awardCurrency = getCurrencyForAward()
+            ?: return Result.failure(PromotionError.UnknownError("Currency for award is null"))
+
+        val walletId = userWalletManager.getWalletId()
+        val promoCode = repository.getUserData().promoCode
+
+        val error = if (promoCode == null) {
+            requestAward(walletId, awardCurrency)
+        } else {
+            requestAwardWithPromoCode(walletId, awardCurrency, promoCode)
+        }
+
+        return if (error == null) {
+            Result.success(Unit)
+        } else {
+            val domainError = error.toDomainError()
+            handlePromotionError(domainError)
+            Result.failure(domainError)
         }
     }
 
-    override fun buildUriForStories(): Uri {
-        val type = if (repository.isHadActivatedCards()) {
-            CardType.NEW
+    private suspend fun requestAward(walletId: String, awardCurrency: Currency): AbstractPromotionResponse.Error? {
+        val validateResponse = repository.validate(walletId)
+        return if (validateResponse.valid == true) {
+            val address = getWalletAddressForAward(awardCurrency)
+            val awardResponse = repository.requestAward(walletId, address)
+            if (awardResponse.status == true) {
+                updateUserData { it.copy(alreadyReceivedAward = true) }
+                null
+            } else {
+                awardResponse.error
+            }
         } else {
-            CardType.EXISTED
+            validateResponse.error
         }
-
-        return webViewUriBuilder.buildUriForStories(type)
     }
 
-    override fun buildUriForMainPage(walletId: String, cardId: String, cardPubKey: String): Uri {
-        return webViewUriBuilder.buildUriForMainPage(walletId, cardId, cardPubKey)
+    private suspend fun requestAwardWithPromoCode(
+        walletId: String,
+        awardCurrency: Currency,
+        promoCode: String,
+    ): AbstractPromotionResponse.Error? {
+        val codeValidateResponse = repository.validateCode(walletId, promoCode)
+        return if (codeValidateResponse.valid == true) {
+            val address = getWalletAddressForAward(awardCurrency)
+            val awardWithCodeResponse = repository.requestAwardByCode(walletId, address, promoCode)
+            if (awardWithCodeResponse.status == true) {
+                updateUserData { it.copy(alreadyReceivedAward = true) }
+                null
+            } else {
+                awardWithCodeResponse.error
+            }
+        } else {
+            codeValidateResponse.error
+        }
     }
 
-    override fun handleWebViewRedirect(uri: Uri): RedirectConsequences {
+    private suspend fun getWalletAddressForAward(currency: Currency): String {
+        val derivationPath = deriveOrAddTokens(currency)
+        return userWalletManager.getWalletAddress(currency.networkId, derivationPath)
+    }
+
+    private suspend fun deriveOrAddTokens(currency: Currency): String {
+        val derivationPath = derivationManager.getDerivationPathForBlockchain(currency.networkId)
+        if (derivationPath.isNullOrEmpty()) error("derivationPath shouldn't be empty")
+
+        if (!derivationManager.hasDerivation(currency.networkId, derivationPath)) {
+            derivationManager.deriveMissingBlockchains(currency)
+        }
+        if (!userWalletManager.isTokenAdded(currency, derivationPath)) {
+            userWalletManager.addToken(currency, derivationPath)
+        }
+        return derivationPath
+    }
+
+    private fun handlePromotionError(error: PromotionError) {
+        when (error) {
+            is PromotionError.CodeNotFound -> {
+                updateUserData { it.copy(promoCode = null) }
+            }
+            is PromotionError.CardAlreadyHasAward, is PromotionError.WalletAlreadyHasAward,
+            is PromotionError.CodeWasAlreadyUsed,
+            -> {
+                updateUserData { it.copy(alreadyReceivedAward = true) }
+            }
+            else -> Unit
+        }
+    }
+
+    override fun buildUriForNewUser(): Uri {
+        return webViewUriBuilder.buildUriForNewUser()
+    }
+
+    override fun buildUriForOldUser(): Uri {
+        return webViewUriBuilder.buildUriForOlgUser()
+    }
+
+    override fun getBasicAuthHeaders(): ArrayList<String> {
+        return HeadersConverter().convert(webViewUriBuilder.getBasicAuthHeaders())
+    }
+
+    override fun handleRedirect(uri: Uri): RedirectConsequences {
         if (webViewUriBuilder.isReadyForExistedCardAwardRedirect(uri)) {
+            updateUserData { it.copy(isRegisteredInPromotion = true) }
+            webViewResultHandler?.handleResult(WebViewResult.ReadyForAward)
             return RedirectConsequences.FINISH_SESSION
         }
 
         return if (webViewUriBuilder.isPromoCodeRedirect(uri)) {
-            webViewUriBuilder.extractPromoCode(uri)?.let { repository.savePromoCode(it) }
+            webViewUriBuilder.extractPromoCode(uri)?.let { code ->
+                updateUserData {
+                    it.copy(
+                        promoCode = code,
+                        isRegisteredInPromotion = true,
+                    )
+                }
+                webViewResultHandler?.handleResult(WebViewResult.PromoCodeReceived)
+            }
             RedirectConsequences.NOTHING
         } else {
             RedirectConsequences.PROCEED
@@ -80,9 +203,9 @@ class DefaultLearn2earnInteractor(
 
     private fun promotionIsActive(): Boolean {
         val isActive = when {
-            repository.isAlreadyReceivedAward() -> false
+            repository.getUserData().alreadyReceivedAward -> false
             promotion.isError() -> false
-            else -> promotion.getInfo().status == PromotionInfoResponse.Status.ACTIVE
+            else -> promotion.getPromotionInfo().status == PromotionInfoResponse.Status.ACTIVE
         }
 
         return isActive
@@ -118,4 +241,27 @@ class DefaultLearn2earnInteractor(
                 },
             )
     }
+
+    private fun getCurrencyForAward(): Currency? {
+        if (promotion.info == null) return null
+
+        val info = promotion.getPromotionInfo()
+        val token = info.awardPaymentToken
+        // use only the first available network
+
+        return Currency.NonNativeToken(
+            id = token.id,
+            name = token.name,
+            symbol = token.symbol,
+            networkId = token.networkId,
+            contractAddress = token.contractAddress,
+            decimalCount = token.decimalCount,
+        )
+    }
+
+    private fun updateUserData(updateBlock: (PromoUserData) -> PromoUserData): PromoUserData {
+        return updateBlock(repository.getUserData()).apply {
+            repository.updateUserData(this)
+        }
+    }
 }
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/HeadersConverter.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/HeadersConverter.kt
new file mode 100644
index 0000000000..b404921d3a
--- /dev/null
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/HeadersConverter.kt
@@ -0,0 +1,25 @@
+package com.tangem.feature.learn2earn.domain
+
+import com.tangem.utils.converter.TwoWayConverter
+
+/**
+ * Converter which helps prepare a list of headers to put it into the Intent and extract them later.
+[REDACTED_AUTHOR]
+ */
+internal class HeadersConverter : TwoWayConverter<Map<String, String>, ArrayList<String>> {
+
+    override fun convert(value: Map<String, String>): ArrayList<String> {
+        val list = value.toList().map {
+            "${it.first}$SPLIT_SIGN${it.second}"
+        }
+        return ArrayList(list)
+    }
+
+    override fun convertBack(value: ArrayList<String>): Map<String, String> {
+        return value.map { it.split(SPLIT_SIGN) }.associate { it[0] to it[1] }
+    }
+
+    private companion object {
+        const val SPLIT_SIGN = ":"
+    }
+}
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/WebViewUriBuilder.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/WebViewUriBuilder.kt
index 17361859ea..c44b4e20fa 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/WebViewUriBuilder.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/WebViewUriBuilder.kt
@@ -1,23 +1,20 @@
 package com.tangem.feature.learn2earn.domain
 
 import android.net.Uri
-import com.tangem.feature.learn2earn.domain.models.CardType
 import com.tangem.feature.learn2earn.impl.BuildConfig
-import com.tangem.lib.auth.BasicAuthProvider
 
 /**
 [REDACTED_AUTHOR]
  */
-class WebViewUriBuilder(
-    private val basicAuthProvider: BasicAuthProvider,
+internal class WebViewUriBuilder(
+    private val authCredentials: String?,
     private val userCountryCodeProvider: () -> String,
     private val promoCodeProvider: () -> String?,
-    private val promoNameProvider: () -> String,
 ) {
 
-    fun buildUriForStories(type: CardType): Uri {
+    fun buildUriForNewUser(): Uri {
         val builder = makeWebViewUriBuilder()
-            .appendQueryParameter("type", type.typeName)
+            .appendQueryParameter("type", QUERY_NEW_CARD)
 
         promoCodeProvider.invoke()?.let {
             builder.appendQueryParameter("code", it)
@@ -26,23 +23,17 @@ class WebViewUriBuilder(
         return builder.build()
     }
 
-    fun buildUriForMainPage(walletId: String, cardId: String, cardPubKey: String): Uri {
+    fun buildUriForOlgUser(): Uri {
         val builder = makeWebViewUriBuilder()
-            .appendQueryParameter("type", CardType.EXISTED.typeName)
-            .appendQueryParameter("cardPublicKey", cardPubKey)
-            .appendQueryParameter("cardId", cardId)
-            .appendQueryParameter("walletId", walletId)
-            .appendQueryParameter("programName", promoNameProvider.invoke())
-
-        promoCodeProvider.invoke()?.let {
-            builder.appendQueryParameter("code", it)
-        }
+            .appendQueryParameter("type", QUERY_EXISTED_CARD)
 
         return builder.build()
     }
 
-    fun getBasicAuthHeaders(): Map<String, String> {
-        return basicAuthProvider.getCredentials()
+    fun getBasicAuthHeaders(): Map<String, String> = if (authCredentials == null) {
+        mapOf()
+    } else {
+        mapOf("Authorization" to "Basic $authCredentials")
     }
 
     fun isPromoCodeRedirect(uri: Uri): Boolean {
@@ -67,30 +58,34 @@ class WebViewUriBuilder(
 
     private fun makeWebViewUriBuilder(): Uri.Builder {
         val builder = Uri.Builder()
-        builder.scheme("https")
+        builder.scheme(SCHEME)
 
         if (BuildConfig.DEBUG) {
-            builder.authority(DEV_WEB_VIEW_BASE_URL)
+            builder.authority(DEV_BASE_URL)
             builder.appendPath(userCountryCodeProvider.invoke())
-            builder.appendPath("promotion-test")
+            builder.appendPath(DEV_PATH_PROMOTION)
         } else {
-            builder.authority(WEB_VIEW_BASE_URL)
+            builder.authority(BASE_URL)
             builder.appendPath(userCountryCodeProvider.invoke())
-            builder.appendPath("promotion")
+            builder.appendPath(PATH_PROMOTION)
         }
 
         return builder
     }
 
     private companion object {
-        const val WEB_VIEW_BASE_URL = "tangem.com"
+        const val SCHEME = "https"
 
-        const val DEV_WEB_VIEW_BASE_URL = "devweb.tangem.com"
-        const val DEV_WEB_VIEW_BASIC_AUTH = "Basic dGFuZ2VtOnRhbmdlbWRldjc="
-        // TODO: 1inch: replace by invalid auth
-        // const val DEV_WEB_VIEW_BASIC_AUTH = "Basic paste valid value"
+        const val BASE_URL = "tangem.com"
+        const val PATH_PROMOTION = "promotion"
+
+        const val QUERY_NEW_CARD = "new-card"
+        const val QUERY_EXISTED_CARD = "existed-card"
+
+        const val DEV_BASE_URL = "devweb.tangem.com"
+        const val DEV_PATH_PROMOTION = "promotion-test"
 
         const val SUFFIX_CODE_CREATED = "/code-created?code="
-        const val SUFFIX_READY_FOR_AWARD = "/ready-for-exsited-card-award"
+        const val SUFFIX_READY_FOR_AWARD = "/ready-for-existed-card-award"
     }
 }
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/Learn2earnInteractor.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/Learn2earnInteractor.kt
index 432d4b001f..5c35867c68 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/Learn2earnInteractor.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/Learn2earnInteractor.kt
@@ -1,24 +1,34 @@
 package com.tangem.feature.learn2earn.domain.api
 
 import android.net.Uri
-import com.tangem.feature.learn2earn.domain.models.RedirectConsequences
 
 /**
 [REDACTED_AUTHOR]
  */
-interface Learn2earnInteractor {
+interface Learn2earnInteractor : WebViewRedirectHandler {
+
+    var webViewResultHandler: WebViewResultHandler?
+
+    fun setupDependencies(authCredentials: String?, countryCodeProvider: () -> String)
 
     suspend fun init()
 
+    fun isUserHadPromoCode(): Boolean
+
     fun isNeedToShowViewOnStoriesScreen(): Boolean
 
-    suspend fun isNeedToShowViewOnWalletScreen(walletId: String): Boolean
+    suspend fun isNeedToShowViewOnMainScreen(): Boolean
 
-    fun getBasicAuthHeaders(): Map<String, String>
+    fun isUserRegisteredInPromotion(): Boolean
 
-    fun buildUriForStories(): Uri
+    fun getAwardAmount(): String
 
-    fun buildUriForMainPage(walletId: String, cardId: String, cardPubKey: String): Uri
+    @Throws(IllegalArgumentException::class)
+    suspend fun requestAward(): Result<Unit>
 
-    fun handleWebViewRedirect(uri: Uri): RedirectConsequences
+    fun buildUriForNewUser(): Uri
+
+    fun buildUriForOldUser(): Uri
+
+    fun getBasicAuthHeaders(): ArrayList<String>
 }
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/WebViewRedirectHandler.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/WebViewRedirectHandler.kt
new file mode 100644
index 0000000000..e15cdb377f
--- /dev/null
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/WebViewRedirectHandler.kt
@@ -0,0 +1,19 @@
+package com.tangem.feature.learn2earn.domain.api
+
+import android.net.Uri
+
+/**
+ * Handler that helps determine what actions to take inside the WebView of the Learn2earnWebViewActivity after
+ * a redirect has been processedWebViewRedirectHandler
+ *
+[REDACTED_AUTHOR]
+ */
+interface WebViewRedirectHandler {
+    fun handleRedirect(uri: Uri): RedirectConsequences
+}
+
+enum class RedirectConsequences {
+    NOTHING,
+    PROCEED,
+    FINISH_SESSION,
+}
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/WebViewResultHandler.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/WebViewResultHandler.kt
new file mode 100644
index 0000000000..08a749f327
--- /dev/null
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/WebViewResultHandler.kt
@@ -0,0 +1,15 @@
+package com.tangem.feature.learn2earn.domain.api
+
+/**
+ * Handler that helps determine a result of the Learn2earnWebViewActivity webView actions.
+ *
+[REDACTED_AUTHOR]
+ */
+interface WebViewResultHandler {
+    fun handleResult(result: WebViewResult)
+}
+
+sealed class WebViewResult {
+    object PromoCodeReceived : WebViewResult()
+    object ReadyForAward : WebViewResult()
+}
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/di/Learn2earnDomainModule.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/di/Learn2earnDomainModule.kt
index 07d5687c5d..915494c1eb 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/di/Learn2earnDomainModule.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/di/Learn2earnDomainModule.kt
@@ -4,8 +4,10 @@ import android.content.Context
 import com.tangem.feature.learn2earn.data.api.Learn2earnRepository
 import com.tangem.feature.learn2earn.domain.DefaultLearn2earnInteractor
 import com.tangem.feature.learn2earn.domain.api.Learn2earnInteractor
+import com.tangem.feature.learn2earn.domain.api.WebViewRedirectHandler
 import com.tangem.feature.learn2earn.presentation.Learn2earnRouter
-import com.tangem.lib.auth.BasicAuthProvider
+import com.tangem.lib.crypto.DerivationManager
+import com.tangem.lib.crypto.UserWalletManager
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -27,13 +29,19 @@ class Learn2earnDomainModule {
     @Singleton
     fun provideInteractor(
         repository: Learn2earnRepository,
-        basicAuthProvider: BasicAuthProvider,
+        userWalletManager: UserWalletManager,
+        derivationManager: DerivationManager,
     ): Learn2earnInteractor {
         return DefaultLearn2earnInteractor(
             repository = repository,
-            basicAuthProvider = basicAuthProvider,
-            // TODO: 1inch: paste locale provider instead of hardcode
-            userCountryCodeProvider = { "ru" },
+            userWalletManager = userWalletManager,
+            derivationManager = derivationManager,
         )
     }
+
+    @Provides
+    @Singleton
+    fun provideWebViewHandler(interactor: Learn2earnInteractor): WebViewRedirectHandler {
+        return interactor
+    }
 }
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/models/CardType.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/models/CardType.kt
deleted file mode 100644
index 1e05115373..0000000000
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/models/CardType.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.tangem.feature.learn2earn.domain.models
-
-/**
-[REDACTED_AUTHOR]
- */
-enum class CardType(val typeName: String) {
-    NEW("new-card"),
-    EXISTED("existed-card"),
-}
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/models/MockModels.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/models/MockModels.kt
deleted file mode 100644
index 340de5e151..0000000000
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/models/MockModels.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.tangem.feature.learn2earn.domain.models
-
-import com.tangem.datasource.api.promotion.models.PromotionInfoResponse
-
-/**
-[REDACTED_AUTHOR]
- */
-internal fun Promotion.Companion.dummyPending(): Promotion {
-    return Promotion(
-        info = Promotion.PromotionInfo.dummy().copy(
-            status = PromotionInfoResponse.Status.PENDING,
-        ),
-        error = null,
-    )
-}
-
-internal fun Promotion.Companion.dummyActive(): Promotion {
-    return Promotion(
-        info = Promotion.PromotionInfo.dummy().copy(
-            status = PromotionInfoResponse.Status.ACTIVE,
-        ),
-        error = null,
-    )
-}
-
-internal fun Promotion.Companion.dummyFinished(): Promotion {
-    return Promotion(
-        info = Promotion.PromotionInfo.dummy().copy(
-            status = PromotionInfoResponse.Status.FINISHED,
-        ),
-        error = null,
-    )
-}
-
-internal fun Promotion.Companion.dummyError(): Promotion {
-    return Promotion(
-        info = null,
-        error = PromotionError.Error(
-            code = 105,
-            description = "any",
-        ),
-    )
-}
-
-internal fun Promotion.Companion.dummyErrorUnreachable(): Promotion {
-    return Promotion(
-        info = null,
-        error = PromotionError.NetworkUnreachable,
-    )
-}
-
-private fun Promotion.PromotionInfo.Companion.dummy(): Promotion.PromotionInfo {
-    return Promotion.PromotionInfo(
-        status = PromotionInfoResponse.Status.ACTIVE,
-        awardForNewCard = 10f,
-        awardForOldCard = 5.5f,
-        awardPaymentToken = Promotion.tokenInfo(),
-    )
-}
-
-private fun Promotion.Companion.tokenInfo(): PromotionInfoResponse.TokenInfo {
-    return PromotionInfoResponse.TokenInfo(
-        id = "1inch",
-        name = "1inch",
-        symbol = "1INCH",
-        active = true,
-        networks = listOf(
-            PromotionInfoResponse.TokenInfo.Network(
-                networkId = "polygon-pos",
-                exchangeable = false,
-                contractAddress = "0x9c2c5fd7b07e95ee044ddeba0e97a665f142394f",
-                decimalCount = 1,
-            ),
-        ),
-    )
-}
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/models/Promotion.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/models/Promotion.kt
index e5b071a15d..a79a7dfba4 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/models/Promotion.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/models/Promotion.kt
@@ -11,7 +11,7 @@ data class Promotion(
 ) {
 
     @Throws(NullPointerException::class)
-    fun getInfo(): PromotionInfo = info!!
+    fun getPromotionInfo(): PromotionInfo = info!!
 
     fun isError(): Boolean = error != null
 
@@ -19,9 +19,9 @@ data class Promotion(
 
     data class PromotionInfo(
         val status: PromotionInfoResponse.Status,
-        val awardForNewCard: Float,
-        val awardForOldCard: Float,
-        val awardPaymentToken: PromotionInfoResponse.TokenInfo,
+        val awardForNewCard: Double,
+        val awardForOldCard: Double,
+        val awardPaymentToken: PromotionInfoResponse.TokenData,
     ) {
         companion object
     }
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/models/PromotionError.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/models/PromotionError.kt
index 8cd24cfa2c..18d8e79293 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/models/PromotionError.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/models/PromotionError.kt
@@ -5,11 +5,31 @@ import com.tangem.datasource.api.promotion.models.AbstractPromotionResponse
 /**
 [REDACTED_AUTHOR]
  */
-sealed class PromotionError(val code: Int, val description: String) {
-    object NetworkUnreachable : PromotionError(-1, "Network or service is unreachable")
-    class Error(code: Int, description: String) : PromotionError(code, description)
+sealed class PromotionError(val code: Int, val description: String) : Throwable(
+    message = "code: $code, description: $description",
+) {
 
-    companion object {
-        fun AbstractPromotionResponse.Error.toDomainError(): PromotionError = Error(code, description)
-    }
+    object NetworkUnreachable : PromotionError(code = 0, "Network or service not available")
+
+    class CodeNotFound(code: Int, description: String) : PromotionError(code, description)
+    class CodeWasNotAppliedInShop(code: Int, description: String) : PromotionError(code, description)
+    class CodeWasAlreadyUsed(code: Int, description: String) : PromotionError(code, description)
+    class WalletAlreadyHasAward(code: Int, description: String) : PromotionError(code, description)
+    class CardAlreadyHasAward(code: Int, description: String) : PromotionError(code, description)
+    class ProgramNotFound(code: Int, description: String) : PromotionError(code, description)
+    class ProgramWasEnd(code: Int, description: String) : PromotionError(code, description)
+
+    class UnknownError(description: String) : PromotionError(code = -1, description)
+}
+
+@Suppress("MagicNumber")
+internal fun AbstractPromotionResponse.Error.toDomainError(): PromotionError = when (code) {
+    101 -> PromotionError.CodeNotFound(code, message)
+    102 -> PromotionError.CodeWasNotAppliedInShop(code, message)
+    103 -> PromotionError.CodeWasAlreadyUsed(code, message)
+    104 -> PromotionError.WalletAlreadyHasAward(code, message)
+    105 -> PromotionError.CardAlreadyHasAward(code, message)
+    106 -> PromotionError.ProgramNotFound(code, message)
+    107 -> PromotionError.ProgramWasEnd(code, message)
+    else -> PromotionError.UnknownError("$code:$message")
 }
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/models/WebViewHelper.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/models/WebViewHelper.kt
deleted file mode 100644
index 0075b17435..0000000000
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/models/WebViewHelper.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.tangem.feature.learn2earn.domain.models
-
-import android.net.Uri
-
-/**
-[REDACTED_AUTHOR]
- */
-interface WebViewHelper {
-    fun handleWebViewRedirect(uri: Uri): RedirectConsequences
-    fun getWebViewHeaders(): Map<String, String>
-}
-
-enum class RedirectConsequences {
-    NOTHING,
-    PROCEED,
-    FINISH_SESSION,
-}
\ No newline at end of file

From b5dde35172c335b77babcb1f0e6eb050a1f95fec Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 26 Jun 2023 20:00:37 +0300
Subject: [PATCH 08/21] Updated on 2026-08-14

---
 .../presentation/Learn2earnRouter.kt          |  11 +-
 .../presentation/Learn2earnViewModel.kt       | 168 +++++++++++++++---
 .../ui/{GetBonusAlert.kt => GetBonusView.kt}  |  56 ++++--
 .../presentation/ui/Learn2earnDialogs.kt      |  85 +++++++++
 .../ui/Learn2earnMainPageScreen.kt            |  21 +++
 ...esScreen.kt => Learn2earnStoriesScreen.kt} |   7 +-
 .../presentation/ui/state/Learn2earnState.kt  |  68 +++++++
 .../presentation/ui/state/StateBuilder.kt     |  93 ++++++++++
 .../Learn2earnWebViewActivity.kt              |  43 ++---
 .../webView/Learn2earnWebViewClient.kt        |  31 ++++
 .../presentation/webView/WebViewViewModel.kt  |  38 ++++
 .../src/main/res/layout/activity_web_view.xml |   1 +
 12 files changed, 545 insertions(+), 77 deletions(-)
 rename features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/{GetBonusAlert.kt => GetBonusView.kt} (66%)
 create mode 100644 features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/Learn2earnDialogs.kt
 create mode 100644 features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/Learn2earnMainPageScreen.kt
 rename features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/{StoriesScreen.kt => Learn2earnStoriesScreen.kt} (95%)
 create mode 100644 features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/Learn2earnState.kt
 create mode 100644 features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt
 rename features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/{ => webView}/Learn2earnWebViewActivity.kt (55%)
 create mode 100644 features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/webView/Learn2earnWebViewClient.kt
 create mode 100644 features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/webView/WebViewViewModel.kt

diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnRouter.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnRouter.kt
index a02d4be651..c845f2a50e 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnRouter.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnRouter.kt
@@ -2,6 +2,8 @@ package com.tangem.feature.learn2earn.presentation
 
 import android.content.Context
 import android.content.Intent
+import android.net.Uri
+import com.tangem.feature.learn2earn.presentation.webView.Learn2earnWebViewActivity
 
 /**
 [REDACTED_AUTHOR]
@@ -10,7 +12,12 @@ class Learn2earnRouter(
     private val context: Context,
 ) {
 
-    fun openWebView() {
-        context.startActivity(Intent(context, Learn2earnWebViewActivity::class.java))
+    fun openWebView(uri: Uri, rawHeaders: ArrayList<String>) {
+        val intent = Intent(context, Learn2earnWebViewActivity::class.java)
+            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            .putExtra(Learn2earnWebViewActivity.EXTRA_WEB_URI, uri.toString())
+            .putStringArrayListExtra(Learn2earnWebViewActivity.EXTRA_WEB_HEADERS, rawHeaders)
+
+        context.startActivity(intent)
     }
 }
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnViewModel.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnViewModel.kt
index f39aee6032..8cd6e4536c 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnViewModel.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnViewModel.kt
@@ -1,11 +1,16 @@
 package com.tangem.feature.learn2earn.presentation
 
-import android.net.Uri
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.tangem.feature.learn2earn.domain.api.Learn2earnInteractor
-import com.tangem.feature.learn2earn.domain.models.RedirectConsequences
-import com.tangem.feature.learn2earn.domain.models.WebViewHelper
+import com.tangem.feature.learn2earn.domain.api.WebViewResult
+import com.tangem.feature.learn2earn.domain.api.WebViewResultHandler
+import com.tangem.feature.learn2earn.domain.models.PromotionError
+import com.tangem.feature.learn2earn.presentation.ui.state.*
+import com.tangem.lib.crypto.models.errors.UserCancelledException
 import com.tangem.utils.coroutines.AppCoroutineDispatcherProvider
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
@@ -20,39 +25,156 @@ class Learn2earnViewModel @Inject constructor(
     private val interactor: Learn2earnInteractor,
     private val router: Learn2earnRouter,
     private val dispatchers: AppCoroutineDispatcherProvider,
-) : ViewModel(), WebViewHelper {
+) : ViewModel() {
 
-    var webViewUri: Uri = Uri.parse("https://localhost")
+    var uiState: Learn2earnState by mutableStateOf(
+        Learn2earnState.init(
+            uiActions = UiActions(
+                buttonStoryClick = ::buttonStoryClick,
+                buttonMainClick = ::buttonMainClick,
+            ),
+        ),
+    )
         private set
 
-    fun isNeedToShowViewOnStoriesScreen(): Boolean = interactor.isNeedToShowViewOnStoriesScreen()
-
-    fun onStoriesClick() {
-        webViewUri = interactor.buildUriForStories()
-        router.openWebView()
+    init {
+        uiState = uiState.updateStoriesVisibility(interactor.isNeedToShowViewOnStoriesScreen())
     }
 
-    fun isNeedToShowViewOnWalletScreen(walletId: String, callback: (Boolean) -> Unit) {
+    fun onMainScreenCreated() {
+        updateMainScreenViews()
+    }
+
+    private fun updateMainScreenViews() {
         viewModelScope.launch(dispatchers.io) {
-            val isNeedToShow = interactor.isNeedToShowViewOnWalletScreen(walletId)
-            withContext(dispatchers.main) {
-                callback(isNeedToShow)
+            if (interactor.isNeedToShowViewOnMainScreen()) {
+                updateUi {
+                    uiState.changeGetBounsDescription(getBonusDescription())
+                        .updateGetBonusVisibility(isVisible = true)
+                }
+            } else {
+                updateUi { uiState.updateGetBonusVisibility(isVisible = false) }
             }
         }
     }
 
-    fun onMainPageClick(walletId: String, cardId: String, cardPubKey: String) {
-        webViewUri = interactor.buildUriForMainPage(walletId, cardId, cardPubKey)
-        router.openWebView()
+    private fun buttonStoryClick() {
+        router.openWebView(interactor.buildUriForNewUser(), interactor.getBasicAuthHeaders())
     }
 
-    // region WebViewHelper
-    override fun handleWebViewRedirect(uri: Uri): RedirectConsequences {
-        return interactor.handleWebViewRedirect(uri)
+    private fun buttonMainClick() {
+        if (!interactor.isUserHadPromoCode() && !interactor.isUserRegisteredInPromotion()) {
+            subscribeToWebViewResultEvents()
+            router.openWebView(interactor.buildUriForOldUser(), interactor.getBasicAuthHeaders())
+            return
+        }
+
+        viewModelScope.launch(dispatchers.io) {
+            updateUi { uiState.updateProgress(showProgress = true) }
+
+            runCatching { interactor.requestAward() }
+                .onSuccess { requestAwardResult ->
+                    requestAwardResult.fold(
+                        onSuccess = {
+                            val onHideDialog = {
+                                uiState = uiState.updateGetBonusVisibility(isVisible = false)
+                                    .hideDialog()
+                            }
+                            val successDialog = MainScreenState.Dialog.Claimed(
+                                onOk = onHideDialog,
+                                onDismissRequest = onHideDialog,
+                            )
+                            updateUi { uiState.showDialog(successDialog) }
+                        },
+                        onFailure = {
+                            val errorDialog = createErrorDialog(it.toDomainError())
+                            updateUi {
+                                uiState.updateProgress(showProgress = false)
+                                    .showDialog(errorDialog)
+                            }
+                        },
+                    )
+                }
+                .onFailure { exception ->
+                    updateUi { uiState.updateProgress(showProgress = false) }
+                    if (exception is UserCancelledException) return@launch
+
+                    val errorDialog = createErrorDialog(exception.toDomainError())
+                    updateUi { uiState.showDialog(errorDialog) }
+                }
+        }
     }
 
-    override fun getWebViewHeaders(): Map<String, String> {
-        return interactor.getBasicAuthHeaders()
+    private fun getBonusDescription(): MainScreenState.Description {
+        return if (interactor.isUserRegisteredInPromotion()) {
+            MainScreenState.Description.GetBonus
+        } else {
+            MainScreenState.Description.Learn(interactor.getAwardAmount())
+        }
     }
-    // endregion WebViewHelper
+
+    private fun createErrorDialog(error: PromotionError): MainScreenState.Dialog {
+        return when (error) {
+            is PromotionError.CodeWasNotAppliedInShop -> {
+                val onHideDialog = { uiState = uiState.hideDialog() }
+                MainScreenState.Dialog.PromoCodeNotRegistered(
+                    onOk = {
+                        uiState = uiState.hideDialog()
+                        subscribeToWebViewResultEvents()
+                        router.openWebView(interactor.buildUriForNewUser(), interactor.getBasicAuthHeaders())
+                    },
+                    onCancel = onHideDialog,
+                    onDismissRequest = onHideDialog,
+                )
+            }
+            is PromotionError.CodeNotFound,
+            is PromotionError.CodeWasAlreadyUsed,
+            is PromotionError.CardAlreadyHasAward,
+            is PromotionError.WalletAlreadyHasAward,
+            is PromotionError.ProgramNotFound,
+            is PromotionError.ProgramWasEnd,
+            -> {
+                val onHideDialog = {
+                    uiState = uiState.hideDialog()
+                        .updateGetBonusVisibility(isVisible = false)
+                }
+                MainScreenState.Dialog.Error(
+                    error = error,
+                    onOk = onHideDialog,
+                    onDismissRequest = onHideDialog,
+                )
+            }
+            is PromotionError.UnknownError, PromotionError.NetworkUnreachable -> {
+                val onHideDialog = { uiState = uiState.hideDialog() }
+                MainScreenState.Dialog.Error(
+                    error = error,
+                    onOk = onHideDialog,
+                    onDismissRequest = onHideDialog,
+                )
+            }
+        }
+    }
+
+    private fun subscribeToWebViewResultEvents() {
+        interactor.webViewResultHandler = object : WebViewResultHandler {
+            override fun handleResult(result: WebViewResult) {
+                interactor.webViewResultHandler = null
+                when (result) {
+                    WebViewResult.ReadyForAward -> updateMainScreenViews()
+                    WebViewResult.PromoCodeReceived -> Unit
+                }
+            }
+        }
+    }
+
+    private suspend fun updateUi(updateBlock: suspend () -> Learn2earnState) {
+        withContext(dispatchers.io) {
+            val newState = updateBlock.invoke()
+            withContext(dispatchers.main) { uiState = newState }
+        }
+    }
+}
+
+private fun Throwable.toDomainError(): PromotionError {
+    return this as? PromotionError ?: PromotionError.UnknownError(message ?: "Unknown error")
 }
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusAlert.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusView.kt
similarity index 66%
rename from features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusAlert.kt
rename to features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusView.kt
index 0079c24f11..25cd356f7d 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusAlert.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusView.kt
@@ -4,6 +4,7 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
+import androidx.compose.material.CircularProgressIndicator
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -13,22 +14,27 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.tangem.core.ui.components.SpacerH4
+import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemTypography
 import com.tangem.feature.learn2earn.impl.R
 import com.tangem.feature.learn2earn.presentation.ui.component.GradientCircle
+import com.tangem.feature.learn2earn.presentation.ui.state.MainScreenState
 
 /**
 [REDACTED_AUTHOR]
  */
 @Composable
-fun GetBonusAlert(onClick: () -> Unit, modifier: Modifier = Modifier) {
+internal fun GetBonusView(state: MainScreenState, modifier: Modifier = Modifier) {
+    if (!state.isVisible) return
+
     val shape = TangemTheme.shapes.roundedCornersMedium
     Box(
         modifier = modifier
+            .clickable(onClick = state.onClick)
             .height(TangemTheme.dimens.size96)
             .background(
                 color = TangemTheme.colors.background.action,
@@ -40,21 +46,33 @@ fun GetBonusAlert(onClick: () -> Unit, modifier: Modifier = Modifier) {
             modifier = Modifier.fillMaxHeight(),
             verticalAlignment = Alignment.CenterVertically,
         ) {
-            Image(
-                modifier = Modifier.padding(horizontal = TangemTheme.dimens.size16),
-                painter = painterResource(id = R.drawable.img_1inch_logo_42_40),
-                contentDescription = null,
-            )
+            Box(modifier = Modifier.padding(horizontal = TangemTheme.dimens.size16)) {
+                Image(
+                    painter = painterResource(id = R.drawable.img_1inch_logo_42_40),
+                    alpha = state.logoAlphaValue,
+                    contentDescription = null,
+                )
+                if (state.showProgress) {
+                    CircularProgressIndicator(
+                        modifier = Modifier
+                            .align(Alignment.Center)
+                            .size(size = TangemTheme.dimens.size28),
+                        color = Color.White,
+                        strokeWidth = TangemTheme.dimens.size2,
+                    )
+                }
+            }
             Column(
                 modifier = Modifier.padding(end = TangemTheme.dimens.size40),
             ) {
                 Text(
-                    text = stringResource(id = R.string.main_learn_title),
+                    text = state.description.title.resolveReference(),
                     style = TangemTypography.body1,
                     color = TangemTheme.colors.text.primary2,
                 )
+                SpacerH4()
                 Text(
-                    text = stringResource(id = R.string.main_learn_subtitle),
+                    text = state.description.subtitle.resolveReference(),
                     style = TangemTypography.caption,
                     color = TangemTheme.colors.text.secondary,
                 )
@@ -64,8 +82,7 @@ fun GetBonusAlert(onClick: () -> Unit, modifier: Modifier = Modifier) {
             modifier = Modifier
                 .size(TangemTheme.dimens.size40)
                 .padding(end = TangemTheme.dimens.size16)
-                .align(Alignment.CenterEnd)
-                .clickable(onClick = onClick),
+                .align(Alignment.CenterEnd),
             painter = painterResource(id = R.drawable.ic_chevron_right_24),
             contentDescription = null,
             colorFilter = ColorFilter.tint(Color.Gray),
@@ -112,9 +129,7 @@ private fun OneInchStoriesContentPreview_Light() {
     TangemTheme(
         isDark = false,
     ) {
-        GetBonusAlert(
-            onClick = {},
-        )
+        GetBonusView(makePreviewState())
     }
 }
 
@@ -124,8 +139,13 @@ private fun OneInchStoriesContentPreview_Dark() {
     TangemTheme(
         isDark = true,
     ) {
-        GetBonusAlert(
-            onClick = {},
-        )
+        GetBonusView(makePreviewState())
     }
-}
\ No newline at end of file
+}
+
+private fun makePreviewState(): MainScreenState = MainScreenState(
+    isVisible = true,
+    onClick = {},
+    description = MainScreenState.Description.Learn("0"),
+    showProgress = false,
+)
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/Learn2earnDialogs.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/Learn2earnDialogs.kt
new file mode 100644
index 0000000000..2f752ea0fd
--- /dev/null
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/Learn2earnDialogs.kt
@@ -0,0 +1,85 @@
+package com.tangem.feature.learn2earn.presentation.ui
+
+import androidx.compose.material.AlertDialog
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+import com.tangem.core.ui.components.TextButton
+import com.tangem.feature.learn2earn.impl.R
+import com.tangem.feature.learn2earn.presentation.ui.state.MainScreenState
+
+/**
+[REDACTED_AUTHOR]
+ */
+@Composable
+internal fun Learn2earnDialogs(dialog: MainScreenState.Dialog?) {
+    when (dialog) {
+        is MainScreenState.Dialog.Claimed -> ClaimedDialog(dialog)
+        is MainScreenState.Dialog.PromoCodeNotRegistered -> PromoCodeNotRegisteredDialog(dialog)
+        is MainScreenState.Dialog.Error -> ErrorDialog(dialog)
+        else -> Unit
+    }
+}
+
+@Composable
+private fun ClaimedDialog(dialog: MainScreenState.Dialog.Claimed) {
+    AlertDialog(
+        title = {
+            Text(text = stringResource(id = R.string.common_success))
+        },
+        text = {
+            Text(text = stringResource(id = R.string.main_promotion_credited))
+        },
+        confirmButton = {
+            TextButton(
+                text = stringResource(id = R.string.common_ok),
+                onClick = dialog.onOk,
+            )
+        },
+        onDismissRequest = dialog.onDismissRequest,
+    )
+}
+
+@Composable
+private fun PromoCodeNotRegisteredDialog(dialog: MainScreenState.Dialog.PromoCodeNotRegistered) {
+    AlertDialog(
+        title = {
+            Text(text = stringResource(id = R.string.common_error))
+        },
+        text = {
+            Text(text = stringResource(id = R.string.main_promotion_no_purchase))
+        },
+        dismissButton = {
+            TextButton(
+                text = stringResource(id = R.string.common_cancel),
+                onClick = dialog.onCancel,
+            )
+        },
+        confirmButton = {
+            TextButton(
+                text = stringResource(id = R.string.common_buy),
+                onClick = dialog.onOk,
+            )
+        },
+        onDismissRequest = dialog.onDismissRequest,
+    )
+}
+
+@Composable
+private fun ErrorDialog(dialog: MainScreenState.Dialog.Error) {
+    AlertDialog(
+        title = {
+            Text(text = stringResource(id = R.string.common_error))
+        },
+        text = {
+            Text(text = dialog.error.description)
+        },
+        confirmButton = {
+            TextButton(
+                text = stringResource(id = R.string.common_ok),
+                onClick = dialog.onOk,
+            )
+        },
+        onDismissRequest = dialog.onDismissRequest,
+    )
+}
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/Learn2earnMainPageScreen.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/Learn2earnMainPageScreen.kt
new file mode 100644
index 0000000000..e7dceb659e
--- /dev/null
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/Learn2earnMainPageScreen.kt
@@ -0,0 +1,21 @@
+package com.tangem.feature.learn2earn.presentation.ui
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.feature.learn2earn.presentation.Learn2earnViewModel
+
+/**
+[REDACTED_AUTHOR]
+ */
+@Composable
+fun Learn2earnMainPageScreen(viewModel: Learn2earnViewModel, modifier: Modifier = Modifier) {
+    GetBonusView(
+        state = viewModel.uiState.mainScreenState,
+        modifier = modifier
+            .padding(horizontal = TangemTheme.dimens.size16)
+            .padding(vertical = TangemTheme.dimens.size8),
+    )
+    Learn2earnDialogs(viewModel.uiState.mainScreenState.dialog)
+}
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/StoriesScreen.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/Learn2earnStoriesScreen.kt
similarity index 95%
rename from features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/StoriesScreen.kt
rename to features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/Learn2earnStoriesScreen.kt
index 74f3584e6b..0090991f43 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/StoriesScreen.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/Learn2earnStoriesScreen.kt
@@ -24,9 +24,8 @@ import com.tangem.feature.learn2earn.presentation.ui.component.GradientCircle
 /**
 [REDACTED_AUTHOR]
  */
-// TODO: 1inch: make function as internal after adding feature interface
 @Composable
-fun StoriesScreen(onLearnClick: () -> Unit, modifier: Modifier = Modifier) {
+fun Learn2earnStoriesScreen(onLearnClick: () -> Unit, modifier: Modifier = Modifier) {
     Box(modifier = modifier.fillMaxSize()) {
         ContentBackground(
             modifier = Modifier
@@ -111,7 +110,7 @@ private fun OneInchStoriesContentPreview_Light() {
     TangemTheme(
         isDark = false,
     ) {
-        StoriesScreen(
+        Learn2earnStoriesScreen(
             onLearnClick = {},
         )
     }
@@ -123,7 +122,7 @@ private fun OneInchStoriesContentPreview_Dark() {
     TangemTheme(
         isDark = true,
     ) {
-        StoriesScreen(
+        Learn2earnStoriesScreen(
             onLearnClick = {},
         )
     }
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/Learn2earnState.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/Learn2earnState.kt
new file mode 100644
index 0000000000..7e970ee675
--- /dev/null
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/Learn2earnState.kt
@@ -0,0 +1,68 @@
+package com.tangem.feature.learn2earn.presentation.ui.state
+
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.feature.learn2earn.domain.models.PromotionError
+import com.tangem.feature.learn2earn.impl.R
+
+/**
+[REDACTED_AUTHOR]
+ */
+data class Learn2earnState(
+    val storyScreenState: StoryScreenState,
+    val mainScreenState: MainScreenState,
+) {
+    companion object
+}
+
+data class StoryScreenState(
+    val isVisible: Boolean,
+    val onClick: () -> Unit,
+)
+
+data class MainScreenState(
+    val isVisible: Boolean,
+    val onClick: () -> Unit,
+    val description: Description,
+    val showProgress: Boolean,
+    val logoAlphaValue: Float = 1f,
+    val dialog: Dialog? = null,
+) {
+
+    sealed class Description(val title: TextReference, val subtitle: TextReference) {
+
+        class Learn(awardAmount: String) : Description(
+            TextReference.Res(R.string.main_learn_title),
+            TextReference.Res(R.string.main_learn_subtitle, listOf(awardAmount)),
+        )
+
+        object GetBonus : Description(
+            TextReference.Res(R.string.main_get_bonus_title),
+            TextReference.Res(R.string.main_get_bonus_subtitle),
+        )
+    }
+
+    sealed class Dialog {
+
+        data class Claimed(
+            val onOk: () -> Unit,
+            val onDismissRequest: () -> Unit,
+        ) : Dialog()
+
+        data class PromoCodeNotRegistered(
+            val onOk: () -> Unit,
+            val onCancel: () -> Unit,
+            val onDismissRequest: () -> Unit,
+        ) : Dialog()
+
+        data class Error(
+            val error: PromotionError,
+            val onOk: () -> Unit,
+            val onDismissRequest: () -> Unit,
+        ) : Dialog()
+    }
+}
+
+class UiActions(
+    val buttonStoryClick: () -> Unit,
+    val buttonMainClick: () -> Unit,
+)
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt
new file mode 100644
index 0000000000..a0d3929569
--- /dev/null
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt
@@ -0,0 +1,93 @@
+package com.tangem.feature.learn2earn.presentation.ui.state
+
+/**
+[REDACTED_AUTHOR]
+ */
+internal fun Learn2earnState.Companion.init(uiActions: UiActions): Learn2earnState {
+    return Learn2earnState(
+        storyScreenState = StoryScreenState(
+            isVisible = false,
+            onClick = uiActions.buttonStoryClick,
+        ),
+        mainScreenState = MainScreenState(
+            isVisible = false,
+            onClick = uiActions.buttonMainClick,
+            description = MainScreenState.Description.Learn("0"),
+            showProgress = false,
+        ),
+    )
+}
+
+internal fun Learn2earnState.updateStoriesVisibility(isVisible: Boolean): Learn2earnState {
+    return if (storyScreenState.isVisible == isVisible) {
+        this
+    } else {
+        copy(
+            storyScreenState = storyScreenState.copy(
+                isVisible = isVisible,
+            ),
+        )
+    }
+}
+
+internal fun Learn2earnState.updateGetBonusVisibility(isVisible: Boolean): Learn2earnState {
+    return if (mainScreenState.isVisible == isVisible) {
+        this
+    } else {
+        copy(
+            mainScreenState = mainScreenState.copy(
+                isVisible = isVisible,
+            ),
+        )
+    }
+}
+
+internal fun Learn2earnState.changeGetBounsDescription(description: MainScreenState.Description,): Learn2earnState {
+    return if (mainScreenState.description == description) {
+        this
+    } else {
+        copy(
+            mainScreenState = mainScreenState.copy(
+                description = description,
+            ),
+        )
+    }
+}
+
+internal fun Learn2earnState.showDialog(dialog: MainScreenState.Dialog): Learn2earnState {
+    return if (mainScreenState.dialog == dialog) {
+        this
+    } else {
+        copy(
+            mainScreenState = mainScreenState.copy(
+                dialog = dialog,
+            ),
+        )
+    }
+}
+
+internal fun Learn2earnState.hideDialog(): Learn2earnState {
+    return if (mainScreenState.dialog == null) {
+        this
+    } else {
+        copy(
+            mainScreenState = mainScreenState.copy(
+                dialog = null,
+            ),
+        )
+    }
+}
+
+@Suppress("MagicNumber")
+internal fun Learn2earnState.updateProgress(showProgress: Boolean): Learn2earnState {
+    return if (mainScreenState.showProgress == showProgress) {
+        this
+    } else {
+        copy(
+            mainScreenState = mainScreenState.copy(
+                showProgress = showProgress,
+                logoAlphaValue = if (showProgress) 0.2f else 1f,
+            ),
+        )
+    }
+}
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnWebViewActivity.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/webView/Learn2earnWebViewActivity.kt
similarity index 55%
rename from features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnWebViewActivity.kt
rename to features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/webView/Learn2earnWebViewActivity.kt
index c054b21ef0..cea693607e 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnWebViewActivity.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/webView/Learn2earnWebViewActivity.kt
@@ -1,15 +1,11 @@
-package com.tangem.feature.learn2earn.presentation
+package com.tangem.feature.learn2earn.presentation.webView
 
 import android.os.Bundle
 import android.view.MenuItem
-import android.webkit.WebResourceRequest
 import android.webkit.WebView
-import android.webkit.WebViewClient
 import androidx.activity.viewModels
 import androidx.appcompat.app.ActionBar
 import androidx.appcompat.app.AppCompatActivity
-import com.tangem.feature.learn2earn.domain.models.RedirectConsequences
-import com.tangem.feature.learn2earn.domain.models.WebViewHelper
 import com.tangem.feature.learn2earn.impl.R
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -19,7 +15,7 @@ import dagger.hilt.android.AndroidEntryPoint
 @AndroidEntryPoint
 class Learn2earnWebViewActivity : AppCompatActivity() {
 
-    private val learn2earnViewModel by viewModels<Learn2earnViewModel>()
+    private val viewModel by viewModels<WebViewViewModel>()
 
     private lateinit var actionBar: ActionBar
     private lateinit var webView: WebView
@@ -28,24 +24,27 @@ class Learn2earnWebViewActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_web_view)
 
+        val webViewData = viewModel.extractData(intent)
+
         setSupportActionBar(findViewById(R.id.toolbar))
         actionBar = supportActionBar!!
         actionBar.setDisplayHomeAsUpEnabled(true)
         actionBar.setDisplayShowHomeEnabled(true)
-        actionBar.title = learn2earnViewModel.webViewUri.authority
-
+        actionBar.title = webViewData.uri.authority
         webView = findViewById(R.id.web_view)
+
         webView.settings.javaScriptEnabled = true
         webView.settings.domStorageEnabled = true
         webView.settings.loadsImagesAutomatically = true
 
         webView.webViewClient = Learn2earnWebViewClient(
-            helper = learn2earnViewModel,
+            helper = viewModel,
+            headers = webViewData.headers,
             finishSessionHandler = { finish() },
         )
         webView.loadUrl(
-            learn2earnViewModel.webViewUri.toString(),
-            learn2earnViewModel.getWebViewHeaders(),
+            webViewData.uri.toString(),
+            webViewData.headers,
         )
     }
 
@@ -66,25 +65,9 @@ class Learn2earnWebViewActivity : AppCompatActivity() {
 
         super.onDestroy()
     }
-}
 
-private class Learn2earnWebViewClient(
-    private val helper: WebViewHelper,
-    private val finishSessionHandler: () -> Unit,
-) : WebViewClient() {
-
-    override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean {
-        when (helper.handleWebViewRedirect(request.url)) {
-            RedirectConsequences.NOTHING -> Unit
-            RedirectConsequences.PROCEED -> {
-                val headers = helper.getWebViewHeaders().toMutableMap()
-                request.requestHeaders?.let { headers.putAll(it) }
-                view.loadUrl(request.url.toString(), headers)
-            }
-            RedirectConsequences.FINISH_SESSION -> {
-                finishSessionHandler.invoke()
-            }
-        }
-        return true
+    companion object {
+        const val EXTRA_WEB_URI = "webViewUri"
+        const val EXTRA_WEB_HEADERS = "webViewHeaders"
     }
 }
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/webView/Learn2earnWebViewClient.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/webView/Learn2earnWebViewClient.kt
new file mode 100644
index 0000000000..5957d80a32
--- /dev/null
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/webView/Learn2earnWebViewClient.kt
@@ -0,0 +1,31 @@
+package com.tangem.feature.learn2earn.presentation.webView
+
+import android.webkit.WebResourceRequest
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import com.tangem.feature.learn2earn.domain.api.RedirectConsequences
+import com.tangem.feature.learn2earn.domain.api.WebViewRedirectHandler
+import timber.log.Timber
+
+internal class Learn2earnWebViewClient(
+    private val helper: WebViewRedirectHandler,
+    private val headers: Map<String, String>,
+    private val finishSessionHandler: () -> Unit,
+) : WebViewClient() {
+
+    override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean {
+        Timber.d("url: ${request.url}")
+        when (helper.handleRedirect(request.url)) {
+            RedirectConsequences.PROCEED -> {
+                val mergedHeaders = headers.toMutableMap()
+                request.requestHeaders?.let { mergedHeaders.putAll(it) }
+                view.loadUrl(request.url.toString(), mergedHeaders)
+            }
+            RedirectConsequences.FINISH_SESSION -> {
+                finishSessionHandler.invoke()
+            }
+            else -> Unit
+        }
+        return true
+    }
+}
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/webView/WebViewViewModel.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/webView/WebViewViewModel.kt
new file mode 100644
index 0000000000..3c473657de
--- /dev/null
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/webView/WebViewViewModel.kt
@@ -0,0 +1,38 @@
+package com.tangem.feature.learn2earn.presentation.webView
+
+import android.content.Intent
+import android.net.Uri
+import androidx.lifecycle.ViewModel
+import com.tangem.feature.learn2earn.domain.HeadersConverter
+import com.tangem.feature.learn2earn.domain.api.RedirectConsequences
+import com.tangem.feature.learn2earn.domain.api.WebViewRedirectHandler
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+/**
+[REDACTED_AUTHOR]
+ */
+@HiltViewModel
+class WebViewViewModel @Inject constructor(
+    private val handler: WebViewRedirectHandler,
+) : ViewModel(), WebViewRedirectHandler {
+
+    override fun handleRedirect(uri: Uri): RedirectConsequences {
+        return handler.handleRedirect(uri)
+    }
+
+    fun extractData(intent: Intent): WebViewData {
+        val uriString = intent.getStringExtra(Learn2earnWebViewActivity.EXTRA_WEB_URI)!!
+        val rawHeaders = intent.getStringArrayListExtra(Learn2earnWebViewActivity.EXTRA_WEB_HEADERS) ?: ArrayList()
+
+        return WebViewData(
+            uri = Uri.parse(uriString),
+            headers = HeadersConverter().convertBack(rawHeaders),
+        )
+    }
+}
+
+data class WebViewData(
+    val uri: Uri,
+    val headers: Map<String, String>,
+)
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/res/layout/activity_web_view.xml b/features/learn2earn/impl/src/main/res/layout/activity_web_view.xml
index 46968b0a14..d4020201c8 100644
--- a/features/learn2earn/impl/src/main/res/layout/activity_web_view.xml
+++ b/features/learn2earn/impl/src/main/res/layout/activity_web_view.xml
@@ -10,6 +10,7 @@
         android:id="@+id/app_bar"
         style="@style/Widget.MaterialComponents.Toolbar.Surface"
         android:layout_width="match_parent"
+        app:liftOnScroll="true"
         android:layout_height="wrap_content">
 
         <com.google.android.material.appbar.MaterialToolbar

From 5841bc65f436380faf6625d19078cbd7fa1c2014 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 26 Jun 2023 20:02:31 +0300
Subject: [PATCH 09/21] Updated on 2026-08-14

---
 app/src/main/AndroidManifest.xml              |  6 ++---
 .../java/com/tangem/tap/TapApplication.kt     |  9 +++++++
 .../tangem/tap/features/home/HomeFragment.kt  | 12 ++++-----
 .../features/home/compose/StoriesScreen.kt    | 11 +++++---
 .../tap/features/wallet/ui/WalletFragment.kt  | 25 +++++++++++++++++++
 app/src/main/res/layout/fragment_wallet.xml   |  9 +++----
 .../core/ui/extensions/TextReference.kt       |  5 ++++
 .../domain/DefaultLearn2earnInteractor.kt     |  7 +++---
 .../domain/api/Learn2earnInteractor.kt        |  2 +-
 .../presentation/Learn2earnViewModel.kt       |  3 ++-
 .../presentation/ui/GetBonusView.kt           |  2 +-
 .../presentation/ui/state/Learn2earnState.kt  |  5 ++--
 .../presentation/ui/state/StateBuilder.kt     |  2 +-
 13 files changed, 68 insertions(+), 30 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7b6142a534..7185ff029d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -138,9 +138,9 @@
             android:name="com.tangem.tap.features.sprinklr.ui.SprinklrActivity"
             android:theme="@style/AppTheme" />
 
-        <activity android:name="com.tangem.feature.learn2earn.presentation.Learn2earnWebViewActivity"/>
-
-        <activity android:name="com.tangem.feature.learn2earn.presentation.Learn2earnWebViewActivity"/>
+        <activity
+            android:name="com.tangem.feature.learn2earn.presentation.webView.Learn2earnWebViewActivity"
+            android:theme="@style/Theme.MaterialComponents.Light.NoActionBar" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
diff --git a/app/src/main/java/com/tangem/tap/TapApplication.kt b/app/src/main/java/com/tangem/tap/TapApplication.kt
index acc39a41db..a2868e27e4 100644
--- a/app/src/main/java/com/tangem/tap/TapApplication.kt
+++ b/app/src/main/java/com/tangem/tap/TapApplication.kt
@@ -3,6 +3,7 @@ package com.tangem.tap
 import android.app.Application
 import android.content.Context
 import android.content.pm.PackageManager
+import androidx.compose.ui.text.intl.Locale
 import coil.ImageLoader
 import coil.ImageLoaderFactory
 import com.tangem.Log
@@ -245,6 +246,7 @@ class TapApplication : Application(), ImageLoaderFactory {
         shopService = TangemShopService(this, config.shopify!!)
         initAnalytics(this, config)
         initFeedbackManager(this, preferencesStorage, foregroundActivityObserver, store)
+        learn2earnSetupAdditionalDependencies(config)
     }
 
     private fun initAnalytics(application: Application, config: Config) {
@@ -307,6 +309,13 @@ class TapApplication : Application(), ImageLoaderFactory {
         store.dispatch(GlobalAction.SetFeedbackManager(feedbackManager))
     }
 
+    private fun learn2earnSetupAdditionalDependencies(config: Config) {
+        learn2ernInteractor.setupDependencies(
+            authCredentials = config.tangemComAuthorization,
+            countryCodeProvider = { store.state.globalState.userCountryCode ?: Locale.current.language },
+        )
+    }
+
     private fun initWarningMessagesManager() {
         store.dispatch(GlobalAction.SetWarningManager(WarningMessagesManager()))
     }
diff --git a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt
index 591f7b6369..57598aa099 100644
--- a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt
@@ -12,7 +12,7 @@ import androidx.compose.ui.platform.ComposeView
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.viewModels
+import androidx.fragment.app.activityViewModels
 import com.tangem.core.analytics.Analytics
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.feature.learn2earn.presentation.Learn2earnViewModel
@@ -33,13 +33,13 @@ class HomeFragment : Fragment(), StoreSubscriber<HomeState> {
 
     private var homeState: MutableState<HomeState> = mutableStateOf(store.state.homeState)
 
-    private val learn2earnViewModel by viewModels<Learn2earnViewModel>()
+    private val learn2earnViewModel by activityViewModels<Learn2earnViewModel>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         store.dispatch(HomeAction.OnCreate)
         store.dispatch(HomeAction.Init)
-        if (learn2earnViewModel.isNeedToShowViewOnStoriesScreen()) {
+        if (learn2earnViewModel.uiState.storyScreenState.isVisible) {
             store.dispatch(HomeAction.InsertStory(position = 0, Stories.OneInchPromo))
             // re init homeState after inserting learn2earn story
             homeState = mutableStateOf(store.state.homeState)
@@ -90,10 +90,8 @@ class HomeFragment : Fragment(), StoreSubscriber<HomeState> {
     @Composable
     private fun ScreenContent() {
         StoriesScreen(
-            homeState,
-            onLearn2earnClick = {
-                learn2earnViewModel.onStoriesClick()
-            },
+            homeState = homeState,
+            onLearn2earnClick = learn2earnViewModel.uiState.storyScreenState.onClick,
             onScanButtonClick = {
                 Analytics.send(IntroductionProcess.ButtonScanCard())
                 store.dispatch(HomeAction.ReadCard())
diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/StoriesScreen.kt b/app/src/main/java/com/tangem/tap/features/home/compose/StoriesScreen.kt
index 46ef676001..fa3e832436 100644
--- a/app/src/main/java/com/tangem/tap/features/home/compose/StoriesScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/compose/StoriesScreen.kt
@@ -26,7 +26,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import com.tangem.core.ui.res.TangemTheme
-import com.tangem.feature.learn2earn.presentation.ui.StoriesScreen
+import com.tangem.feature.learn2earn.presentation.ui.Learn2earnStoriesScreen
 import com.tangem.tap.features.home.compose.content.*
 import com.tangem.tap.features.home.compose.views.HomeButtons
 import com.tangem.tap.features.home.compose.views.StoriesProgressBar
@@ -54,8 +54,11 @@ fun StoriesScreen(
         currentStory = state.stories[max(0, currentStep() - 1)]
     }
     val goToNextScreen = {
-        currentStory =
-            if (currentStep() < state.stories.lastIndex) state.stories[currentStep() + 1] else state.firstStory
+        currentStory = if (currentStep() < state.stories.lastIndex) {
+            state.stories[currentStep() + 1]
+        } else {
+            state.firstStory
+        }
     }
 
     val isPressed = remember { mutableStateOf(false) }
@@ -153,7 +156,7 @@ fun StoriesScreen(
                 colorFilter = if (currentStory.isDarkBackground) null else ColorFilter.tint(Color.Black),
             )
             when (currentStory) {
-                Stories.OneInchPromo -> StoriesScreen(onLearn2earnClick)
+                Stories.OneInchPromo -> Learn2earnStoriesScreen(onLearn2earnClick)
                 Stories.TangemIntro -> FirstStoriesContent(isPaused, currentStory.duration) { hideContent.value = it }
                 Stories.RevolutionaryWallet -> StoriesRevolutionaryWallet(currentStory.duration)
                 Stories.UltraSecureBackup -> StoriesUltraSecureBackup(isPaused, currentStory.duration)
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
index 47d07b91b0..ee946fe068 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
@@ -8,7 +8,9 @@ import android.view.View
 import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.flowWithLifecycle
@@ -22,12 +24,16 @@ import coil.size.Scale
 import com.badoo.mvicore.modelWatcher
 import com.tangem.core.analytics.Analytics
 import com.tangem.core.ui.fragments.setStatusBarColor
+import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.utils.OneTouchClickListener
 import com.tangem.datasource.connection.NetworkConnectionManager
+import com.tangem.feature.learn2earn.presentation.Learn2earnViewModel
+import com.tangem.feature.learn2earn.presentation.ui.Learn2earnMainPageScreen
 import com.tangem.feature.swap.api.SwapFeatureToggleManager
 import com.tangem.feature.swap.domain.SwapInteractor
 import com.tangem.tap.MainActivity
 import com.tangem.tap.common.analytics.events.Portfolio
+import com.tangem.tap.common.extensions.beginDelayedTransition
 import com.tangem.tap.common.extensions.show
 import com.tangem.tap.common.recyclerView.SpaceItemDecoration
 import com.tangem.tap.common.redux.global.GlobalAction
@@ -73,6 +79,7 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), SafeStoreSubscriber<W
 
     private var walletView: WalletView = MultiWalletView()
 
+    private val learn2earnViewModel by activityViewModels<Learn2earnViewModel>()
     private val viewModel by viewModels<WalletViewModel>()
 
     private val totalBalanceWatcher = modelWatcher {
@@ -102,6 +109,7 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), SafeStoreSubscriber<W
         val inflater = TransitionInflater.from(requireContext())
         enterTransition = inflater.inflateTransition(R.transition.slide_right)
         exitTransition = inflater.inflateTransition(R.transition.fade)
+        learn2earnViewModel.onMainScreenCreated()
     }
 
     override fun onStart() {
@@ -199,6 +207,23 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), SafeStoreSubscriber<W
         binding.toolbar.setNavigationIcon(
             if (state.canSaveUserWallets) R.drawable.ic_wallet_24 else R.drawable.ic_tap_card_24,
         )
+
+        showLearn2earnView()
+    }
+
+    private fun showLearn2earnView() {
+        val isShowing = learn2earnViewModel.uiState.mainScreenState.isVisible
+        if (!isShowing) return
+
+        binding.composeLearnToEarnContainer.show(true) { binding.llWarnings.beginDelayedTransition() }
+        binding.composeLearnToEarnContainer.apply {
+            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+            setContent {
+                TangemTheme {
+                    Learn2earnMainPageScreen(learn2earnViewModel)
+                }
+            }
+        }
     }
 
     private fun setupPullToRefreshLayout(state: WalletState) {
diff --git a/app/src/main/res/layout/fragment_wallet.xml b/app/src/main/res/layout/fragment_wallet.xml
index ac04bb12dd..22df751c87 100644
--- a/app/src/main/res/layout/fragment_wallet.xml
+++ b/app/src/main/res/layout/fragment_wallet.xml
@@ -113,14 +113,11 @@
                     android:paddingTop="8dp"
                     app:layout_constraintTop_toBottomOf="@id/rv_warning_messages">
 
-                    <FrameLayout
-                        android:id="@+id/fl_learn_to_earn_container"
+                    <androidx.compose.ui.platform.ComposeView
+                        android:id="@+id/compose_learn_to_earn_container"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginTop="8dp"
-                        android:layout_marginEnd="16dp"
-                        android:layout_marginBottom="8dp" />
+                        android:visibility="gone" />
 
                     <include
                         android:id="@+id/l_wallet_rescan_warning"
diff --git a/core/ui/src/main/java/com/tangem/core/ui/extensions/TextReference.kt b/core/ui/src/main/java/com/tangem/core/ui/extensions/TextReference.kt
index a27dcb58c4..92df3daeb9 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/extensions/TextReference.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/extensions/TextReference.kt
@@ -1,9 +1,11 @@
 package com.tangem.core.ui.extensions
 
+import androidx.annotation.PluralsRes
 import androidx.annotation.StringRes
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.ReadOnlyComposable
+import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringResource
 
 /**
@@ -24,6 +26,8 @@ sealed interface TextReference {
      */
     data class Res(@StringRes val id: Int, val formatArgs: WrappedList<Any> = WrappedList(emptyList())) : TextReference
 
+    data class PluralRes(@PluralsRes val id: Int, val count: Int, val formatArgs: WrappedList<Any>) : TextReference
+
     /**
      * Text string
      *
@@ -38,6 +42,7 @@ sealed interface TextReference {
 fun TextReference.resolveReference(): String {
     return when (this) {
         is TextReference.Res -> stringResource(id, *formatArgs.toTypedArray())
+        is TextReference.PluralRes -> pluralStringResource(id, count, *formatArgs.toTypedArray())
         is TextReference.Str -> value
     }
 }
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt
index 36ef5522e9..8ba760e9f9 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt
@@ -15,7 +15,6 @@ import com.tangem.feature.learn2earn.domain.models.toDomainError
 import com.tangem.lib.crypto.DerivationManager
 import com.tangem.lib.crypto.UserWalletManager
 import com.tangem.lib.crypto.models.Currency
-import java.text.DecimalFormat
 
 /**
 [REDACTED_AUTHOR]
@@ -62,7 +61,7 @@ class DefaultLearn2earnInteractor(
         return repository.getUserData().isRegisteredInPromotion
     }
 
-    override fun getAwardAmount(): String {
+    override fun getAwardAmount(): Pair<Int, String> {
         val userInfo = repository.getUserData()
         val promotionInfo = promotion.getPromotionInfo()
 
@@ -70,9 +69,9 @@ class DefaultLearn2earnInteractor(
             promotionInfo.awardForOldCard
         } else {
             promotionInfo.awardForNewCard
-        }
+        }.toInt()
 
-        return DecimalFormat("0.#").format(awardAmount)
+        return awardAmount to awardAmount.toString()
     }
 
     @Throws(IllegalArgumentException::class)
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/Learn2earnInteractor.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/Learn2earnInteractor.kt
index 5c35867c68..1121665973 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/Learn2earnInteractor.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/Learn2earnInteractor.kt
@@ -21,7 +21,7 @@ interface Learn2earnInteractor : WebViewRedirectHandler {
 
     fun isUserRegisteredInPromotion(): Boolean
 
-    fun getAwardAmount(): String
+    fun getAwardAmount(): Pair<Int, String>
 
     @Throws(IllegalArgumentException::class)
     suspend fun requestAward(): Result<Unit>
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnViewModel.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnViewModel.kt
index 8cd6e4536c..7f65afe887 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnViewModel.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnViewModel.kt
@@ -109,7 +109,8 @@ class Learn2earnViewModel @Inject constructor(
         return if (interactor.isUserRegisteredInPromotion()) {
             MainScreenState.Description.GetBonus
         } else {
-            MainScreenState.Description.Learn(interactor.getAwardAmount())
+            val (count, award) = interactor.getAwardAmount()
+            MainScreenState.Description.Learn(count, award)
         }
     }
 
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusView.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusView.kt
index 25cd356f7d..25a1a5d158 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusView.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusView.kt
@@ -146,6 +146,6 @@ private fun OneInchStoriesContentPreview_Dark() {
 private fun makePreviewState(): MainScreenState = MainScreenState(
     isVisible = true,
     onClick = {},
-    description = MainScreenState.Description.Learn("0"),
+    description = MainScreenState.Description.Learn(0, "0"),
     showProgress = false,
 )
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/Learn2earnState.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/Learn2earnState.kt
index 7e970ee675..f78993a14f 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/Learn2earnState.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/Learn2earnState.kt
@@ -1,6 +1,7 @@
 package com.tangem.feature.learn2earn.presentation.ui.state
 
 import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.WrappedList
 import com.tangem.feature.learn2earn.domain.models.PromotionError
 import com.tangem.feature.learn2earn.impl.R
 
@@ -30,9 +31,9 @@ data class MainScreenState(
 
     sealed class Description(val title: TextReference, val subtitle: TextReference) {
 
-        class Learn(awardAmount: String) : Description(
+        class Learn(count: Int, award: String) : Description(
             TextReference.Res(R.string.main_learn_title),
-            TextReference.Res(R.string.main_learn_subtitle, listOf(awardAmount)),
+            TextReference.PluralRes(R.plurals.main_learn_subtitle, count, WrappedList(listOf(award))),
         )
 
         object GetBonus : Description(
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt
index a0d3929569..0e2e14251c 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt
@@ -12,7 +12,7 @@ internal fun Learn2earnState.Companion.init(uiActions: UiActions): Learn2earnSta
         mainScreenState = MainScreenState(
             isVisible = false,
             onClick = uiActions.buttonMainClick,
-            description = MainScreenState.Description.Learn("0"),
+            description = MainScreenState.Description.Learn(0, "0"),
             showProgress = false,
         ),
     )

From a4e960106e71c4394e45b4d6bb557dd5efb39ed3 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 26 Jun 2023 20:28:52 +0300
Subject: [PATCH 10/21] Updated on 2026-08-14

---
 .../main/res/layout/dialog_wallet_trade.xml   |  4 +-
 app/src/main/res/layout/fragment_send.xml     |  4 +-
 .../view_wallet_details_buttons_row.xml       |  6 +-
 core/res/src/main/res/values-ru/strings.xml   | 60 ++++++++-----------
 .../src/main/res/values-zh-rTW/strings.xml    | 31 +---------
 core/res/src/main/res/values/strings.xml      | 55 +++++++----------
 6 files changed, 54 insertions(+), 106 deletions(-)

diff --git a/app/src/main/res/layout/dialog_wallet_trade.xml b/app/src/main/res/layout/dialog_wallet_trade.xml
index b2e6a5e45b..dea867e05a 100644
--- a/app/src/main/res/layout/dialog_wallet_trade.xml
+++ b/app/src/main/res/layout/dialog_wallet_trade.xml
@@ -23,7 +23,7 @@
         android:focusable="true"
         android:gravity="center_vertical"
         android:padding="16dp"
-        android:text="@string/wallet_button_buy"
+        android:text="@string/common_buy"
         android:textColor="@color/darkGray3"
         android:textSize="14sp"
         android:textStyle="bold"
@@ -38,7 +38,7 @@
         android:focusable="true"
         android:gravity="center_vertical"
         android:padding="16dp"
-        android:text="@string/wallet_button_sell"
+        android:text="@string/common_sell"
         android:textColor="@color/darkGray3"
         android:textSize="14sp"
         android:textStyle="bold"
diff --git a/app/src/main/res/layout/fragment_send.xml b/app/src/main/res/layout/fragment_send.xml
index fe0eebf2a3..8ebe4b5488 100644
--- a/app/src/main/res/layout/fragment_send.xml
+++ b/app/src/main/res/layout/fragment_send.xml
@@ -22,7 +22,7 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             app:navigationIcon="@drawable/ic_baseline_arrow_back_24"
-            app:title="@string/send_title" />
+            app:title="@string/common_send" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -115,7 +115,7 @@
                         style="@style/TapPrimaryIconButton"
                         android:layout_width="match_parent"
                         android:fontFamily="@font/saira_semi_condensed_regular"
-                        android:text="@string/send_title"
+                        android:text="@string/common_send"
                         app:icon="@drawable/ic_arrow_right" />
 
                     <ProgressBar
diff --git a/app/src/main/res/layout/view_wallet_details_buttons_row.xml b/app/src/main/res/layout/view_wallet_details_buttons_row.xml
index 3a46e5177a..6397189d73 100644
--- a/app/src/main/res/layout/view_wallet_details_buttons_row.xml
+++ b/app/src/main/res/layout/view_wallet_details_buttons_row.xml
@@ -25,14 +25,14 @@
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_buy"
             style="@style/TapPrimaryIconButton"
-            android:text="@string/wallet_button_buy"
+            android:text="@string/common_buy"
             android:visibility="gone"
             app:icon="@drawable/ic_arrow_up" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_sell"
             style="@style/TapPrimaryIconButton"
-            android:text="@string/wallet_button_sell"
+            android:text="@string/common_sell"
             android:visibility="gone"
             app:icon="@drawable/ic_arrow_down" />
 
@@ -51,7 +51,7 @@
         style="@style/TapPrimaryIconButton"
         android:layout_width="0dp"
         android:layout_weight="1"
-        android:text="@string/wallet_button_send"
+        android:text="@string/common_send"
         app:icon="@drawable/ic_send" />
 
 </merge>
diff --git a/core/res/src/main/res/values-ru/strings.xml b/core/res/src/main/res/values-ru/strings.xml
index f2b6457174..6c3dddbebf 100644
--- a/core/res/src/main/res/values-ru/strings.xml
+++ b/core/res/src/main/res/values-ru/strings.xml
@@ -39,7 +39,7 @@
     <string name="card_settings_access_code_recovery_title">Восстановление кода доступа</string>
     <string name="card_settings_change_access_code">Смена кода доступа</string>
     <string name="card_settings_change_access_code_footer">Код доступа будет изменен только на данной карте</string>
-    <string name="card_settings_reset_card_to_factory">Сброс к заводским настройкам</string>
+    <string name="card_settings_reset_card_to_factory">Заводские настройки</string>
     <string name="card_settings_security_mode">Тип безопасности</string>
     <string name="card_settings_title">Настройки карты</string>
     <string name="chat_bot_name">Tangem Bot</string>
@@ -66,13 +66,17 @@
     <string name="common_enable">Включить</string>
     <string name="common_enabled">Включено</string>
     <string name="common_exchange">Обменять</string>
+    <string name="common_explore_transaction_history">Посмотреть историю транзакций</string>
+    <string name="common_explorer">Обозреватель</string>
     <string name="common_like">Нравится</string>
+    <string name="common_main_network">Основная сеть</string>
     <string name="common_no">Нет</string>
     <string name="common_no_data">Нет данных</string>
-    <string name="common_ok">Ок</string>
+    <string name="common_ok">OK</string>
     <string name="common_origin_card">Основная карта</string>
     <string name="common_receive">Получить</string>
     <string name="common_reject">Отклонить</string>
+    <string name="common_reload">Перезагрузить</string>
     <string name="common_save_changes">Сохранить изменения</string>
     <string name="common_search">Искать</string>
     <string name="common_seed_phrase">Секретная фраза</string>
@@ -156,11 +160,22 @@
     <string name="initial_message_tap_header">Приложите карту</string>
     <string name="internal_error_wallet_manager_not_found">Внутренняя ошибка: не удается найти менеджер кошельков</string>
     <string name="key_invalidated_warning_description">Вы обновили данные биометрии, отсканируйте свою карту для входа</string>
+    <string name="main_get_bonus_subtitle">Вы завершили обучение и можете получить свои токены 1inch</string>
+    <string name="main_get_bonus_title">Получите бонус</string>
+    <plurals name="main_learn_subtitle">
+        <item quantity="one">Пройдите обучение и получите %d токен 1inch на свой кошелек</item>
+        <item quantity="few">Пройдите обучение и получите %d токена 1inch на свой кошелек</item>
+        <item quantity="many">Пройдите обучение и получите %d токена 1inch на свой кошелек</item>
+        <item quantity="other">Пройдите обучение и получите %d токенов 1inch на свой кошелек</item>
+    </plurals>
+    <string name="main_learn_title">Бонус за обучение</string>
     <string name="main_manage_tokens">Управление токенами</string>
     <string name="main_no_backup_warning_subtitle">Чтобы защитить свои активы, мы советуем вам выполнить эту процедуру</string>
     <string name="main_no_backup_warning_title">Бэкап кошелька не был произведен</string>
     <string name="main_page_balance">Баланс</string>
     <string name="main_processing_full_amount">В сумме учтены не все монеты</string>
+    <string name="main_promotion_credited">Токены 1inch будут зачислены на адрес вашего кошелька в течение 2 дней</string>
+    <string name="main_promotion_no_purchase">По вашему промокоду не было покупки кошелька, а значит вы не можете получить бонус. Купите кошелек Tangem, отсканируйте его в приложении и получите бонус.</string>
     <string name="main_scan_card_warning_view_subtitle">Чтобы получить доступ ко всем сетям, вам необходимо отсканировать карту</string>
     <string name="main_scan_card_warning_view_title">Отсканируйте карту</string>
     <string name="onboarding_access_code_feature_1_description">Вам необходимо установить единый код доступа для защиты всех ваших карт</string>
@@ -184,11 +199,8 @@
     <string name="onboarding_button_claim">Запросить</string>
     <string name="onboarding_button_continue_wallet">Перейти к моему кошельку</string>
     <string name="onboarding_button_finalize_backup">Завершение бэкапа</string>
-    <string name="onboarding_button_kyc_start">Верифицировать (Utorg)</string>
-    <string name="onboarding_button_kyc_waiting">Обновить</string>
     <string name="onboarding_button_pin">Установить Код доступа</string>
     <string name="onboarding_button_receive_crypto">Получить криптовалюту</string>
-    <string name="onboarding_button_register_wallet">Зарегистрироваться</string>
     <string name="onboarding_button_scan_origin_card">Сканировать основную карту</string>
     <string name="onboarding_button_skip_backup">Пропустить</string>
     <string name="onboarding_button_what_does_it_mean">Как это работает?</string>
@@ -203,19 +215,9 @@
     <string name="onboarding_exit_alert_message">В этом случае вам будет необходимо начать процесс заново.</string>
     <string name="onboarding_exit_alert_title">Вы хотите выйти из процесса активации?</string>
     <string name="onboarding_getting_started">Подготовка</string>
-    <string name="onboarding_linking_error_card_with_wallets">Другой кошелек уже был создан на карте, которую вы пытаетесь добавить. Хотите сбросить его и использовать карту для бэкапа?</string>
-    <string name="onboarding_navbar_kyc_progress">Подтвердите свою личность</string>
-    <string name="onboarding_navbar_kyc_start">Верификация клиента</string>
     <string name="onboarding_navbar_pin">Код доступа</string>
     <string name="onboarding_navbar_register_wallet">Подключиться</string>
     <string name="onboarding_navbar_title_creating_backup">Резервная копия</string>
-    <string name="onboarding_saltpay_button_backup_origin">Приложите SaltPay карту</string>
-    <string name="onboarding_saltpay_subtitle_no_backup_cards">Для начала процесса бэкапа вам необходимо добавить Tangem карту</string>
-    <string name="onboarding_saltpay_subtitle_one_backup_card">Завершите процесс бэкапа создав код доступа</string>
-    <string name="onboarding_saltpay_title_backup_card">Приложите Tangem карту</string>
-    <string name="onboarding_saltpay_title_no_backup_card">Бэкап карта не добавлена</string>
-    <string name="onboarding_saltpay_title_one_backup_card">Бэкап карта создана</string>
-    <string name="onboarding_saltpay_title_prepare_origin">Приготовьте SaltPay карту</string>
     <string name="onboarding_seed_button_read_more">Читать про секретную фразу</string>
     <string name="onboarding_seed_generate_message">Запишите эти 12 слов в порядке, указанном ниже, и сохраните их в надежном месте.</string>
     <string name="onboarding_seed_generate_title">Ваша секретная фраза</string>
@@ -231,13 +233,8 @@
     <string name="onboarding_seed_user_validation_title">Итак, проверим</string>
     <string name="onboarding_subtitle_claim">Для начала работы просто запросите начисление wxDAI на свой кошелек</string>
     <string name="onboarding_subtitle_claim_progress">Это займет несколько секунд</string>
-    <string name="onboarding_subtitle_kyc_retry">Более подробная информация отправлена на ваш адрес электронной почты.</string>
-    <string name="onboarding_subtitle_kyc_start">Для начала работы с картой вам необходимо завершить процесс подтверждения личности</string>
-    <string name="onboarding_subtitle_kyc_waiting">Пожалуйста дождитесь завершения процесса подтверждения личности. Вы будете уведомлены через e-mail. Обычно это занимает не более часа. Вы можете закрыть приложение и вернуться позже.</string>
     <string name="onboarding_subtitle_no_backup_cards">Чтобы начать процесс резервного копирования, добавьте одну или две резервные карты.</string>
     <string name="onboarding_subtitle_one_backup_card">Вы можете добавить еще одну карту или завершить процесс резервного копирования</string>
-    <string name="onboarding_subtitle_pin">Установите 4-х значный код.\nОн будет использован для платежей.</string>
-    <string name="onboarding_subtitle_register_wallet">Подключите вашу карту к децентрализованной платежной системе</string>
     <string name="onboarding_subtitle_scan_backup_card_format">Подготовьте резервную карту с номером %s</string>
     <string name="onboarding_subtitle_scan_origin_card">Подготовьте основную карту</string>
     <string name="onboarding_subtitle_scan_primary_card_format">Подготовьте основную карту с номером %s</string>
@@ -248,13 +245,9 @@
     <string name="onboarding_title_backup_card_format">Резервная карта #%d</string>
     <string name="onboarding_title_claim">Запросить %s</string>
     <string name="onboarding_title_claim_progress">Запрашивается</string>
-    <string name="onboarding_title_kyc_retry">Что-то пошло не так</string>
-    <string name="onboarding_title_kyc_start">Подтвердите свою личность</string>
-    <string name="onboarding_title_kyc_waiting">Подтверждение личности в процессе</string>
     <string name="onboarding_title_no_backup_cards">Нет резервных карт</string>
     <string name="onboarding_title_one_backup_card">Добавлена ​​одна резервная карта</string>
     <string name="onboarding_title_pin">Код доступа</string>
-    <string name="onboarding_title_register_wallet">Подключите свою карту</string>
     <string name="onboarding_title_scan_origin_card">Подготовьте свою карту</string>
     <string name="onboarding_title_two_backup_cards">Добавлены две резервные карты</string>
     <string name="onboarding_top_up_body">Пополните кошелек на любую сумму, чтобы начать пользоваться картой</string>
@@ -275,6 +268,9 @@
     <string name="organize_tokens_group">Группировка</string>
     <string name="organize_tokens_sort_by_balance">По балансу</string>
     <string name="organize_tokens_title">Сортировка токенов</string>
+    <string name="organize_tokens_ungroup">Разгруппировать</string>
+    <string name="receive_bottom_sheet_title">%1$s %2$s адрес в сети %3$s</string>
+    <string name="receive_bottom_sheet_warning_message">%1$s (%2$s) в сети %3$s</string>
     <string name="referral_button_participate">Участвовать</string>
     <string name="referral_error_failed_to_load_info">Не удалось загрузить информацию по реферальной программе. Пожалуйста, попробуйте позже.</string>
     <string name="referral_error_failed_to_load_info_with_reason">Не удалось загрузить информацию по реферальной программе. Код ошибки: %s. Пожалуйста, попробуйте позже.</string>
@@ -306,12 +302,6 @@
     <string name="reset_card_without_backup_to_factory_message">Сброс к заводским настройкам приведет к полному удалению кошелька с выбранной карты. Вы не сможете восстановить текущий кошелек.</string>
     <string name="russian_bank_card_warning_subtitle">У вас есть карта банка другой страны или платежной системы UnionPay?</string>
     <string name="russian_bank_card_warning_title">Карты банков РФ в данный момент не принимаются</string>
-    <string name="saltpay_error_empty_backup_message">Приложите карту с логотипом Visa</string>
-    <string name="saltpay_error_empty_backup_title">Внимание</string>
-    <string name="saltpay_error_no_gas_message">Пожалуйста обратитесь в службу поддержки</string>
-    <string name="saltpay_error_no_gas_title">Недостаточно средств для активации</string>
-    <string name="saltpay_error_pin_weak_message">Данный Код доступа может быть легко взломан</string>
-    <string name="saltpay_error_pin_weak_title">Ввод одинаковых цифр является не безопасным</string>
     <string name="save_user_wallet_agreement_access_description">Войдите в приложение и следите за своим балансом без сканирования карты</string>
     <string name="save_user_wallet_agreement_access_title">Доступ в приложение</string>
     <string name="save_user_wallet_agreement_allow_biometrics">Использовать биометрию</string>
@@ -344,7 +334,6 @@
     <string name="send_fee_picker_priority">Приоритетная</string>
     <string name="send_max_amount_label">Максимальная сумма</string>
     <string name="send_network_fee_title">Сетевая комиссия</string>
-    <string name="send_title">Отправить</string>
     <string name="send_title_currency_format">Отправка %s</string>
     <string name="send_total_label">Всего</string>
     <string name="send_total_subtitle_asset_format">%1$s и %2$s будет отправлено</string>
@@ -361,6 +350,7 @@
     <string name="solana_rent_warning">Сеть Solana взимает арендную плату в размере %1$s каждые 2 дня. Аккаунты, которые не могут позволить себе арендную плату, удаляются из сети. Пополните свой счет более чем на %2$s, чтобы не платить арендную плату.</string>
     <string name="story_awe_description">Держите свои криптосбережения в безопасности. Приватные ключи надежно хранятся на карте.</string>
     <string name="story_awe_title">Революционный аппаратный кошелек</string>
+    <string name="story_backup_description">До **трех карт** с одним кошельком</string>
     <string name="story_backup_description_1">До</string>
     <string name="story_backup_description_2_bold">трех карт</string>
     <string name="story_backup_description_3">с одним кошельком</string>
@@ -369,6 +359,9 @@
     <string name="story_currencies_title">Тысячи криптовалют</string>
     <string name="story_finish_description">Используйте его на ходу, в любом месте, в любое время. Без проводов и батареек. Как только понадобится крипта, просто приложите карту к телефону.</string>
     <string name="story_finish_title">Кошелек для каждого</string>
+    <string name="story_learn_description">Пройдите обучение и получите возможность купить кошелек Tangem со скидкой и токены 1inch в качестве бонуса</string>
+    <string name="story_learn_learn">Пройти обучение</string>
+    <string name="story_learn_title">Получите свой бонус</string>
     <string name="story_meet_borrow">Занимайте</string>
     <string name="story_meet_buy">Покупайте</string>
     <string name="story_meet_exchange">Обменивайте</string>
@@ -421,6 +414,7 @@
     <string name="token_details_hide_token">Скрыть токен</string>
     <string name="token_details_send_blocked_fee_format">%1$s — это токен в сети %2$s. Чтобы отправить транзакцию %3$s, необходимо пополнить баланс %4$s (%5$s) для оплаты комиссии сети.</string>
     <string name="token_details_send_blocked_tx_format">Пожалуйста, дождитесь завершения транзакции %s, чтобы иметь возможность отправить средства</string>
+    <string name="token_details_token_type_subtitle">%1$s токен в сети %%image%% %2$s</string>
     <string name="token_details_unable_hide_alert_message">Токен %1$s является основной валютой в сети %2$s и не может быть скрыт до тех пор, пока у вас в списке есть другие токены этой сети.</string>
     <string name="token_details_unable_hide_alert_title">Невозможно скрыть %s</string>
     <string name="token_item_no_rate">Нет цены</string>
@@ -435,6 +429,7 @@
     <string name="transaction_history_error_failed_to_load">Не удалось загрузить историю транзакций.\nНажмите на кнопку перезагрузки, чтобы обновить информацию.</string>
     <string name="transaction_history_not_supported_description">История транзакций в настоящее время не поддерживается для этого блокчейна. Но не волнуйтесь, мы работаем над этим! А пока вы можете проверить ее в обозревателе.</string>
     <string name="transaction_history_transaction_from_address">от: %s</string>
+    <string name="transaction_history_transaction_to_address">на: %s</string>
     <string name="transaction_history_tx_in_progress">В процессе…</string>
     <string name="twin_error_same_card">Вы отсканировали ту же карту. Для создания twin-кошелька вам необходимо отсканировать карту с номером %d</string>
     <string name="twins_onboarding_description_format">Это карта, которую вы держите в руках. У парной карты номер %s.\n\nОбе карты можно использовать для вывода средств из этого кошелька.</string>
@@ -465,9 +460,6 @@
     <string name="wallet_balance_tx_in_progress">Транзакция подтверждается…</string>
     <string name="wallet_balance_verified">Подтвержденный баланс</string>
     <string name="wallet_button_actions">Действия</string>
-    <string name="wallet_button_buy">Купить</string>
-    <string name="wallet_button_sell">Продать</string>
-    <string name="wallet_button_send">Отправить</string>
     <string name="wallet_choose_trade_action">Вы хотите купить или продать криптовалюту?</string>
     <string name="wallet_connect_alert_sign_message">Запрос на подпись сообщения.\n\n%s</string>
     <string name="wallet_connect_bnb_sign_message">Dapp %1$s, запрос на\nподпись транзакции с BNB.\n\n%2$s</string>
diff --git a/core/res/src/main/res/values-zh-rTW/strings.xml b/core/res/src/main/res/values-zh-rTW/strings.xml
index 8b25c3a89d..59649e3ed6 100644
--- a/core/res/src/main/res/values-zh-rTW/strings.xml
+++ b/core/res/src/main/res/values-zh-rTW/strings.xml
@@ -171,11 +171,8 @@
     <string name="onboarding_button_claim">獲取</string>
     <string name="onboarding_button_continue_wallet">繼續至我的錢包</string>
     <string name="onboarding_button_finalize_backup">完成備份過程</string>
-    <string name="onboarding_button_kyc_start">通過Utorg驗證</string>
-    <string name="onboarding_button_kyc_waiting">刷新</string>
     <string name="onboarding_button_pin">設置PIN碼</string>
     <string name="onboarding_button_receive_crypto">接收貨幣</string>
-    <string name="onboarding_button_register_wallet">註冊</string>
     <string name="onboarding_button_scan_origin_card">掃描主卡</string>
     <string name="onboarding_button_skip_backup">暫時略過</string>
     <string name="onboarding_button_what_does_it_mean">它是如何運作的？</string>
@@ -190,18 +187,9 @@
     <string name="onboarding_exit_alert_message">這此情況，您必須要重新開始</string>
     <string name="onboarding_exit_alert_title">您想要離開啟用程序嗎?</string>
     <string name="onboarding_getting_started">開始</string>
-    <string name="onboarding_navbar_kyc_progress">驗證身分</string>
-    <string name="onboarding_navbar_kyc_start">KYC</string>
     <string name="onboarding_navbar_pin">PIN 碼</string>
     <string name="onboarding_navbar_register_wallet">連接</string>
     <string name="onboarding_navbar_title_creating_backup">創建備份</string>
-    <string name="onboarding_saltpay_button_backup_origin">點擊 SaltPay 卡</string>
-    <string name="onboarding_saltpay_subtitle_no_backup_cards">要開始備份過程，您必須添加 Tangem 卡片作為備份</string>
-    <string name="onboarding_saltpay_subtitle_one_backup_card">通過創建訪問密碼完成備份</string>
-    <string name="onboarding_saltpay_title_backup_card">點擊 Tangem 卡片</string>
-    <string name="onboarding_saltpay_title_no_backup_card">沒有備份卡片</string>
-    <string name="onboarding_saltpay_title_one_backup_card">備份卡片已準備完成</string>
-    <string name="onboarding_saltpay_title_prepare_origin">準備SaltPay卡</string>
     <string name="onboarding_seed_button_read_more">閱讀更多關於助記詞的訊息</string>
     <string name="onboarding_seed_generate_message">按照下面給出的順序寫下這 12 個單詞，並將它們存放在安全秘密的地方。</string>
     <string name="onboarding_seed_generate_title">您的助記詞</string>
@@ -217,13 +205,8 @@
     <string name="onboarding_seed_user_validation_title">那麼，讓我們檢查一下</string>
     <string name="onboarding_subtitle_claim">要開始，只需將 wxDAI 獲取到您的錢包</string>
     <string name="onboarding_subtitle_claim_progress">這會花上幾秒</string>
-    <string name="onboarding_subtitle_kyc_retry">請查看Email已獲得更多指示</string>
-    <string name="onboarding_subtitle_kyc_start">要開始使用您的卡，您必須通過 KYC驗證</string>
-    <string name="onboarding_subtitle_kyc_waiting">請等待驗證完成，您將收到電子郵件通知。通常最多需要 1 小時。您可以關閉該應用程序，稍後再回來</string>
     <string name="onboarding_subtitle_no_backup_cards">要開始備份過程，最多可添加兩張備份卡。</string>
     <string name="onboarding_subtitle_one_backup_card">您可以再添加一張卡或完成備份過程</string>
-    <string name="onboarding_subtitle_pin">設置一個 4 位密碼。 \n它將用在付款時使用。</string>
-    <string name="onboarding_subtitle_register_wallet">將您的卡片連接到去中心化支付系統</string>
     <string name="onboarding_subtitle_scan_backup_card_format">準備編號為 %s 的備份卡</string>
     <string name="onboarding_subtitle_scan_origin_card">準備主卡</string>
     <string name="onboarding_subtitle_scan_primary_card_format">準備編號為 %s 的主卡</string>
@@ -234,13 +217,9 @@
     <string name="onboarding_title_backup_card_format">備份卡 #%d</string>
     <string name="onboarding_title_claim">獲取%s</string>
     <string name="onboarding_title_claim_progress">獲取中</string>
-    <string name="onboarding_title_kyc_retry">有東西出錯了</string>
-    <string name="onboarding_title_kyc_start">確認你的身分</string>
-    <string name="onboarding_title_kyc_waiting">KYC 認證中</string>
     <string name="onboarding_title_no_backup_cards">沒有備用卡</string>
     <string name="onboarding_title_one_backup_card">添加了一張備用卡</string>
     <string name="onboarding_title_pin">PIN 碼</string>
-    <string name="onboarding_title_register_wallet">連接你的錢包</string>
     <string name="onboarding_title_scan_origin_card">準備好你的卡片</string>
     <string name="onboarding_title_two_backup_cards">添加了兩張備用卡</string>
     <string name="onboarding_top_up_body">要開始使用，只需為錢包充值任意金額</string>
@@ -286,12 +265,6 @@
     <string name="reset_card_without_backup_to_factory_message">恢復原廠設置將從所選卡中完全刪除錢包並將其從應用程序中刪除。您將無法恢復當前錢包</string>
     <string name="russian_bank_card_warning_subtitle">您有其他國家的銀行卡或銀聯卡嗎？</string>
     <string name="russian_bank_card_warning_title">目前不接受俄羅斯銀行卡</string>
-    <string name="saltpay_error_empty_backup_message">輕觸帶有 visa 標誌的卡片</string>
-    <string name="saltpay_error_empty_backup_title">注意</string>
-    <string name="saltpay_error_no_gas_message">請聯繫客服</string>
-    <string name="saltpay_error_no_gas_title">沒有激活資金</string>
-    <string name="saltpay_error_pin_weak_message">這樣的 PIN 很容易被暴力破解</string>
-    <string name="saltpay_error_pin_weak_title">四個相同的數字不安全</string>
     <string name="save_user_wallet_agreement_access_description">登錄應用程序並在不掃描卡片的情況下檢查您的資產</string>
     <string name="save_user_wallet_agreement_access_title">訪問應用程序</string>
     <string name="save_user_wallet_agreement_allow_biometrics">允許使用生物辨識</string>
@@ -339,6 +312,7 @@
     <string name="solana_rent_warning">Solana 網絡每 2 天收取 %1$s 的費用。無法付此費用的帳戶將從網絡中清除。向您的帳戶存入超過 %2$s 即可免費使用</string>
     <string name="story_awe_description">安全地存儲您的加密貨幣，同時將私鑰保存在您的卡中</string>
     <string name="story_awe_title">創新式的硬體錢包</string>
+    <string name="story_backup_description">最多 **3張實體卡片** 到一個錢包</string>
     <string name="story_backup_description_1">最多</string>
     <string name="story_backup_description_2_bold">3張實體卡片</string>
     <string name="story_backup_description_3">到一個錢包</string>
@@ -430,9 +404,6 @@
     <string name="wallet_balance_tx_in_progress">交易進行中</string>
     <string name="wallet_balance_verified">檢視餘額</string>
     <string name="wallet_button_actions">動作</string>
-    <string name="wallet_button_buy">購買</string>
-    <string name="wallet_button_sell">銷售</string>
-    <string name="wallet_button_send">發送</string>
     <string name="wallet_choose_trade_action">您想要購買或賣出交易貨幣?</string>
     <string name="wallet_connect_alert_sign_message">請求籤署消息。%s</string>
     <string name="wallet_connect_bnb_sign_message">Dapp %1$s，請求\n簽署 BNB 交易。\n%2$s</string>
diff --git a/core/res/src/main/res/values/strings.xml b/core/res/src/main/res/values/strings.xml
index fa2b1dfecf..7f18cfaf1b 100644
--- a/core/res/src/main/res/values/strings.xml
+++ b/core/res/src/main/res/values/strings.xml
@@ -64,13 +64,17 @@
     <string name="common_enable">Enable</string>
     <string name="common_enabled">Enabled</string>
     <string name="common_exchange">Exchange</string>
+    <string name="common_explore_transaction_history">Explore transaction history</string>
+    <string name="common_explorer">Explorer</string>
     <string name="common_like">Like</string>
+    <string name="common_main_network">Main network</string>
     <string name="common_no">No</string>
     <string name="common_no_data">No data</string>
     <string name="common_ok">OK</string>
     <string name="common_origin_card">Primary Card</string>
     <string name="common_receive">Receive</string>
     <string name="common_reject">Reject</string>
+    <string name="common_reload">Reload</string>
     <string name="common_save_changes">Save changes</string>
     <string name="common_search">Search</string>
     <string name="common_seed_phrase">Seed phrase</string>
@@ -154,13 +158,20 @@
     <string name="initial_message_tap_header">Tap the card</string>
     <string name="internal_error_wallet_manager_not_found">Internal error: wallet manager not found</string>
     <string name="key_invalidated_warning_description">You have updated biometrics, scan your card to enter</string>
-    <string name="main_learn_subtitle">You have completed the training and can get your 1inch tokens</string>
-    <string name="main_learn_title">Get a bonus</string>
+    <string name="main_get_bonus_subtitle">You have completed the training and can get your 1inch tokens</string>
+    <string name="main_get_bonus_title">Get a bonus</string>
+    <plurals name="main_learn_subtitle">
+        <item quantity="one">Complete the training and get %d 1inch token on your wallet</item>
+        <item quantity="other">Complete the training and get %d 1inch tokens on your wallet</item>
+    </plurals>
+    <string name="main_learn_title">Learn &amp; Earn</string>
     <string name="main_manage_tokens">Manage tokens</string>
     <string name="main_no_backup_warning_subtitle">To protect your assets, we advise you to carry out this procedure</string>
     <string name="main_no_backup_warning_title">Your wallet has not been backed up</string>
     <string name="main_page_balance">Total balance</string>
     <string name="main_processing_full_amount">The amount does not include some of your funds</string>
+    <string name="main_promotion_credited">1inch tokens will be credited to your wallet address within 2 days</string>
+    <string name="main_promotion_no_purchase">There was no purchase of a wallet using your promo code, which means you cannot receive a bonus. Buy Tangem wallet, scan it in the app, and get the bonus.</string>
     <string name="main_scan_card_warning_view_subtitle">To access all the networks you need to scan the card</string>
     <string name="main_scan_card_warning_view_title">Scan your card</string>
     <string name="onboarding_access_code_feature_1_description">You have to set up a single access code to protect all your wallets</string>
@@ -184,11 +195,8 @@
     <string name="onboarding_button_claim">Claim</string>
     <string name="onboarding_button_continue_wallet">Continue to my wallet</string>
     <string name="onboarding_button_finalize_backup">Finalize the backup</string>
-    <string name="onboarding_button_kyc_start">Verify via Utorg</string>
-    <string name="onboarding_button_kyc_waiting">Refresh</string>
     <string name="onboarding_button_pin">Set PIN code</string>
     <string name="onboarding_button_receive_crypto">Receive crypto</string>
-    <string name="onboarding_button_register_wallet">Register</string>
     <string name="onboarding_button_scan_origin_card">Scan primary card</string>
     <string name="onboarding_button_skip_backup">Skip for later</string>
     <string name="onboarding_button_what_does_it_mean">How does it work?</string>
@@ -204,18 +212,9 @@
     <string name="onboarding_exit_alert_title">Do you want to exit the activation process?</string>
     <string name="onboarding_getting_started">Getting started</string>
     <string name="onboarding_linking_error_card_with_wallets">Another wallet has already been created on the card you\'re trying to add. Do you want to reset it and use the card for a new wallet?</string>
-    <string name="onboarding_navbar_kyc_progress">Verify your identity</string>
-    <string name="onboarding_navbar_kyc_start">KYC</string>
     <string name="onboarding_navbar_pin">Pin code</string>
     <string name="onboarding_navbar_register_wallet">Connect</string>
     <string name="onboarding_navbar_title_creating_backup">Creating a backup</string>
-    <string name="onboarding_saltpay_button_backup_origin">Tap the SaltPay card</string>
-    <string name="onboarding_saltpay_subtitle_no_backup_cards">To start the backup process you have to add the Tangem card as your backup</string>
-    <string name="onboarding_saltpay_subtitle_one_backup_card">Finalize the backup process by creating an access code</string>
-    <string name="onboarding_saltpay_title_backup_card">Tap the Tangem card</string>
-    <string name="onboarding_saltpay_title_no_backup_card">No backup card</string>
-    <string name="onboarding_saltpay_title_one_backup_card">Backup card ready</string>
-    <string name="onboarding_saltpay_title_prepare_origin">Prepare the SaltPay card</string>
     <string name="onboarding_seed_button_read_more">Read more about seed phrases</string>
     <string name="onboarding_seed_generate_message">Write these 12 words down in the order given below and store them in a safe and secret place.</string>
     <string name="onboarding_seed_generate_title">Your secret phrase</string>
@@ -231,13 +230,8 @@
     <string name="onboarding_seed_user_validation_title">So, let’s check</string>
     <string name="onboarding_subtitle_claim">To get started, simply claim wxDAI to your wallet</string>
     <string name="onboarding_subtitle_claim_progress">It will take a few seconds</string>
-    <string name="onboarding_subtitle_kyc_retry">Please check your email for further instructions</string>
-    <string name="onboarding_subtitle_kyc_start">To start using your card you have to pass the KYC process</string>
-    <string name="onboarding_subtitle_kyc_waiting">Please wait until the verification is completed. You\'ll be notified via email. Usually it takes up to 1 hour. You can close the app and come back later.</string>
     <string name="onboarding_subtitle_no_backup_cards">To start the backup process add up to two backup cards.</string>
     <string name="onboarding_subtitle_one_backup_card">You can add one more card or finalize the backup process</string>
-    <string name="onboarding_subtitle_pin">Set up a 4-digit code.\nIt will be used for payments.</string>
-    <string name="onboarding_subtitle_register_wallet">Connect your card to the decentralized payment system</string>
     <string name="onboarding_subtitle_scan_backup_card_format">Prepare the backup card with number %s</string>
     <string name="onboarding_subtitle_scan_origin_card">Prepare the primary card</string>
     <string name="onboarding_subtitle_scan_primary_card_format">Prepare the primary card with number %s</string>
@@ -248,13 +242,9 @@
     <string name="onboarding_title_backup_card_format">Backup card #%d</string>
     <string name="onboarding_title_claim">Claim %s</string>
     <string name="onboarding_title_claim_progress">Claiming</string>
-    <string name="onboarding_title_kyc_retry">Something went wrong</string>
-    <string name="onboarding_title_kyc_start">Verify your identity</string>
-    <string name="onboarding_title_kyc_waiting">KYC is in progress</string>
     <string name="onboarding_title_no_backup_cards">No backup cards</string>
     <string name="onboarding_title_one_backup_card">One backup card added</string>
     <string name="onboarding_title_pin">PIN Code</string>
-    <string name="onboarding_title_register_wallet">Connect your card</string>
     <string name="onboarding_title_scan_origin_card">Prepare your card</string>
     <string name="onboarding_title_two_backup_cards">Two backup cards added</string>
     <string name="onboarding_top_up_body">To get started, simply top up the wallet with any amount</string>
@@ -275,6 +265,10 @@
     <string name="organize_tokens_group">Group</string>
     <string name="organize_tokens_sort_by_balance">By balance</string>
     <string name="organize_tokens_title">Organize tokens</string>
+    <string name="organize_tokens_ungroup">Ungroup</string>
+    <string name="receive_bottom_sheet_title">%1$s %2$s address on %3$s network</string>
+    <string name="receive_bottom_sheet_warning_message">%1$s (%2$s) on %3$s network</string>
+    <string name="receive_bottom_sheet_warning_message_full">Send only %s to this address. Sending any other currency will result in its irreversible loss.</string>
     <string name="referral_button_participate">Participate</string>
     <string name="referral_error_failed_to_load_info">Failed to load the information about the referral program. Please try again later.</string>
     <string name="referral_error_failed_to_load_info_with_reason">Failed to load the information about the referral program. Error code: %s. Please try again later.</string>
@@ -304,12 +298,6 @@
     <string name="reset_card_without_backup_to_factory_message">Factory Reset will completely delete the wallet from the selected card and remove it from the app. You will not be able to restore the current wallet.</string>
     <string name="russian_bank_card_warning_subtitle">Do you have a bank card of another country or a UnionPay card?</string>
     <string name="russian_bank_card_warning_title">Russian bank cards are not accepted at the moment</string>
-    <string name="saltpay_error_empty_backup_message">Tap the card with the visa logo</string>
-    <string name="saltpay_error_empty_backup_title">Attention</string>
-    <string name="saltpay_error_no_gas_message">Please contact support</string>
-    <string name="saltpay_error_no_gas_title">No funds for activation</string>
-    <string name="saltpay_error_pin_weak_message">Such a PIN can be brute-forced easily</string>
-    <string name="saltpay_error_pin_weak_title">Four identical digits isn\'t safe</string>
     <string name="save_user_wallet_agreement_access_description">Log into the app and check your balance without scanning the card</string>
     <string name="save_user_wallet_agreement_access_title">Access the app</string>
     <string name="save_user_wallet_agreement_allow_biometrics">Allow to use biometrics</string>
@@ -342,7 +330,6 @@
     <string name="send_fee_picker_priority">Priority</string>
     <string name="send_max_amount_label">Maximum amount</string>
     <string name="send_network_fee_title">Network fee</string>
-    <string name="send_title">Send</string>
     <string name="send_title_currency_format">Sending %s</string>
     <string name="send_total_label">Total</string>
     <string name="send_total_subtitle_asset_format">%1$s and %2$s will be sent</string>
@@ -354,12 +341,12 @@
     <string name="shop_i_have_a_promo_code">I have a promo code…</string>
     <string name="shop_one_wallet">Tangem Wallet</string>
     <string name="shop_other_payment_methods">Other payment methods</string>
-    <string name="shop_sold_out_description_prefix">Due to the high volume of orders we are receiving, Shipping and Local Delivery orders may be delayed.</string>
-    <string name="shop_pre_order_now">Pre-order now</string>
+    <string name="shop_sold_out_description">Due to the high volume of orders we are receiving shipping may be delayed up to 5 weeks depending on your location</string>
     <string name="shop_total">Total</string>
     <string name="solana_rent_warning">Solana network charges a rent of %1$s every 2 days. Accounts that can\'t afford the rent are purged from the network. Deposit your account with more than %2$s to use it for free.</string>
     <string name="story_awe_description">Store your crypto assets secure while keeping private keys contained in your card</string>
     <string name="story_awe_title">Revolutionary Hardware Wallet</string>
+    <string name="story_backup_description">Up to **3 physical cards** to one wallet</string>
     <string name="story_backup_description_1">Up to</string>
     <string name="story_backup_description_2_bold">3 physical cards</string>
     <string name="story_backup_description_3">to one wallet</string>
@@ -421,6 +408,7 @@
     <string name="token_details_hide_token">Hide token</string>
     <string name="token_details_send_blocked_fee_format">%1$s is a token in the %2$s network. To make a %3$s transaction you need to deposit some %4$s (%5$s) to cover the network fee.</string>
     <string name="token_details_send_blocked_tx_format">Please wait for %s transaction to complete to be able to send funds</string>
+    <string name="token_details_token_type_subtitle">%1$s token in %%image%% %2$s network</string>
     <string name="token_details_unable_hide_alert_message">The %1$s token is the main currency on the %2$s network and cannot be hidden as long as you have other tokens on this network in the list.</string>
     <string name="token_details_unable_hide_alert_title">Unable to hide %s</string>
     <string name="token_item_no_rate">No rate</string>
@@ -464,9 +452,6 @@
     <string name="wallet_balance_tx_in_progress">Transaction is in progress…</string>
     <string name="wallet_balance_verified">Verified Balance</string>
     <string name="wallet_button_actions">Actions</string>
-    <string name="wallet_button_buy">Buy</string>
-    <string name="wallet_button_sell">Sell</string>
-    <string name="wallet_button_send">Send</string>
     <string name="wallet_choose_trade_action">Do you want to buy or sell crypto?</string>
     <string name="wallet_connect_alert_sign_message">Requesting to sign a message.\n\n%s</string>
     <string name="wallet_connect_bnb_sign_message">Dapp %1$s, requesting to\nsign BNB transaction.\n\n%2$s</string>

From c0fb9e8bdb5566803b952b15252149c486fa046c Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 26 Jun 2023 21:06:43 +0300
Subject: [PATCH 11/21] Updated on 2026-08-14

---
 .../com/tangem/tap/features/home/redux/HomeReducer.kt    | 4 +++-
 .../learn2earn/domain/DefaultLearn2earnInteractor.kt     | 8 ++------
 .../tangem/feature/learn2earn/domain/HeadersConverter.kt | 3 ++-
 .../feature/learn2earn/domain/WebViewUriBuilder.kt       | 2 +-
 .../learn2earn/domain/api/WebViewRedirectHandler.kt      | 2 +-
 .../feature/learn2earn/presentation/ui/GetBonusView.kt   | 3 ++-
 .../learn2earn/presentation/ui/state/Learn2earnState.kt  | 7 ++++++-
 .../learn2earn/presentation/ui/state/StateBuilder.kt     | 9 +++++++--
 8 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/features/home/redux/HomeReducer.kt b/app/src/main/java/com/tangem/tap/features/home/redux/HomeReducer.kt
index e2c0210706..6843253f5a 100644
--- a/app/src/main/java/com/tangem/tap/features/home/redux/HomeReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/redux/HomeReducer.kt
@@ -14,7 +14,9 @@ private fun internalReduce(action: Action, state: AppState): HomeState {
     when (action) {
         is HomeAction.InsertStory -> {
             state = state.copy(
-                stories = listOf(action.story) + state.stories,
+                stories = state.stories.toMutableList().apply {
+                    add(action.position, action.story)
+                },
             )
         }
         is HomeAction.ScanInProgress -> {
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt
index 8ba760e9f9..1b58ec245c 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt
@@ -170,7 +170,7 @@ class DefaultLearn2earnInteractor(
     }
 
     override fun buildUriForOldUser(): Uri {
-        return webViewUriBuilder.buildUriForOlgUser()
+        return webViewUriBuilder.buildUriForOldUser()
     }
 
     override fun getBasicAuthHeaders(): ArrayList<String> {
@@ -242,11 +242,7 @@ class DefaultLearn2earnInteractor(
     }
 
     private fun getCurrencyForAward(): Currency? {
-        if (promotion.info == null) return null
-
-        val info = promotion.getPromotionInfo()
-        val token = info.awardPaymentToken
-        // use only the first available network
+        val token = promotion.info?.awardPaymentToken ?: return null
 
         return Currency.NonNativeToken(
             id = token.id,
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/HeadersConverter.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/HeadersConverter.kt
index b404921d3a..e2fa9ffacf 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/HeadersConverter.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/HeadersConverter.kt
@@ -3,7 +3,8 @@ package com.tangem.feature.learn2earn.domain
 import com.tangem.utils.converter.TwoWayConverter
 
 /**
- * Converter which helps prepare a list of headers to put it into the Intent and extract them later.
+ * A converter that helps prepare a list of headers to put in an intent and retrieve them later.
+ *
 [REDACTED_AUTHOR]
  */
 internal class HeadersConverter : TwoWayConverter<Map<String, String>, ArrayList<String>> {
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/WebViewUriBuilder.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/WebViewUriBuilder.kt
index c44b4e20fa..b1e63934bf 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/WebViewUriBuilder.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/WebViewUriBuilder.kt
@@ -23,7 +23,7 @@ internal class WebViewUriBuilder(
         return builder.build()
     }
 
-    fun buildUriForOlgUser(): Uri {
+    fun buildUriForOldUser(): Uri {
         val builder = makeWebViewUriBuilder()
             .appendQueryParameter("type", QUERY_EXISTED_CARD)
 
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/WebViewRedirectHandler.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/WebViewRedirectHandler.kt
index e15cdb377f..efca9c182a 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/WebViewRedirectHandler.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/WebViewRedirectHandler.kt
@@ -4,7 +4,7 @@ import android.net.Uri
 
 /**
  * Handler that helps determine what actions to take inside the WebView of the Learn2earnWebViewActivity after
- * a redirect has been processedWebViewRedirectHandler
+ * a redirect has been processed by WebViewRedirectHandler
  *
 [REDACTED_AUTHOR]
  */
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusView.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusView.kt
index 25a1a5d158..392f3e1e04 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusView.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusView.kt
@@ -49,7 +49,7 @@ internal fun GetBonusView(state: MainScreenState, modifier: Modifier = Modifier)
             Box(modifier = Modifier.padding(horizontal = TangemTheme.dimens.size16)) {
                 Image(
                     painter = painterResource(id = R.drawable.img_1inch_logo_42_40),
-                    alpha = state.logoAlphaValue,
+                    alpha = state.logoState.alpha,
                     contentDescription = null,
                 )
                 if (state.showProgress) {
@@ -147,5 +147,6 @@ private fun makePreviewState(): MainScreenState = MainScreenState(
     isVisible = true,
     onClick = {},
     description = MainScreenState.Description.Learn(0, "0"),
+    logoState = MainScreenState.LogoState.Idle,
     showProgress = false,
 )
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/Learn2earnState.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/Learn2earnState.kt
index f78993a14f..7ceb3441d6 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/Learn2earnState.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/Learn2earnState.kt
@@ -25,10 +25,15 @@ data class MainScreenState(
     val onClick: () -> Unit,
     val description: Description,
     val showProgress: Boolean,
-    val logoAlphaValue: Float = 1f,
+    val logoState: LogoState,
     val dialog: Dialog? = null,
 ) {
 
+    sealed class LogoState(val alpha: Float) {
+        object Idle : LogoState(alpha = 1.0f)
+        object InProgress : LogoState(alpha = 0.2f)
+    }
+
     sealed class Description(val title: TextReference, val subtitle: TextReference) {
 
         class Learn(count: Int, award: String) : Description(
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt
index 0e2e14251c..48ffd1a68f 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt
@@ -13,6 +13,7 @@ internal fun Learn2earnState.Companion.init(uiActions: UiActions): Learn2earnSta
             isVisible = false,
             onClick = uiActions.buttonMainClick,
             description = MainScreenState.Description.Learn(0, "0"),
+            logoState = MainScreenState.LogoState.Idle,
             showProgress = false,
         ),
     )
@@ -42,7 +43,7 @@ internal fun Learn2earnState.updateGetBonusVisibility(isVisible: Boolean): Learn
     }
 }
 
-internal fun Learn2earnState.changeGetBounsDescription(description: MainScreenState.Description,): Learn2earnState {
+internal fun Learn2earnState.changeGetBounsDescription(description: MainScreenState.Description): Learn2earnState {
     return if (mainScreenState.description == description) {
         this
     } else {
@@ -86,7 +87,11 @@ internal fun Learn2earnState.updateProgress(showProgress: Boolean): Learn2earnSt
         copy(
             mainScreenState = mainScreenState.copy(
                 showProgress = showProgress,
-                logoAlphaValue = if (showProgress) 0.2f else 1f,
+                logoState = if (showProgress) {
+                    MainScreenState.LogoState.InProgress
+                } else {
+                    MainScreenState.LogoState.Idle
+                },
             ),
         )
     }

From a1a659f56d2f5ce428c36467ad214df99b5f7447 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 27 Jun 2023 11:36:30 +0300
Subject: [PATCH 12/21] Updated on 2026-08-14

---
 app/src/main/java/com/tangem/tap/TapApplication.kt        | 4 ++--
 .../learn2earn/data/DefaultLearn2earnRepository.kt        | 2 +-
 .../feature/learn2earn/data/models/PromoUserData.kt       | 2 +-
 .../learn2earn/domain/DefaultLearn2earnInteractor.kt      | 8 ++++----
 .../presentation/ui/Learn2earnMainPageScreen.kt           | 8 ++++----
 .../learn2earn/presentation/ui/state/StateBuilder.kt      | 1 -
 .../learn2earn/presentation/webView/WebViewViewModel.kt   | 2 +-
 7 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/TapApplication.kt b/app/src/main/java/com/tangem/tap/TapApplication.kt
index a2868e27e4..70fa67acd8 100644
--- a/app/src/main/java/com/tangem/tap/TapApplication.kt
+++ b/app/src/main/java/com/tangem/tap/TapApplication.kt
@@ -246,7 +246,7 @@ class TapApplication : Application(), ImageLoaderFactory {
         shopService = TangemShopService(this, config.shopify!!)
         initAnalytics(this, config)
         initFeedbackManager(this, preferencesStorage, foregroundActivityObserver, store)
-        learn2earnSetupAdditionalDependencies(config)
+        setupLearn2earnAdditionalDependencies(config)
     }
 
     private fun initAnalytics(application: Application, config: Config) {
@@ -309,7 +309,7 @@ class TapApplication : Application(), ImageLoaderFactory {
         store.dispatch(GlobalAction.SetFeedbackManager(feedbackManager))
     }
 
-    private fun learn2earnSetupAdditionalDependencies(config: Config) {
+    private fun setupLearn2earnAdditionalDependencies(config: Config) {
         learn2ernInteractor.setupDependencies(
             authCredentials = config.tangemComAuthorization,
             countryCodeProvider = { store.state.globalState.userCountryCode ?: Locale.current.language },
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultLearn2earnRepository.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultLearn2earnRepository.kt
index 4e82732da2..d1ad091ec5 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultLearn2earnRepository.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultLearn2earnRepository.kt
@@ -120,7 +120,7 @@ internal class DefaultLearn2earnRepository(
     private fun createNewUser(): PromoUserData = PromoUserData(
         promoCode = null,
         isRegisteredInPromotion = false,
-        alreadyReceivedAward = false,
+        isAlreadyReceivedAward = false,
     )
 
     private companion object {
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/models/PromoUserData.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/models/PromoUserData.kt
index a982239d0a..7edf1bc122 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/models/PromoUserData.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/models/PromoUserData.kt
@@ -6,5 +6,5 @@ package com.tangem.feature.learn2earn.data.models
 data class PromoUserData(
     val promoCode: String?,
     val isRegisteredInPromotion: Boolean,
-    val alreadyReceivedAward: Boolean,
+    val isAlreadyReceivedAward: Boolean,
 )
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt
index 1b58ec245c..2eea7cf470 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt
@@ -103,7 +103,7 @@ class DefaultLearn2earnInteractor(
             val address = getWalletAddressForAward(awardCurrency)
             val awardResponse = repository.requestAward(walletId, address)
             if (awardResponse.status == true) {
-                updateUserData { it.copy(alreadyReceivedAward = true) }
+                updateUserData { it.copy(isAlreadyReceivedAward = true) }
                 null
             } else {
                 awardResponse.error
@@ -123,7 +123,7 @@ class DefaultLearn2earnInteractor(
             val address = getWalletAddressForAward(awardCurrency)
             val awardWithCodeResponse = repository.requestAwardByCode(walletId, address, promoCode)
             if (awardWithCodeResponse.status == true) {
-                updateUserData { it.copy(alreadyReceivedAward = true) }
+                updateUserData { it.copy(isAlreadyReceivedAward = true) }
                 null
             } else {
                 awardWithCodeResponse.error
@@ -159,7 +159,7 @@ class DefaultLearn2earnInteractor(
             is PromotionError.CardAlreadyHasAward, is PromotionError.WalletAlreadyHasAward,
             is PromotionError.CodeWasAlreadyUsed,
             -> {
-                updateUserData { it.copy(alreadyReceivedAward = true) }
+                updateUserData { it.copy(isAlreadyReceivedAward = true) }
             }
             else -> Unit
         }
@@ -202,7 +202,7 @@ class DefaultLearn2earnInteractor(
 
     private fun promotionIsActive(): Boolean {
         val isActive = when {
-            repository.getUserData().alreadyReceivedAward -> false
+            repository.getUserData().isAlreadyReceivedAward -> false
             promotion.isError() -> false
             else -> promotion.getPromotionInfo().status == PromotionInfoResponse.Status.ACTIVE
         }
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/Learn2earnMainPageScreen.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/Learn2earnMainPageScreen.kt
index e7dceb659e..be9b02a7d7 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/Learn2earnMainPageScreen.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/Learn2earnMainPageScreen.kt
@@ -4,18 +4,18 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import com.tangem.core.ui.res.TangemTheme
-import com.tangem.feature.learn2earn.presentation.Learn2earnViewModel
+import com.tangem.feature.learn2earn.presentation.ui.state.Learn2earnState
 
 /**
 [REDACTED_AUTHOR]
  */
 @Composable
-fun Learn2earnMainPageScreen(viewModel: Learn2earnViewModel, modifier: Modifier = Modifier) {
+fun Learn2earnMainPageScreen(state: Learn2earnState, modifier: Modifier = Modifier) {
     GetBonusView(
-        state = viewModel.uiState.mainScreenState,
+        state = state.mainScreenState,
         modifier = modifier
             .padding(horizontal = TangemTheme.dimens.size16)
             .padding(vertical = TangemTheme.dimens.size8),
     )
-    Learn2earnDialogs(viewModel.uiState.mainScreenState.dialog)
+    Learn2earnDialogs(state.mainScreenState.dialog)
 }
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt
index 48ffd1a68f..4faefc208d 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt
@@ -79,7 +79,6 @@ internal fun Learn2earnState.hideDialog(): Learn2earnState {
     }
 }
 
-@Suppress("MagicNumber")
 internal fun Learn2earnState.updateProgress(showProgress: Boolean): Learn2earnState {
     return if (mainScreenState.showProgress == showProgress) {
         this
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/webView/WebViewViewModel.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/webView/WebViewViewModel.kt
index 3c473657de..37d6f9a5c4 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/webView/WebViewViewModel.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/webView/WebViewViewModel.kt
@@ -13,7 +13,7 @@ import javax.inject.Inject
 [REDACTED_AUTHOR]
  */
 @HiltViewModel
-class WebViewViewModel @Inject constructor(
+internal class WebViewViewModel @Inject constructor(
     private val handler: WebViewRedirectHandler,
 ) : ViewModel(), WebViewRedirectHandler {
 

From 21ebcc252e05700b969d3815136b62f95320abd9 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 27 Jun 2023 14:33:11 +0300
Subject: [PATCH 13/21] Updated on 2026-08-14

---
 .../api/promotion/models/AbstractPromotionResponse.kt           | 2 +-
 .../feature/learn2earn/data/DefaultLearn2earnRepository.kt      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/promotion/models/AbstractPromotionResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/promotion/models/AbstractPromotionResponse.kt
index 5f6282ad76..edfc8e990d 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/promotion/models/AbstractPromotionResponse.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/promotion/models/AbstractPromotionResponse.kt
@@ -13,6 +13,6 @@ abstract class AbstractPromotionResponse {
 
     data class Error(
         @Json(name = "code") val code: Int,
-        @Json(name = "description") val message: String,
+        @Json(name = "message") val message: String,
     )
 }
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultLearn2earnRepository.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultLearn2earnRepository.kt
index d1ad091ec5..930023fedd 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultLearn2earnRepository.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultLearn2earnRepository.kt
@@ -113,7 +113,6 @@ internal class DefaultLearn2earnRepository(
             preferencesStorage.userData = userInfoAdapter.toJson(userData)
         } catch (ex: Exception) {
             Timber.e(ex)
-            preferencesStorage.userData = null
         }
     }
 

From 4a3f02eab7f40f0b524cd5de813299d80969442d Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 27 Jun 2023 14:38:40 +0300
Subject: [PATCH 14/21] Updated on 2026-08-14

---
 .../feature/learn2earn/data/DefaultLearn2earnRepository.kt  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultLearn2earnRepository.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultLearn2earnRepository.kt
index 930023fedd..0e9d459eb3 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultLearn2earnRepository.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultLearn2earnRepository.kt
@@ -101,10 +101,10 @@ internal class DefaultLearn2earnRepository(
     private fun restoreUserData(): PromoUserData {
         return try {
             preferencesStorage.userData?.let { userInfoAdapter.fromJson(it) }
-                ?: createNewUser().apply { saveUserData(this) }
+                ?: createEmptyUserData().apply { saveUserData(this) }
         } catch (ex: Exception) {
             Timber.e(ex)
-            createNewUser().apply { saveUserData(this) }
+            createEmptyUserData().apply { saveUserData(this) }
         }
     }
 
@@ -116,7 +116,7 @@ internal class DefaultLearn2earnRepository(
         }
     }
 
-    private fun createNewUser(): PromoUserData = PromoUserData(
+    private fun createEmptyUserData(): PromoUserData = PromoUserData(
         promoCode = null,
         isRegisteredInPromotion = false,
         isAlreadyReceivedAward = false,

From f8b004821606c4bd1728e29e62eea78e0c347186 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 27 Jun 2023 14:40:39 +0300
Subject: [PATCH 15/21] Updated on 2026-08-14

---
 .../feature/learn2earn/data/DefaultLearn2earnRepository.kt  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultLearn2earnRepository.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultLearn2earnRepository.kt
index 0e9d459eb3..9b4f0ffd8c 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultLearn2earnRepository.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultLearn2earnRepository.kt
@@ -21,7 +21,7 @@ internal class DefaultLearn2earnRepository(
 ) : Learn2earnRepository {
 
     private val promotionInfoAdapter = moshi.adapter(PromotionInfoResponse::class.java)
-    private val userInfoAdapter = moshi.adapter(PromoUserData::class.java)
+    private val userDataAdapter = moshi.adapter(PromoUserData::class.java)
 
     private var userData: PromoUserData = restoreUserData()
 
@@ -100,7 +100,7 @@ internal class DefaultLearn2earnRepository(
 
     private fun restoreUserData(): PromoUserData {
         return try {
-            preferencesStorage.userData?.let { userInfoAdapter.fromJson(it) }
+            preferencesStorage.userData?.let { userDataAdapter.fromJson(it) }
                 ?: createEmptyUserData().apply { saveUserData(this) }
         } catch (ex: Exception) {
             Timber.e(ex)
@@ -110,7 +110,7 @@ internal class DefaultLearn2earnRepository(
 
     private fun saveUserData(userData: PromoUserData) {
         try {
-            preferencesStorage.userData = userInfoAdapter.toJson(userData)
+            preferencesStorage.userData = userDataAdapter.toJson(userData)
         } catch (ex: Exception) {
             Timber.e(ex)
         }

From 3fb6cfbaab57e05256543de922c66d19820a621f Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 27 Jun 2023 17:40:25 +0300
Subject: [PATCH 16/21] Updated on 2026-08-14

---
 .../java/com/tangem/tap/features/wallet/ui/WalletFragment.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
index ee946fe068..d10cd1ded0 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
@@ -220,7 +220,7 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), SafeStoreSubscriber<W
             setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
             setContent {
                 TangemTheme {
-                    Learn2earnMainPageScreen(learn2earnViewModel)
+                    Learn2earnMainPageScreen(learn2earnViewModel.uiState)
                 }
             }
         }

From 982bd4130e233e9152f1a2c698c3181cb888a85e Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 27 Jun 2023 20:18:25 +0300
Subject: [PATCH 17/21] Updated on 2026-08-14

---
 .../learn2earn/domain/DefaultLearn2earnInteractor.kt        | 6 ++----
 .../feature/learn2earn/domain/api/Learn2earnInteractor.kt   | 2 +-
 .../feature/learn2earn/presentation/Learn2earnViewModel.kt  | 3 +--
 .../feature/learn2earn/presentation/ui/GetBonusView.kt      | 2 +-
 .../learn2earn/presentation/ui/state/Learn2earnState.kt     | 4 ++--
 .../learn2earn/presentation/ui/state/StateBuilder.kt        | 2 +-
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt
index 2eea7cf470..b32e34cc9f 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt
@@ -61,17 +61,15 @@ class DefaultLearn2earnInteractor(
         return repository.getUserData().isRegisteredInPromotion
     }
 
-    override fun getAwardAmount(): Pair<Int, String> {
+    override fun getAwardAmount(): Int {
         val userInfo = repository.getUserData()
         val promotionInfo = promotion.getPromotionInfo()
 
-        val awardAmount = if (userInfo.promoCode == null) {
+        return if (userInfo.promoCode == null) {
             promotionInfo.awardForOldCard
         } else {
             promotionInfo.awardForNewCard
         }.toInt()
-
-        return awardAmount to awardAmount.toString()
     }
 
     @Throws(IllegalArgumentException::class)
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/Learn2earnInteractor.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/Learn2earnInteractor.kt
index 1121665973..55cd1adfce 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/Learn2earnInteractor.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/Learn2earnInteractor.kt
@@ -21,7 +21,7 @@ interface Learn2earnInteractor : WebViewRedirectHandler {
 
     fun isUserRegisteredInPromotion(): Boolean
 
-    fun getAwardAmount(): Pair<Int, String>
+    fun getAwardAmount(): Int
 
     @Throws(IllegalArgumentException::class)
     suspend fun requestAward(): Result<Unit>
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnViewModel.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnViewModel.kt
index 7f65afe887..8cd6e4536c 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnViewModel.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnViewModel.kt
@@ -109,8 +109,7 @@ class Learn2earnViewModel @Inject constructor(
         return if (interactor.isUserRegisteredInPromotion()) {
             MainScreenState.Description.GetBonus
         } else {
-            val (count, award) = interactor.getAwardAmount()
-            MainScreenState.Description.Learn(count, award)
+            MainScreenState.Description.Learn(interactor.getAwardAmount())
         }
     }
 
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusView.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusView.kt
index 392f3e1e04..ed76e37110 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusView.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusView.kt
@@ -146,7 +146,7 @@ private fun OneInchStoriesContentPreview_Dark() {
 private fun makePreviewState(): MainScreenState = MainScreenState(
     isVisible = true,
     onClick = {},
-    description = MainScreenState.Description.Learn(0, "0"),
+    description = MainScreenState.Description.Learn(0),
     logoState = MainScreenState.LogoState.Idle,
     showProgress = false,
 )
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/Learn2earnState.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/Learn2earnState.kt
index 7ceb3441d6..2f6d1381f0 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/Learn2earnState.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/Learn2earnState.kt
@@ -36,9 +36,9 @@ data class MainScreenState(
 
     sealed class Description(val title: TextReference, val subtitle: TextReference) {
 
-        class Learn(count: Int, award: String) : Description(
+        class Learn(award: Int) : Description(
             TextReference.Res(R.string.main_learn_title),
-            TextReference.PluralRes(R.plurals.main_learn_subtitle, count, WrappedList(listOf(award))),
+            TextReference.PluralRes(R.plurals.main_learn_subtitle, award, WrappedList(listOf(award))),
         )
 
         object GetBonus : Description(
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt
index 4faefc208d..57dc52fc59 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt
@@ -12,7 +12,7 @@ internal fun Learn2earnState.Companion.init(uiActions: UiActions): Learn2earnSta
         mainScreenState = MainScreenState(
             isVisible = false,
             onClick = uiActions.buttonMainClick,
-            description = MainScreenState.Description.Learn(0, "0"),
+            description = MainScreenState.Description.Learn(0),
             logoState = MainScreenState.LogoState.Idle,
             showProgress = false,
         ),

From 122d654f29b5df96f9a78aec43918f6a3efbcb9b Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 27 Jun 2023 20:20:07 +0300
Subject: [PATCH 18/21] Updated on 2026-08-14

---
 .../tap/network/auth/LazyAuthProviderImpl.kt     | 16 ----------------
 .../com/tangem/tap/network/auth/di/AuthModule.kt |  8 --------
 .../com/tangem/datasource/di/NetworkModule.kt    |  4 ++--
 .../com/tangem/datasource/utils/RequestHeader.kt |  7 +++----
 .../java/com/tangem/lib/auth/LazyAuthProvider.kt | 14 --------------
 5 files changed, 5 insertions(+), 44 deletions(-)
 delete mode 100644 app/src/main/java/com/tangem/tap/network/auth/LazyAuthProviderImpl.kt
 delete mode 100644 libs/auth/src/main/java/com/tangem/lib/auth/LazyAuthProvider.kt

diff --git a/app/src/main/java/com/tangem/tap/network/auth/LazyAuthProviderImpl.kt b/app/src/main/java/com/tangem/tap/network/auth/LazyAuthProviderImpl.kt
deleted file mode 100644
index dfe9d32307..0000000000
--- a/app/src/main/java/com/tangem/tap/network/auth/LazyAuthProviderImpl.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.tangem.tap.network.auth
-
-import com.tangem.common.extensions.toHexString
-import com.tangem.lib.auth.LazyAuthProvider
-import com.tangem.tap.proxy.AppStateHolder
-
-class LazyAuthProviderImpl(private val appStateHolder: AppStateHolder) : LazyAuthProvider {
-
-    override fun getCardPublicKeyProvider(): () -> String {
-        return { appStateHolder.getActualCard()?.cardPublicKey?.toHexString() ?: "" }
-    }
-
-    override fun getCardIdProvider(): () -> String {
-        return { appStateHolder.getActualCard()?.cardId ?: "" }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt b/app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt
index b36bc1f85c..6e9eabd1f1 100644
--- a/app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt
+++ b/app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt
@@ -1,9 +1,7 @@
 package com.tangem.tap.network.auth.di
 
 import com.tangem.lib.auth.AuthProvider
-import com.tangem.lib.auth.LazyAuthProvider
 import com.tangem.tap.network.auth.AuthProviderImpl
-import com.tangem.tap.network.auth.LazyAuthProviderImpl
 import com.tangem.tap.proxy.AppStateHolder
 import dagger.Module
 import dagger.Provides
@@ -20,10 +18,4 @@ class AuthModule {
     fun provideAuthProvider(appStateHolder: AppStateHolder): AuthProvider {
         return AuthProviderImpl(appStateHolder)
     }
-
-    @Provides
-    @Singleton
-    fun provideLazyAuthProvider(appStateHolder: AppStateHolder): LazyAuthProvider {
-        return LazyAuthProviderImpl(appStateHolder)
-    }
 }
\ No newline at end of file
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 595ddbdca9..87e05a62fb 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
@@ -9,8 +9,8 @@ import com.tangem.datasource.utils.RequestHeader.*
 import com.tangem.datasource.utils.addHeaders
 import com.tangem.datasource.utils.addLazyHeaders
 import com.tangem.datasource.utils.allowLogging
+import com.tangem.lib.auth.AuthProvider
 import com.tangem.lib.auth.BuildConfig
-import com.tangem.lib.auth.LazyAuthProvider
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -63,7 +63,7 @@ class NetworkModule {
     @Provides
     @Singleton
     @PromotionOneInch
-    fun providePromotionOneInchApi(authProvider: LazyAuthProvider, @NetworkMoshi moshi: Moshi): PromotionApi {
+    fun providePromotionOneInchApi(authProvider: AuthProvider, @NetworkMoshi moshi: Moshi): PromotionApi {
         val okClient = OkHttpClient.Builder()
             .addLazyHeaders(
                 LazyRequestHeader.LazyAuthenticationHeader(authProvider),
diff --git a/core/datasource/src/main/java/com/tangem/datasource/utils/RequestHeader.kt b/core/datasource/src/main/java/com/tangem/datasource/utils/RequestHeader.kt
index 3c460035f5..cb19ed1fd4 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/utils/RequestHeader.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/utils/RequestHeader.kt
@@ -1,7 +1,6 @@
 package com.tangem.datasource.utils
 
 import com.tangem.lib.auth.AuthProvider
-import com.tangem.lib.auth.LazyAuthProvider
 
 /**
  * Presentation of request header
@@ -25,8 +24,8 @@ sealed class LazyRequestHeader(vararg pairs: Pair<String, () -> String>) {
 
     val values: List<Pair<String, () -> String>> = pairs.toList()
 
-    class LazyAuthenticationHeader(authProvider: LazyAuthProvider) : LazyRequestHeader(
-        "card_id" to authProvider.getCardIdProvider(),
-        "card_public_key" to authProvider.getCardPublicKeyProvider(),
+    class LazyAuthenticationHeader(authProvider: AuthProvider) : LazyRequestHeader(
+        "card_id" to { authProvider.getCardId() },
+        "card_public_key" to { authProvider.getCardPublicKey() },
     )
 }
\ No newline at end of file
diff --git a/libs/auth/src/main/java/com/tangem/lib/auth/LazyAuthProvider.kt b/libs/auth/src/main/java/com/tangem/lib/auth/LazyAuthProvider.kt
deleted file mode 100644
index 8dcc383e30..0000000000
--- a/libs/auth/src/main/java/com/tangem/lib/auth/LazyAuthProvider.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.tangem.lib.auth
-
-/**
- * Provides auth for tangemTech API
- */
-interface LazyAuthProvider {
-
-    /**
-     * Returns authToken for tangem tech api
-     */
-    fun getCardPublicKeyProvider(): () -> String
-
-    fun getCardIdProvider(): () -> String
-}
\ No newline at end of file

From 54d8ce26bf73754aa85931d910c515ebfe7b22cd Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 28 Jun 2023 14:21:48 +0300
Subject: [PATCH 19/21] Updated on 2026-08-14

---
 .../com/tangem/datasource/di/NetworkModule.kt  |  6 ++----
 .../tangem/datasource/utils/HttpClientExt.kt   | 14 --------------
 .../tangem/datasource/utils/RequestHeader.kt   | 18 ++++--------------
 .../domain/redux/global/DomainGlobalHub.kt     |  1 +
 4 files changed, 7 insertions(+), 32 deletions(-)

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 87e05a62fb..c8ae82faa9 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
@@ -4,10 +4,8 @@ import com.squareup.moshi.Moshi
 import com.tangem.datasource.api.paymentology.PaymentologyApi
 import com.tangem.datasource.api.promotion.PromotionApi
 import com.tangem.datasource.api.tangemTech.TangemTechApi
-import com.tangem.datasource.utils.LazyRequestHeader
 import com.tangem.datasource.utils.RequestHeader.*
 import com.tangem.datasource.utils.addHeaders
-import com.tangem.datasource.utils.addLazyHeaders
 import com.tangem.datasource.utils.allowLogging
 import com.tangem.lib.auth.AuthProvider
 import com.tangem.lib.auth.BuildConfig
@@ -65,8 +63,8 @@ class NetworkModule {
     @PromotionOneInch
     fun providePromotionOneInchApi(authProvider: AuthProvider, @NetworkMoshi moshi: Moshi): PromotionApi {
         val okClient = OkHttpClient.Builder()
-            .addLazyHeaders(
-                LazyRequestHeader.LazyAuthenticationHeader(authProvider),
+            .addHeaders(
+                AuthenticationHeader(authProvider),
             )
             .allowLogging()
             .callTimeout(API_ONE_INCH_TIMEOUT_MS, TimeUnit.MILLISECONDS)
diff --git a/core/datasource/src/main/java/com/tangem/datasource/utils/HttpClientExt.kt b/core/datasource/src/main/java/com/tangem/datasource/utils/HttpClientExt.kt
index db1c1f0e13..4fd16a0d1d 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/utils/HttpClientExt.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/utils/HttpClientExt.kt
@@ -13,20 +13,6 @@ internal fun OkHttpClient.Builder.addHeaders(vararg requestHeaders: RequestHeade
             val request = chain.request().newBuilder().apply {
                 requestHeaders
                     .flatMap(RequestHeader::values)
-                    .forEach { addHeader(it.first, it.second) }
-            }.build()
-
-            chain.proceed(request)
-        },
-    )
-}
-
-internal fun OkHttpClient.Builder.addLazyHeaders(vararg requestHeaders: LazyRequestHeader): OkHttpClient.Builder {
-    return addInterceptor(
-        Interceptor { chain ->
-            val request = chain.request().newBuilder().apply {
-                requestHeaders
-                    .flatMap(LazyRequestHeader::values)
                     .forEach { addHeader(it.first, it.second.invoke()) }
             }.build()
 
diff --git a/core/datasource/src/main/java/com/tangem/datasource/utils/RequestHeader.kt b/core/datasource/src/main/java/com/tangem/datasource/utils/RequestHeader.kt
index cb19ed1fd4..5e5067746f 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/utils/RequestHeader.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/utils/RequestHeader.kt
@@ -7,24 +7,14 @@ import com.tangem.lib.auth.AuthProvider
  *
  * @param pairs header name and header value pairs
  */
-sealed class RequestHeader(vararg pairs: Pair<String, String>) {
+sealed class RequestHeader(vararg pairs: Pair<String, () -> String>) {
 
     /** Header list */
-    val values: List<Pair<String, String>> = pairs.toList()
-
-    object CacheControlHeader : RequestHeader("Cache-Control" to "max-age=600")
-
-    class AuthenticationHeader(authProvider: AuthProvider) : RequestHeader(
-        "card_id" to authProvider.getCardId(),
-        "card_public_key" to authProvider.getCardPublicKey(),
-    )
-}
-
-sealed class LazyRequestHeader(vararg pairs: Pair<String, () -> String>) {
-
     val values: List<Pair<String, () -> String>> = pairs.toList()
 
-    class LazyAuthenticationHeader(authProvider: AuthProvider) : LazyRequestHeader(
+    object CacheControlHeader : RequestHeader("Cache-Control" to { "max-age=600" })
+
+    class AuthenticationHeader(authProvider: AuthProvider) : RequestHeader(
         "card_id" to { authProvider.getCardId() },
         "card_public_key" to { authProvider.getCardPublicKey() },
     )
diff --git a/domain/legacy/src/main/java/com/tangem/domain/redux/global/DomainGlobalHub.kt b/domain/legacy/src/main/java/com/tangem/domain/redux/global/DomainGlobalHub.kt
index 37f01870cc..f22a14aa64 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/redux/global/DomainGlobalHub.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/redux/global/DomainGlobalHub.kt
@@ -36,6 +36,7 @@ private class DomainGlobalReducer : ReStoreReducer<DomainGlobalState> {
         return when (action) {
             is DomainGlobalAction.SaveScanNoteResponse -> {
                 val card = action.scanResponse.card
+                // TODO: AuthHeaders: try to remove it, because now we can use headers with dynamic values
                 state.networkServices.tangemTechService.addAuthenticationHeader(
                     RequestHeader.AuthenticationHeader(
                         object : AuthProvider {

From 1b486b730c3c54fea51175bde38c4036b9794b0c Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 28 Jun 2023 15:54:43 +0300
Subject: [PATCH 20/21] Updated on 2026-08-14

---
 .../java/com/tangem/tap/TapApplication.kt     | 13 +-----
 .../tap/features/wallet/ui/WalletFragment.kt  |  6 ++-
 .../com/tangem/tap/proxy/di/ProxyModule.kt    | 18 ++++++++
 .../domain/DefaultLearn2earnInteractor.kt     | 19 +++-----
 .../learn2earn/domain/HeadersConverter.kt     |  4 +-
 .../learn2earn/domain/WebViewUriBuilder.kt    | 13 +++---
 .../api/Learn2earnDependencyProvider.kt       | 13 ++++++
 .../domain/api/Learn2earnInteractor.kt        |  2 -
 .../domain/di/Learn2earnDomainModule.kt       |  3 ++
 .../presentation/Learn2earnViewModel.kt       |  2 +-
 .../presentation/ui/GetBonusView.kt           | 43 ++++++++++++++-----
 .../ui/Learn2earnStoriesScreen.kt             |  4 +-
 .../presentation/ui/state/Learn2earnState.kt  |  2 +-
 .../presentation/ui/state/StateBuilder.kt     |  2 +-
 .../presentation/webView/WebViewViewModel.kt  |  4 +-
 15 files changed, 99 insertions(+), 49 deletions(-)
 create mode 100644 features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/Learn2earnDependencyProvider.kt

diff --git a/app/src/main/java/com/tangem/tap/TapApplication.kt b/app/src/main/java/com/tangem/tap/TapApplication.kt
index 70fa67acd8..114746ccdb 100644
--- a/app/src/main/java/com/tangem/tap/TapApplication.kt
+++ b/app/src/main/java/com/tangem/tap/TapApplication.kt
@@ -3,7 +3,6 @@ package com.tangem.tap
 import android.app.Application
 import android.content.Context
 import android.content.pm.PackageManager
-import androidx.compose.ui.text.intl.Locale
 import coil.ImageLoader
 import coil.ImageLoaderFactory
 import com.tangem.Log
@@ -146,7 +145,7 @@ class TapApplication : Application(), ImageLoaderFactory {
     lateinit var walletConnectSessionsRepository: WalletConnectSessionsRepository
 
     @Inject
-    lateinit var learn2ernInteractor: Learn2earnInteractor
+    lateinit var learn2earnInteractor: Learn2earnInteractor
 
     override fun onCreate() {
         super.onCreate()
@@ -205,7 +204,7 @@ class TapApplication : Application(), ImageLoaderFactory {
         //  [REDACTED_JIRA]
         runBlocking {
             featureTogglesManager.init()
-            learn2ernInteractor.init()
+            learn2earnInteractor.init()
         }
 
         initTopUpController()
@@ -246,7 +245,6 @@ class TapApplication : Application(), ImageLoaderFactory {
         shopService = TangemShopService(this, config.shopify!!)
         initAnalytics(this, config)
         initFeedbackManager(this, preferencesStorage, foregroundActivityObserver, store)
-        setupLearn2earnAdditionalDependencies(config)
     }
 
     private fun initAnalytics(application: Application, config: Config) {
@@ -309,13 +307,6 @@ class TapApplication : Application(), ImageLoaderFactory {
         store.dispatch(GlobalAction.SetFeedbackManager(feedbackManager))
     }
 
-    private fun setupLearn2earnAdditionalDependencies(config: Config) {
-        learn2ernInteractor.setupDependencies(
-            authCredentials = config.tangemComAuthorization,
-            countryCodeProvider = { store.state.globalState.userCountryCode ?: Locale.current.language },
-        )
-    }
-
     private fun initWarningMessagesManager() {
         store.dispatch(GlobalAction.SetWarningManager(WarningMessagesManager()))
     }
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
index d10cd1ded0..6540470882 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
@@ -217,7 +217,11 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), SafeStoreSubscriber<W
 
         binding.composeLearnToEarnContainer.show(true) { binding.llWarnings.beginDelayedTransition() }
         binding.composeLearnToEarnContainer.apply {
-            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+            setViewCompositionStrategy(
+                strategy = ViewCompositionStrategy.DisposeOnLifecycleDestroyed(
+                    lifecycle = this@WalletFragment.lifecycle,
+                ),
+            )
             setContent {
                 TangemTheme {
                     Learn2earnMainPageScreen(learn2earnViewModel.uiState)
diff --git a/app/src/main/java/com/tangem/tap/proxy/di/ProxyModule.kt b/app/src/main/java/com/tangem/tap/proxy/di/ProxyModule.kt
index 1189c0895d..371f1e21bf 100644
--- a/app/src/main/java/com/tangem/tap/proxy/di/ProxyModule.kt
+++ b/app/src/main/java/com/tangem/tap/proxy/di/ProxyModule.kt
@@ -1,6 +1,8 @@
 package com.tangem.tap.proxy.di
 
+import androidx.compose.ui.text.intl.Locale
 import com.tangem.core.analytics.api.AnalyticsEventHandler
+import com.tangem.feature.learn2earn.domain.api.Learn2earnDependencyProvider
 import com.tangem.lib.crypto.DerivationManager
 import com.tangem.lib.crypto.TransactionManager
 import com.tangem.lib.crypto.UserWalletManager
@@ -48,4 +50,20 @@ class ProxyModule {
             appStateHolder = appStateHolder,
         )
     }
+
+    // regions FeatureConsumers
+    @Provides
+    @Singleton
+    fun provideLear2earnDependencies(appStateHolder: AppStateHolder): Learn2earnDependencyProvider {
+        return object : Learn2earnDependencyProvider {
+            override fun getUserCountryCodeProvider(): () -> String = {
+                appStateHolder.mainStore?.state?.globalState?.userCountryCode ?: Locale.current.language
+            }
+
+            override fun getWebViewAuthCredentialsProvider(): () -> String? = {
+                appStateHolder.mainStore?.state?.globalState?.configManager?.config?.tangemComAuthorization
+            }
+        }
+    }
+    // endregion FeatureConsumers
 }
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt
index b32e34cc9f..7da36f0d40 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt
@@ -5,10 +5,7 @@ import com.tangem.datasource.api.promotion.models.AbstractPromotionResponse
 import com.tangem.datasource.api.promotion.models.PromotionInfoResponse
 import com.tangem.feature.learn2earn.data.api.Learn2earnRepository
 import com.tangem.feature.learn2earn.data.models.PromoUserData
-import com.tangem.feature.learn2earn.domain.api.Learn2earnInteractor
-import com.tangem.feature.learn2earn.domain.api.RedirectConsequences
-import com.tangem.feature.learn2earn.domain.api.WebViewResult
-import com.tangem.feature.learn2earn.domain.api.WebViewResultHandler
+import com.tangem.feature.learn2earn.domain.api.*
 import com.tangem.feature.learn2earn.domain.models.Promotion
 import com.tangem.feature.learn2earn.domain.models.PromotionError
 import com.tangem.feature.learn2earn.domain.models.toDomainError
@@ -23,20 +20,18 @@ class DefaultLearn2earnInteractor(
     private val repository: Learn2earnRepository,
     private val userWalletManager: UserWalletManager,
     private val derivationManager: DerivationManager,
+    dependencyProvider: Learn2earnDependencyProvider,
 ) : Learn2earnInteractor {
 
     override var webViewResultHandler: WebViewResultHandler? = null
 
-    private lateinit var webViewUriBuilder: WebViewUriBuilder
     private lateinit var promotion: Promotion
 
-    override fun setupDependencies(authCredentials: String?, countryCodeProvider: () -> String) {
-        webViewUriBuilder = WebViewUriBuilder(
-            authCredentials = authCredentials,
-            userCountryCodeProvider = countryCodeProvider,
-            promoCodeProvider = { repository.getUserData().promoCode },
-        )
-    }
+    private val webViewUriBuilder: WebViewUriBuilder = WebViewUriBuilder(
+        authCredentialsProvider = dependencyProvider.getWebViewAuthCredentialsProvider(),
+        userCountryCodeProvider = dependencyProvider.getUserCountryCodeProvider(),
+        promoCodeProvider = { repository.getUserData().promoCode },
+    )
 
     override suspend fun init() {
         initPromotionInfo()
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/HeadersConverter.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/HeadersConverter.kt
index e2fa9ffacf..439091ba1a 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/HeadersConverter.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/HeadersConverter.kt
@@ -3,7 +3,9 @@ package com.tangem.feature.learn2earn.domain
 import com.tangem.utils.converter.TwoWayConverter
 
 /**
- * A converter that helps prepare a list of headers to put in an intent and retrieve them later.
+ * A converter that helps prepare a list of headers to be added to the Bundle.
+ * ArrayList is used to prevent cast exceptions when the convert result is placed in a Bundle.
+ * @see Learn2earnRouter#openWebView() putStringArrayListExtra
  *
 [REDACTED_AUTHOR]
  */
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/WebViewUriBuilder.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/WebViewUriBuilder.kt
index b1e63934bf..5af98601aa 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/WebViewUriBuilder.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/WebViewUriBuilder.kt
@@ -7,7 +7,7 @@ import com.tangem.feature.learn2earn.impl.BuildConfig
 [REDACTED_AUTHOR]
  */
 internal class WebViewUriBuilder(
-    private val authCredentials: String?,
+    private val authCredentialsProvider: () -> String?,
     private val userCountryCodeProvider: () -> String,
     private val promoCodeProvider: () -> String?,
 ) {
@@ -30,10 +30,13 @@ internal class WebViewUriBuilder(
         return builder.build()
     }
 
-    fun getBasicAuthHeaders(): Map<String, String> = if (authCredentials == null) {
-        mapOf()
-    } else {
-        mapOf("Authorization" to "Basic $authCredentials")
+    fun getBasicAuthHeaders(): Map<String, String> {
+        val credentials = authCredentialsProvider.invoke()
+        return if (credentials == null) {
+            mapOf()
+        } else {
+            mapOf("Authorization" to "Basic $credentials")
+        }
     }
 
     fun isPromoCodeRedirect(uri: Uri): Boolean {
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/Learn2earnDependencyProvider.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/Learn2earnDependencyProvider.kt
new file mode 100644
index 0000000000..b0261884ec
--- /dev/null
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/Learn2earnDependencyProvider.kt
@@ -0,0 +1,13 @@
+package com.tangem.feature.learn2earn.domain.api
+
+/**
+ * Interface, a wrapper that allows us to get values from the AppStateHolder located in the app module
+ *
+[REDACTED_AUTHOR]
+ */
+interface Learn2earnDependencyProvider {
+
+    fun getUserCountryCodeProvider(): () -> String
+
+    fun getWebViewAuthCredentialsProvider(): () -> String?
+}
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/Learn2earnInteractor.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/Learn2earnInteractor.kt
index 55cd1adfce..2cdadbb236 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/Learn2earnInteractor.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/Learn2earnInteractor.kt
@@ -9,8 +9,6 @@ interface Learn2earnInteractor : WebViewRedirectHandler {
 
     var webViewResultHandler: WebViewResultHandler?
 
-    fun setupDependencies(authCredentials: String?, countryCodeProvider: () -> String)
-
     suspend fun init()
 
     fun isUserHadPromoCode(): Boolean
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/di/Learn2earnDomainModule.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/di/Learn2earnDomainModule.kt
index 915494c1eb..7ae76d3a19 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/di/Learn2earnDomainModule.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/di/Learn2earnDomainModule.kt
@@ -3,6 +3,7 @@ package com.tangem.feature.learn2earn.domain.di
 import android.content.Context
 import com.tangem.feature.learn2earn.data.api.Learn2earnRepository
 import com.tangem.feature.learn2earn.domain.DefaultLearn2earnInteractor
+import com.tangem.feature.learn2earn.domain.api.Learn2earnDependencyProvider
 import com.tangem.feature.learn2earn.domain.api.Learn2earnInteractor
 import com.tangem.feature.learn2earn.domain.api.WebViewRedirectHandler
 import com.tangem.feature.learn2earn.presentation.Learn2earnRouter
@@ -29,6 +30,7 @@ class Learn2earnDomainModule {
     @Singleton
     fun provideInteractor(
         repository: Learn2earnRepository,
+        dependencyProvider: Learn2earnDependencyProvider,
         userWalletManager: UserWalletManager,
         derivationManager: DerivationManager,
     ): Learn2earnInteractor {
@@ -36,6 +38,7 @@ class Learn2earnDomainModule {
             repository = repository,
             userWalletManager = userWalletManager,
             derivationManager = derivationManager,
+            dependencyProvider = dependencyProvider,
         )
     }
 
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnViewModel.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnViewModel.kt
index 8cd6e4536c..368d6291d7 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnViewModel.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnViewModel.kt
@@ -29,7 +29,7 @@ class Learn2earnViewModel @Inject constructor(
 
     var uiState: Learn2earnState by mutableStateOf(
         Learn2earnState.init(
-            uiActions = UiActions(
+            uiActions = Learn2earnUiActions(
                 buttonStoryClick = ::buttonStoryClick,
                 buttonMainClick = ::buttonMainClick,
             ),
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusView.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusView.kt
index ed76e37110..5c4aff6b96 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusView.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusView.kt
@@ -15,9 +15,12 @@ import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.res.painterResource
 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 com.tangem.core.ui.components.SpacerH4
 import com.tangem.core.ui.extensions.resolveReference
+import com.tangem.core.ui.res.TangemColorPalette
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemTypography
 import com.tangem.feature.learn2earn.impl.R
@@ -57,7 +60,7 @@ internal fun GetBonusView(state: MainScreenState, modifier: Modifier = Modifier)
                         modifier = Modifier
                             .align(Alignment.Center)
                             .size(size = TangemTheme.dimens.size28),
-                        color = Color.White,
+                        color = TangemColorPalette.White,
                         strokeWidth = TangemTheme.dimens.size2,
                     )
                 }
@@ -125,28 +128,46 @@ private fun ContentBackground(shape: Shape) {
 
 @Preview
 @Composable
-private fun OneInchStoriesContentPreview_Light() {
+private fun GetBonusViewPreview_Light(@PreviewParameter(GetBonusViewPreviewProvider::class) state: MainScreenState) {
     TangemTheme(
         isDark = false,
     ) {
-        GetBonusView(makePreviewState())
+        GetBonusView(state)
     }
 }
 
 @Preview
 @Composable
-private fun OneInchStoriesContentPreview_Dark() {
+private fun GetBonusViewPreview_Dark(@PreviewParameter(GetBonusViewPreviewProvider::class) state: MainScreenState) {
     TangemTheme(
         isDark = true,
     ) {
-        GetBonusView(makePreviewState())
+        GetBonusView(state)
     }
 }
 
-private fun makePreviewState(): MainScreenState = MainScreenState(
-    isVisible = true,
-    onClick = {},
-    description = MainScreenState.Description.Learn(0),
-    logoState = MainScreenState.LogoState.Idle,
-    showProgress = false,
+private class GetBonusViewPreviewProvider : CollectionPreviewParameterProvider<MainScreenState>(
+    collection = listOf(
+        MainScreenState(
+            isVisible = true,
+            onClick = {},
+            description = MainScreenState.Description.Learn(1),
+            logoState = MainScreenState.LogoState.Idle,
+            showProgress = false,
+        ),
+        MainScreenState(
+            isVisible = true,
+            onClick = {},
+            description = MainScreenState.Description.Learn(2),
+            logoState = MainScreenState.LogoState.InProgress,
+            showProgress = true,
+        ),
+        MainScreenState(
+            isVisible = true,
+            onClick = {},
+            description = MainScreenState.Description.GetBonus,
+            logoState = MainScreenState.LogoState.Idle,
+            showProgress = false,
+        ),
+    ),
 )
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/Learn2earnStoriesScreen.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/Learn2earnStoriesScreen.kt
index 0090991f43..4793bcfbc4 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/Learn2earnStoriesScreen.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/Learn2earnStoriesScreen.kt
@@ -106,7 +106,7 @@ private fun StoryDescription(headerText: String, bodyText: String, modifier: Mod
 
 @Preview
 @Composable
-private fun OneInchStoriesContentPreview_Light() {
+private fun Learn2earnStoriesScreenPreview_Light() {
     TangemTheme(
         isDark = false,
     ) {
@@ -118,7 +118,7 @@ private fun OneInchStoriesContentPreview_Light() {
 
 @Preview
 @Composable
-private fun OneInchStoriesContentPreview_Dark() {
+private fun Learn2earnStoriesScreenPreview_Dark() {
     TangemTheme(
         isDark = true,
     ) {
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/Learn2earnState.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/Learn2earnState.kt
index 2f6d1381f0..ac82a7f9c4 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/Learn2earnState.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/Learn2earnState.kt
@@ -68,7 +68,7 @@ data class MainScreenState(
     }
 }
 
-class UiActions(
+class Learn2earnUiActions(
     val buttonStoryClick: () -> Unit,
     val buttonMainClick: () -> Unit,
 )
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt
index 57dc52fc59..02ae3f1ee2 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt
@@ -3,7 +3,7 @@ package com.tangem.feature.learn2earn.presentation.ui.state
 /**
 [REDACTED_AUTHOR]
  */
-internal fun Learn2earnState.Companion.init(uiActions: UiActions): Learn2earnState {
+internal fun Learn2earnState.Companion.init(uiActions: Learn2earnUiActions): Learn2earnState {
     return Learn2earnState(
         storyScreenState = StoryScreenState(
             isVisible = false,
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/webView/WebViewViewModel.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/webView/WebViewViewModel.kt
index 37d6f9a5c4..3b25e78a58 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/webView/WebViewViewModel.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/webView/WebViewViewModel.kt
@@ -22,7 +22,9 @@ internal class WebViewViewModel @Inject constructor(
     }
 
     fun extractData(intent: Intent): WebViewData {
-        val uriString = intent.getStringExtra(Learn2earnWebViewActivity.EXTRA_WEB_URI)!!
+        val uriString = requireNotNull(intent.getStringExtra(Learn2earnWebViewActivity.EXTRA_WEB_URI)) {
+            "The Intent property EXTRA_WEB_URI is null"
+        }
         val rawHeaders = intent.getStringArrayListExtra(Learn2earnWebViewActivity.EXTRA_WEB_HEADERS) ?: ArrayList()
 
         return WebViewData(

From d53057dc5f33f69e8b1d09be34b2f5d4e2a799b8 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 28 Jun 2023 17:02:00 +0300
Subject: [PATCH 21/21] Updated on 2026-08-14

---
 .../learn2earn/presentation/Learn2earnViewModel.kt        | 8 ++++----
 .../learn2earn/presentation/ui/state/Learn2earnState.kt   | 4 ++--
 .../learn2earn/presentation/ui/state/StateBuilder.kt      | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnViewModel.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnViewModel.kt
index 368d6291d7..cb99ddef44 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnViewModel.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnViewModel.kt
@@ -30,8 +30,8 @@ class Learn2earnViewModel @Inject constructor(
     var uiState: Learn2earnState by mutableStateOf(
         Learn2earnState.init(
             uiActions = Learn2earnUiActions(
-                buttonStoryClick = ::buttonStoryClick,
-                buttonMainClick = ::buttonMainClick,
+                onButtonStoryClick = ::onButtonStoryClick,
+                onButtonMainClick = ::onButtonMainClick,
             ),
         ),
     )
@@ -58,11 +58,11 @@ class Learn2earnViewModel @Inject constructor(
         }
     }
 
-    private fun buttonStoryClick() {
+    private fun onButtonStoryClick() {
         router.openWebView(interactor.buildUriForNewUser(), interactor.getBasicAuthHeaders())
     }
 
-    private fun buttonMainClick() {
+    private fun onButtonMainClick() {
         if (!interactor.isUserHadPromoCode() && !interactor.isUserRegisteredInPromotion()) {
             subscribeToWebViewResultEvents()
             router.openWebView(interactor.buildUriForOldUser(), interactor.getBasicAuthHeaders())
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/Learn2earnState.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/Learn2earnState.kt
index ac82a7f9c4..7c1ba34c55 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/Learn2earnState.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/Learn2earnState.kt
@@ -69,6 +69,6 @@ data class MainScreenState(
 }
 
 class Learn2earnUiActions(
-    val buttonStoryClick: () -> Unit,
-    val buttonMainClick: () -> Unit,
+    val onButtonStoryClick: () -> Unit,
+    val onButtonMainClick: () -> Unit,
 )
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt
index 02ae3f1ee2..90e41829ab 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt
@@ -7,11 +7,11 @@ internal fun Learn2earnState.Companion.init(uiActions: Learn2earnUiActions): Lea
     return Learn2earnState(
         storyScreenState = StoryScreenState(
             isVisible = false,
-            onClick = uiActions.buttonStoryClick,
+            onClick = uiActions.onButtonStoryClick,
         ),
         mainScreenState = MainScreenState(
             isVisible = false,
-            onClick = uiActions.buttonMainClick,
+            onClick = uiActions.onButtonMainClick,
             description = MainScreenState.Description.Learn(0),
             logoState = MainScreenState.LogoState.Idle,
             showProgress = false,