From 648d4a98b81db3133e110e4d4f89fd4a749aab30 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 14 Jan 2021 15:43:14 +0300 Subject: [PATCH 1/6] Updated on 2026-08-14 --- app/build.gradle | 1 + .../main/java/com/tangem/tap/TapApplication.kt | 16 +++------------- .../tangem/tap/domain/config/ConfigLoader.kt | 17 +++++++++++++++-- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 433a84d15c..c5b70f368e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -40,6 +40,7 @@ android { initWith debug versionNameSuffix "-beta" applicationIdSuffix ".debug" + buildConfigField 'String', 'CONFIG_ENVIRONMENT', '\"prod\"' } } kotlinOptions { diff --git a/app/src/main/java/com/tangem/tap/TapApplication.kt b/app/src/main/java/com/tangem/tap/TapApplication.kt index 5e43828af0..cf26114c15 100644 --- a/app/src/main/java/com/tangem/tap/TapApplication.kt +++ b/app/src/main/java/com/tangem/tap/TapApplication.kt @@ -1,13 +1,11 @@ package com.tangem.tap import android.app.Application -import com.google.firebase.ktx.Firebase -import com.google.firebase.remoteconfig.ktx.remoteConfig -import com.google.firebase.remoteconfig.ktx.remoteConfigSettings import com.tangem.tap.common.images.PicassoHelper import com.tangem.tap.common.redux.AppState import com.tangem.tap.common.redux.appReducer import com.tangem.tap.common.redux.global.GlobalAction +import com.tangem.tap.domain.config.ConfigLoader import com.tangem.tap.domain.config.ConfigManager import com.tangem.tap.domain.config.LocalLoader import com.tangem.tap.domain.config.RemoteLoader @@ -29,17 +27,9 @@ class TapApplication : Application() { override fun onCreate() { super.onCreate() - if (BuildConfig.DEBUG) { - Timber.plant(Timber.DebugTree()) - Firebase.remoteConfig.setConfigSettingsAsync(remoteConfigSettings { - this.minimumFetchIntervalInSeconds = 60 - }) - } else { - Firebase.remoteConfig.setConfigSettingsAsync(remoteConfigSettings { - this.minimumFetchIntervalInSeconds = 3600 - }) - } + if (BuildConfig.DEBUG) Timber.plant(Timber.DebugTree()) + ConfigLoader.init() NetworkConnectivity.createInstance(store, this) preferencesStorage = PreferencesStorage(this) PicassoHelper.initPicassoWithCaching(this) diff --git a/app/src/main/java/com/tangem/tap/domain/config/ConfigLoader.kt b/app/src/main/java/com/tangem/tap/domain/config/ConfigLoader.kt index 738f7fd99f..2e90f4cb16 100644 --- a/app/src/main/java/com/tangem/tap/domain/config/ConfigLoader.kt +++ b/app/src/main/java/com/tangem/tap/domain/config/ConfigLoader.kt @@ -3,6 +3,7 @@ package com.tangem.tap.domain.config import android.content.Context import com.google.firebase.ktx.Firebase import com.google.firebase.remoteconfig.ktx.remoteConfig +import com.google.firebase.remoteconfig.ktx.remoteConfigSettings import com.squareup.moshi.JsonAdapter import com.squareup.moshi.Moshi import com.tangem.tap.common.analytics.FirebaseAnalyticsHandler @@ -18,13 +19,25 @@ interface ConfigLoader { companion object { const val featuresName = "features_${BuildConfig.CONFIG_ENVIRONMENT}" const val configValuesName = "config_${BuildConfig.CONFIG_ENVIRONMENT}" + + fun init() { + if (BuildConfig.CONFIG_ENVIRONMENT == "prod") { + Firebase.remoteConfig.setConfigSettingsAsync(remoteConfigSettings { + this.minimumFetchIntervalInSeconds = 1200 + }) + } else { + Firebase.remoteConfig.setConfigSettingsAsync(remoteConfigSettings { + this.minimumFetchIntervalInSeconds = 60 + }) + } + } } } class LocalLoader( private val context: Context, - private val moshi: Moshi + private val moshi: Moshi, ) : ConfigLoader { override fun loadConfig(onComplete: (ConfigModel) -> Unit) { @@ -49,7 +62,7 @@ class LocalLoader( } class RemoteLoader( - private val moshi: Moshi + private val moshi: Moshi, ) : ConfigLoader { override fun loadConfig(onComplete: (ConfigModel) -> Unit) { From f01122698f52748b4a618bebd28df3194be75c58 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 12 Feb 2021 13:39:04 +0300 Subject: [PATCH 2/6] Updated on 2026-08-14 --- .../main/java/com/tangem/tap/domain/tasks/ScanNoteTask.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/ScanNoteTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/ScanNoteTask.kt index 66c4238850..207062e770 100644 --- a/app/src/main/java/com/tangem/tap/domain/tasks/ScanNoteTask.kt +++ b/app/src/main/java/com/tangem/tap/domain/tasks/ScanNoteTask.kt @@ -128,6 +128,11 @@ class ScanNoteTask(val card: Card? = null) : CardSessionRunnable Date: Fri, 12 Feb 2021 13:50:22 +0300 Subject: [PATCH 3/6] Updated on 2026-08-14 --- app/src/main/assets/features_dev.json | 2 +- app/src/main/assets/features_prod.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/assets/features_dev.json b/app/src/main/assets/features_dev.json index 4866065376..71561c4c69 100644 --- a/app/src/main/assets/features_dev.json +++ b/app/src/main/assets/features_dev.json @@ -1,6 +1,6 @@ { "isWalletPayIdEnabled": true, - "isTopUpEnabled": true, "isSendingToPayIdEnabled": true, + "isTopUpEnabled": true, "isCreatingTwinCardsAllowed": false } \ No newline at end of file diff --git a/app/src/main/assets/features_prod.json b/app/src/main/assets/features_prod.json index 7c4ebbbb72..d3b1375fae 100644 --- a/app/src/main/assets/features_prod.json +++ b/app/src/main/assets/features_prod.json @@ -1,6 +1,6 @@ { - "isWalletPayIdEnabled": true, - "isTopUpEnabled": true, + "isWalletPayIdEnabled": false, "isSendingToPayIdEnabled": true, + "isTopUpEnabled": true, "isCreatingTwinCardsAllowed": true } \ No newline at end of file From 7a64811bcbe53fff3a5e838dcae46996064a0483 Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 15 Feb 2021 11:34:10 +0300 Subject: [PATCH 4/6] Updated on 2026-08-14 --- app/src/main/res/layout/layout_wallet_long_buttons.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/res/layout/layout_wallet_long_buttons.xml b/app/src/main/res/layout/layout_wallet_long_buttons.xml index 3872698afc..d32b3ac917 100644 --- a/app/src/main/res/layout/layout_wallet_long_buttons.xml +++ b/app/src/main/res/layout/layout_wallet_long_buttons.xml @@ -10,6 +10,7 @@ android:layout_width="0dp" android:layout_marginStart="16dp" android:layout_marginTop="30dp" + android:layout_marginBottom="33dp" android:text="@string/wallet_button_scan" app:icon="@drawable/ic_scan" app:layout_constraintBottom_toBottomOf="parent" @@ -34,6 +35,7 @@ android:layout_marginStart="8dp" android:layout_marginTop="30dp" android:layout_marginEnd="16dp" + android:layout_marginBottom="33dp" android:text="@string/wallet_button_send" app:icon="@drawable/ic_send" app:layout_constraintBottom_toBottomOf="parent" From b0a2fe8dddfab1f75c0aa3ceb439bc8f134e4e12 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 16 Feb 2021 22:52:43 +0300 Subject: [PATCH 5/6] Updated on 2026-08-14 --- .../features/details/redux/twins/CreateTwinWalletMiddleware.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/twins/CreateTwinWalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/details/redux/twins/CreateTwinWalletMiddleware.kt index 38cfac39bc..669ab9be91 100644 --- a/app/src/main/java/com/tangem/tap/features/details/redux/twins/CreateTwinWalletMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/details/redux/twins/CreateTwinWalletMiddleware.kt @@ -18,7 +18,7 @@ class CreateTwinWalletMiddleware { fun handle(action: DetailsAction.CreateTwinWalletAction) { when (action) { is DetailsAction.CreateTwinWalletAction.ShowWarning -> { - val wallet = store.state.detailsState.wallet + val wallet = store.state.globalState.scanNoteResponse?.walletManager?.wallet if (wallet == null) { store.dispatch(NavigationAction.NavigateTo(AppScreen.CreateTwinWalletWarning)) return From d4490a76ba96aecd270a7e138873d81fb8657c34 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 19 Feb 2021 12:48:10 +0300 Subject: [PATCH 6/6] Updated on 2026-08-14 --- app/src/main/java/com/tangem/tap/TapApplication.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/tangem/tap/TapApplication.kt b/app/src/main/java/com/tangem/tap/TapApplication.kt index c2ada9667f..6497a63edc 100644 --- a/app/src/main/java/com/tangem/tap/TapApplication.kt +++ b/app/src/main/java/com/tangem/tap/TapApplication.kt @@ -1,6 +1,9 @@ package com.tangem.tap import android.app.Application +import com.google.firebase.ktx.Firebase +import com.google.firebase.remoteconfig.ktx.remoteConfig +import com.google.firebase.remoteconfig.ktx.remoteConfigSettings import com.tangem.tap.common.images.PicassoHelper import com.tangem.tap.common.redux.AppState import com.tangem.tap.common.redux.appReducer @@ -39,7 +42,6 @@ class TapApplication : Application() { }) } - ConfigLoader.init() NetworkConnectivity.createInstance(store, this) preferencesStorage = PreferencesStorage(this) PicassoHelper.initPicassoWithCaching(this)